From ca44dbc7ef9c9657c4b96add002a3149f0cb1c7e Mon Sep 17 00:00:00 2001
From: Scott Jackson <daneren2005@gmail.com>
Date: Sun, 31 Aug 2014 10:23:37 -0700
Subject: Move the EQ into the options menu

---
 res/layout-land/download.xml       |  5 -----
 res/layout-large-land/download.xml | 13 +++++++++----
 res/layout-port/download.xml       |  5 -----
 res/menu/nowplaying.xml            |  5 +++++
 res/menu/nowplaying_offline.xml    |  8 +++++++-
 5 files changed, 21 insertions(+), 15 deletions(-)

(limited to 'res')

diff --git a/res/layout-land/download.xml b/res/layout-land/download.xml
index c17abbc4..7dc852e1 100644
--- a/res/layout-land/download.xml
+++ b/res/layout-land/download.xml
@@ -69,11 +69,6 @@
 							style="@style/DownloadActionImageButton"
 							android:src="?attr/rating_bad"/>
 
-						<Button
-							android:id="@+id/download_equalizer"
-							android:text="EQ"
-							style="@style/DownloadActionButton"/>
-
 						<Button
 							android:id="@+id/download_visualizer"
 							android:text="VIS"
diff --git a/res/layout-large-land/download.xml b/res/layout-large-land/download.xml
index e1572890..89fa08e5 100644
--- a/res/layout-large-land/download.xml
+++ b/res/layout-large-land/download.xml
@@ -60,10 +60,10 @@
 							android:layout_centerHorizontal="true"
 							android:layout_alignParentBottom="true">
 
-							<Button
-								android:id="@+id/download_equalizer"
-								android:text="EQ"
-								style="@style/DownloadActionButton"/>
+							<ImageButton
+								android:id="@+id/download_rating_bad"
+								style="@style/DownloadActionImageButton"
+								android:src="?attr/rating_bad"/>
 
 							<Button
 								android:id="@+id/download_visualizer"
@@ -79,6 +79,11 @@
 								android:id="@+id/download_bookmark"
 								style="@style/DownloadActionImageButton"
 								android:src="?attr/bookmark"/>
+
+							<ImageButton
+								android:id="@+id/download_rating_good"
+								style="@style/DownloadActionImageButton"
+								android:src="?attr/rating_good"/>
 						</LinearLayout>
 					</RelativeLayout>
 
diff --git a/res/layout-port/download.xml b/res/layout-port/download.xml
index 7cce6747..916f3f25 100644
--- a/res/layout-port/download.xml
+++ b/res/layout-port/download.xml
@@ -60,11 +60,6 @@
 									style="@style/DownloadActionImageButton"
 									android:src="@drawable/ic_action_rating_bad_dark"/>
 
-								<Button
-									android:id="@+id/download_equalizer"
-									android:text="EQ"
-									style="@style/DownloadActionButton"/>
-
 								<Button
 									android:id="@+id/download_visualizer"
 									android:text="VIS"
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 48528b43..60255692 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -28,6 +28,11 @@
         android:title="@string/download.menu_save"
         compat:showAsAction="ifRoom|withText"/>
 
+	<item
+		android:id="@+id/menu_equalizer"
+		android:title="@string/equalizer.label"
+		android:checkable="true"/>
+
     <item
         android:id="@+id/menu_screen_on_off"
         android:title="@string/download.menu_screen_on"
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index f3912b0c..bba5ba00 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -20,10 +20,16 @@
         android:icon="?attr/remove"
         android:title="@string/download.menu_remove_all"
         compat:showAsAction="ifRoom|withText"/>
+
+	<item
+		android:id="@+id/menu_equalizer"
+		android:title="@string/equalizer.label"
+		android:checkable="true"/>
 	
 	<item
         android:id="@+id/menu_screen_on_off"
-        android:title="@string/download.menu_screen_on"/>
+        android:title="@string/download.menu_screen_on"
+		android:checkable="true"/>
 
 	<item
 		android:id="@+id/menu_remove_played"
-- 
cgit v1.2.3