diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2013-10-26 18:12:28 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2013-10-26 18:12:28 -0700 |
| commit | 54a5938effb231c5c33a12cd5bbc35ff3107dfd9 (patch) | |
| tree | 335fa339f53848e22cbed3d938e74bc82d18444f /res/menu | |
| parent | ea85a04946b3c2f5a98dca51385614b155659d4a (diff) | |
| download | dsub-54a5938effb231c5c33a12cd5bbc35ff3107dfd9.tar.gz dsub-54a5938effb231c5c33a12cd5bbc35ff3107dfd9.tar.bz2 dsub-54a5938effb231c5c33a12cd5bbc35ff3107dfd9.zip | |
Put settings/exit back in menus, take out of drawer
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/chat.xml | 10 | ||||
| -rw-r--r-- | res/menu/main.xml | 9 | ||||
| -rw-r--r-- | res/menu/nowplaying.xml | 5 | ||||
| -rw-r--r-- | res/menu/nowplaying_offline.xml | 2 | ||||
| -rw-r--r-- | res/menu/select_artist.xml | 10 | ||||
| -rw-r--r-- | res/menu/select_playlist.xml | 10 | ||||
| -rw-r--r-- | res/menu/select_podcasts.xml | 10 |
7 files changed, 55 insertions, 1 deletions
diff --git a/res/menu/chat.xml b/res/menu/chat.xml index 67c13587..c8ea860a 100644 --- a/res/menu/chat.xml +++ b/res/menu/chat.xml @@ -6,4 +6,14 @@ android:icon="@drawable/action_refresh" android:title="@string/menu.refresh" compat:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> </menu>
\ No newline at end of file diff --git a/res/menu/main.xml b/res/menu/main.xml index b0385836..4b13b3c1 100644 --- a/res/menu/main.xml +++ b/res/menu/main.xml @@ -26,4 +26,13 @@ android:id="@+id/menu_changelog" android:title="@string/changelog_full_title"/> + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> </menu> diff --git a/res/menu/nowplaying.xml b/res/menu/nowplaying.xml index 6b87dc76..2fad22d2 100644 --- a/res/menu/nowplaying.xml +++ b/res/menu/nowplaying.xml @@ -32,4 +32,9 @@ <item android:id="@+id/menu_toggle_now_playing" android:title="@string/download.show_downloading"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> </menu> diff --git a/res/menu/nowplaying_offline.xml b/res/menu/nowplaying_offline.xml index 3800c013..3faa8d97 100644 --- a/res/menu/nowplaying_offline.xml +++ b/res/menu/nowplaying_offline.xml @@ -24,7 +24,7 @@ android:id="@+id/menu_toggle_timer" android:title="@string/download.start_timer"/> - <item + <item android:id="@+id/menu_exit" android:icon="@drawable/action_exit" android:title="@string/menu.exit"/> diff --git a/res/menu/select_artist.xml b/res/menu/select_artist.xml index 2cc04541..1346343b 100644 --- a/res/menu/select_artist.xml +++ b/res/menu/select_artist.xml @@ -18,4 +18,14 @@ android:icon="@drawable/action_search" android:title="@string/menu.search" compat:showAsAction="ifRoom|withText"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> </menu> diff --git a/res/menu/select_playlist.xml b/res/menu/select_playlist.xml index ee134377..68904502 100644 --- a/res/menu/select_playlist.xml +++ b/res/menu/select_playlist.xml @@ -12,4 +12,14 @@ android:icon="@drawable/action_search" android:title="@string/menu.search" compat:showAsAction="always|withText"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> </menu> diff --git a/res/menu/select_podcasts.xml b/res/menu/select_podcasts.xml index ce0a2bb6..6311eaca 100644 --- a/res/menu/select_podcasts.xml +++ b/res/menu/select_podcasts.xml @@ -16,4 +16,14 @@ android:id="@+id/menu_check" android:icon="@drawable/action_refresh" android:title="@string/menu.check_podcasts"/> + + <item + android:id="@+id/menu_settings" + android:icon="@drawable/action_settings" + android:title="@string/menu.settings"/> + + <item + android:id="@+id/menu_exit" + android:icon="@drawable/action_exit" + android:title="@string/menu.exit"/> </menu>
\ No newline at end of file |