diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2012-09-11 21:36:52 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2012-09-11 21:36:52 -0700 |
| commit | 5eadac48eb97f7480e2629e46a6159cdcb21e1a2 (patch) | |
| tree | 00a6d5084031cee25a3b6971f889fc5027382545 /subsonic-android/res/menu | |
| parent | 959c6551d2ca834c88813e775c1209565d95a3e1 (diff) | |
| download | dsub-5eadac48eb97f7480e2629e46a6159cdcb21e1a2.tar.gz dsub-5eadac48eb97f7480e2629e46a6159cdcb21e1a2.tar.bz2 dsub-5eadac48eb97f7480e2629e46a6159cdcb21e1a2.zip | |
Merged Play Now/Shuffle/Select All into action bar, updated help/settings/exist icons for all menus
Diffstat (limited to 'subsonic-android/res/menu')
| -rw-r--r-- | subsonic-android/res/menu/main.xml | 6 | ||||
| -rw-r--r-- | subsonic-android/res/menu/select_album.xml | 18 | ||||
| -rw-r--r-- | subsonic-android/res/menu/select_artist.xml | 2 | ||||
| -rw-r--r-- | subsonic-android/res/menu/select_playlist.xml | 2 |
4 files changed, 20 insertions, 8 deletions
diff --git a/subsonic-android/res/menu/main.xml b/subsonic-android/res/menu/main.xml index af6a5a7d..a7642942 100644 --- a/subsonic-android/res/menu/main.xml +++ b/subsonic-android/res/menu/main.xml @@ -14,17 +14,17 @@ <item android:id="@+id/menu_help" - android:icon="@drawable/ic_menu_help" + android:icon="@drawable/action_help" android:title="@string/menu.help"/> <item android:id="@+id/menu_settings" - android:icon="@drawable/ic_menu_settings" + android:icon="@drawable/action_settings" android:title="@string/menu.settings"/> <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/menu/select_album.xml b/subsonic-android/res/menu/select_album.xml index a5f2a3a9..87fbab3e 100644 --- a/subsonic-android/res/menu/select_album.xml +++ b/subsonic-android/res/menu/select_album.xml @@ -1,16 +1,28 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android"> <item - android:id="@+id/menu_play_all" + android:id="@+id/menu_play_now" android:icon="@drawable/action_play_all" android:title="@string/menu.play" android:showAsAction="ifRoom|withText"/> - + <item android:id="@+id/menu_refresh" android:icon="@drawable/action_refresh" android:title="@string/menu.refresh" android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_shuffle" + android:icon="@drawable/action_shuffle" + android:title="@string/menu.shuffle" + android:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_select" + android:icon="@drawable/action_select" + android:title="@string/menu.select" + android:showAsAction="ifRoom|withText"/> <item android:id="@+id/menu_help" @@ -24,7 +36,7 @@ <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/menu/select_artist.xml b/subsonic-android/res/menu/select_artist.xml index 42916622..84c0e370 100644 --- a/subsonic-android/res/menu/select_artist.xml +++ b/subsonic-android/res/menu/select_artist.xml @@ -24,7 +24,7 @@ <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> diff --git a/subsonic-android/res/menu/select_playlist.xml b/subsonic-android/res/menu/select_playlist.xml index 46d863cd..3e0f33b6 100644 --- a/subsonic-android/res/menu/select_playlist.xml +++ b/subsonic-android/res/menu/select_playlist.xml @@ -18,7 +18,7 @@ <item android:id="@+id/menu_exit" - android:icon="@drawable/ic_menu_exit" + android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> </menu> |