Merge branch 'enhanced-playback-speed' of https://github.com/SilentViking/Subsonic into SilentViking-enhanced-playback-speed

# Conflicts:
#	app/src/main/java/github/daneren2005/dsub/util/Constants.java

2 files changed, 53 insertions, 35 deletions

diff --git a/app/src/main/res/layout/set_playback_speed.xml b/app/src/main/res/layout/set_playback_speed.xml
index 42f23a35..c85719bb 100644
--- a/app/src/main/res/layout/set_playback_speed.xml
+++ b/app/src/main/res/layout/set_playback_speed.xml
@@ -1,8 +1,48 @@
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-	android:orientation="horizontal"
-	android:layout_width="fill_parent"
-	android:layout_height="wrap_content"
-	android:layout_gravity="center">
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+				android:orientation="horizontal"
+				android:layout_width="fill_parent"
+				android:layout_height="wrap_content"
+				android:layout_gravity="center"
+				android:background="?android:colorBackground"
+	>
+
+
+	<LinearLayout
+		android:id="@+id/playback_speed_buttons"
+		android:layout_width="fill_parent"
+		android:layout_height="wrap_content"
+		android:gravity="center"
+		android:orientation="horizontal"
+		>
+
+		<Button
+			android:id="@+id/playback_speed_normal"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="1.0x"
+			android:tag="1.0"/>
+		<Button
+			android:id="@+id/playback_speed_one_half"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:tag="1.5"
+			android:text="1.5x"/>
+
+		<Button
+			android:id="@+id/playback_speed_double"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:tag="2.0"
+			android:text="2.0x"/>
+
+
+		<Button
+			android:id="@+id/playback_speed_triple"
+			android:layout_width="wrap_content"
+			android:layout_height="wrap_content"
+			android:text="3.0x"
+			android:tag="3.0"/>
+	</LinearLayout>
 
 	<TextView
 		android:id="@+id/playback_speed_label"
@@ -11,12 +51,16 @@
 		android:layout_marginLeft="8dp"
 		android:textSize="20dp"
 		android:paddingRight="10px"
-		android:layout_gravity="center"
-		android:textColor="?android:textColorPrimary"/>
+		android:textColor="?android:textColorPrimary"
+		android:layout_below="@+id/playback_speed_buttons"/>
 
 	<SeekBar
 		android:id="@+id/playback_speed_bar"
 		android:layout_width="fill_parent"
 		android:layout_height="wrap_content"
-		android:max="25"/>
-</LinearLayout>
\ No newline at end of file
+		android:max="25"
+		android:layout_toRightOf="@+id/playback_speed_label"
+		android:layout_below="@+id/playback_speed_buttons"
+		/>
+
+</RelativeLayout>
\ No newline at end of file
diff --git a/app/src/main/res/menu/playback_speed_options.xml b/app/src/main/res/menu/playback_speed_options.xml
deleted file mode 100644
index 909d3b3c..00000000
--- a/app/src/main/res/menu/playback_speed_options.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-	<item
-		android:id="@+id/playback_speed_half"
-		android:title="@string/download.playback_speed_half"/>
-
-	<item
-		android:id="@+id/playback_speed_normal"
-		android:title="@string/download.playback_speed_normal"/>
-
-	<item
-		android:id="@+id/playback_speed_one_half"
-		android:title="@string/download.playback_speed_one_half"/>
-
-	<item
-		android:id="@+id/playback_speed_double"
-		android:title="@string/download.playback_speed_double"/>
-
-	<item
-		android:id="@+id/playback_speed_tripple"
-		android:title="@string/download.playback_speed_tripple"/>
-
-	<item
-		android:id="@+id/playback_speed_custom"
-		android:title="@string/download.playback_speed_custom"/>
-</menu>
\ No newline at end of file