diff options
| author | Kurt Hardin <kurthardin.dev@gmail.com> | 2012-09-25 11:48:55 -0700 |
|---|---|---|
| committer | Kurt Hardin <kurthardin.dev@gmail.com> | 2012-09-25 11:48:55 -0700 |
| commit | 2be1e2632966490e9d1b0cde7bb51f1951710794 (patch) | |
| tree | 85a7684f8d53435fd584c5c6e6e00d49f0e08907 /subsonic-android/res/menu/nowplaying.xml | |
| parent | 4573e156e0026348e7cdaaa1747d633b5fef3ef7 (diff) | |
| parent | d2ef30d252b8af7dd955f1d6c21d2f8f7475ec0c (diff) | |
| download | dsub-2be1e2632966490e9d1b0cde7bb51f1951710794.tar.gz dsub-2be1e2632966490e9d1b0cde7bb51f1951710794.tar.bz2 dsub-2be1e2632966490e9d1b0cde7bb51f1951710794.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'subsonic-android/res/menu/nowplaying.xml')
| -rw-r--r-- | subsonic-android/res/menu/nowplaying.xml | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/subsonic-android/res/menu/nowplaying.xml b/subsonic-android/res/menu/nowplaying.xml index 28bcb5ef..a880438e 100644 --- a/subsonic-android/res/menu/nowplaying.xml +++ b/subsonic-android/res/menu/nowplaying.xml @@ -3,25 +3,25 @@ <item android:id="@+id/menu_shuffle" - android:icon="@drawable/ic_menu_shuffle" + android:icon="@drawable/action_shuffle" android:title="@string/download.menu_shuffle" - /> + android:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_remove_all" + android:icon="@drawable/action_remove_all" + android:title="@string/download.menu_remove_all" + android:showAsAction="always|withText"/> <item android:id="@+id/menu_save_playlist" - android:icon="@drawable/ic_menu_save" + android:icon="@drawable/action_save" android:title="@string/download.menu_save" - /> - - <item - android:id="@+id/menu_remove_all" - android:icon="@drawable/ic_menu_remove_all" - android:title="@string/download.menu_remove_all" - /> + android:showAsAction="ifRoom|withText"/> <item android:id="@+id/menu_screen_on_off" - android:icon="@drawable/ic_menu_screen_on_off" + android:icon="@drawable/action_screen_on_off" android:title="@string/download.menu_screen_on" - /> + android:showAsAction="ifRoom|withText"/> </menu> |