aboutsummaryrefslogtreecommitdiff
path: root/res/menu
diff options
context:
space:
mode:
authorScott Jackson <daneren2005@gmail.com>2014-10-22 19:24:47 -0700
committerScott Jackson <daneren2005@gmail.com>2014-10-22 19:24:47 -0700
commitdfcd04a8d983627f33ff46cfb572cba1f13176ac (patch)
treef9f77a04ba7fb233204662510c5bac970a4d69b9 /res/menu
parentfd6ef4c67003db26bad5e10d4e2a375c5c9e6a58 (diff)
downloaddsub-dfcd04a8d983627f33ff46cfb572cba1f13176ac.tar.gz
dsub-dfcd04a8d983627f33ff46cfb572cba1f13176ac.tar.bz2
dsub-dfcd04a8d983627f33ff46cfb572cba1f13176ac.zip
#405 Move shuffle to by media controls, toggle to actionbar
Diffstat (limited to 'res/menu')
-rw-r--r--res/menu/nowplaying.xml12
-rw-r--r--res/menu/nowplaying_offline.xml12
2 files changed, 12 insertions, 12 deletions
diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml
index 60255692..3f49ae19 100644
--- a/res/menu/nowplaying.xml
+++ b/res/menu/nowplaying.xml
@@ -3,18 +3,18 @@
xmlns:compat="http://schemas.android.com/apk/res-auto"
android:checkableBehavior="all">
- <item
- android:id="@+id/menu_shuffle"
- android:icon="?attr/shuffle"
- android:title="@string/download.menu_shuffle"
- compat:showAsAction="ifRoom|withText"/>
-
<item
android:id="@+id/menu_mediaroute"
compat:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
compat:actionViewClass="android.support.v7.app.MediaRouteButton"
compat:showAsAction="always"
android:title="@string/menu.cast"/>
+
+ <item
+ android:id="@+id/menu_toggle_list"
+ android:icon="?attr/toggle_list"
+ android:title="@string/download.menu_toggle"
+ compat:showAsAction="ifRoom|withText"/>
<item
android:id="@+id/menu_remove_all"
diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml
index bba5ba00..105b375c 100644
--- a/res/menu/nowplaying_offline.xml
+++ b/res/menu/nowplaying_offline.xml
@@ -2,18 +2,18 @@
<menu xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:compat="http://schemas.android.com/apk/res-auto">
- <item
- android:id="@+id/menu_shuffle"
- android:icon="?attr/shuffle"
- android:title="@string/download.menu_shuffle"
- compat:showAsAction="always|withText"/>
-
<item
android:id="@+id/menu_mediaroute"
compat:actionProviderClass="android.support.v7.app.MediaRouteActionProvider"
compat:actionViewClass="android.support.v7.app.MediaRouteButton"
compat:showAsAction="always"
android:title="@string/menu.cast"/>
+
+ <item
+ android:id="@+id/menu_toggle_list"
+ android:icon="?attr/toggle_list"
+ android:title="@string/download.menu_toggle"
+ compat:showAsAction="always|withText"/>
<item
android:id="@+id/menu_remove_all"