aboutsummaryrefslogtreecommitdiff
path: root/res
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-08-31 10:23:37 -0700
committerScott Jackson <daneren2005@gmail.com>2014-08-31 10:23:37 -0700
commitca44dbc7ef9c9657c4b96add002a3149f0cb1c7e (patch)
tree50ef0679885d7e0a3830ad26923a53168e0eb7e7 /res
parent5ae23c33d575eefeaefac934b8f575a83bf2f9de (diff)
downloaddsub-ca44dbc7ef9c9657c4b96add002a3149f0cb1c7e.tar.gz
dsub-ca44dbc7ef9c9657c4b96add002a3149f0cb1c7e.tar.bz2
dsub-ca44dbc7ef9c9657c4b96add002a3149f0cb1c7e.zip
Move the EQ into the options menu
Diffstat (limited to 'res')
-rw-r--r--res/layout-land/download.xml5
-rw-r--r--res/layout-large-land/download.xml13
-rw-r--r--res/layout-port/download.xml5
-rw-r--r--res/menu/nowplaying.xml5
-rw-r--r--res/menu/nowplaying_offline.xml8
5 files changed, 21 insertions, 15 deletions
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
@@ -70,11 +70,6 @@
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"
style="@style/DownloadActionButton"/>
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
@@ -61,11 +61,6 @@
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"
style="@style/DownloadActionButton"/>
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"