diff options
author | Scott Jackson <daneren2005@gmail.com> | 2012-11-25 12:09:19 -0800 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2012-11-25 12:09:19 -0800 |
commit | f208d0562a619596ebf0ba982599564e7f860756 (patch) | |
tree | 2086621d0ca152e80eac35e4e8438d6b758ce057 /subsonic-android/res/menu | |
parent | 4770337d1e8c78facb5fe4f5bf7bfcd428e2cfa9 (diff) | |
parent | 836141bc69e30848adf049a50a95cf4d81c38cc1 (diff) | |
download | dsub-f208d0562a619596ebf0ba982599564e7f860756.tar.gz dsub-f208d0562a619596ebf0ba982599564e7f860756.tar.bz2 dsub-f208d0562a619596ebf0ba982599564e7f860756.zip |
Merge branch 'master' of https://github.com/daneren2005/Subsonic.git
Diffstat (limited to 'subsonic-android/res/menu')
4 files changed, 43 insertions, 0 deletions
diff --git a/subsonic-android/res/menu/select_song.xml b/subsonic-android/res/menu/select_song.xml index cd49e44f..3a55fee0 100644 --- a/subsonic-android/res/menu/select_song.xml +++ b/subsonic-android/res/menu/select_song.xml @@ -47,6 +47,10 @@ android:title="@string/menu.add_playlist"/> <item + android:id="@+id/menu_remove_playlist" + android:title="@string/menu.remove_playlist"/> + + <item android:id="@+id/menu_play_last" android:icon="@drawable/action_play_all" android:title="@string/menu.play_last" diff --git a/subsonic-android/res/menu/select_song_context.xml b/subsonic-android/res/menu/select_song_context.xml index b4e81799..95cf5eb3 100644 --- a/subsonic-android/res/menu/select_song_context.xml +++ b/subsonic-android/res/menu/select_song_context.xml @@ -35,6 +35,10 @@ android:title="@string/menu.add_playlist"/> <item + android:id="@+id/song_menu_remove_playlist" + android:title="@string/menu.remove_playlist"/> + + <item android:id="@+id/song_menu_star" android:title="@string/common.star"/> diff --git a/subsonic-android/res/menu/select_video_context.xml b/subsonic-android/res/menu/select_video_context.xml new file mode 100644 index 00000000..ed04b6ff --- /dev/null +++ b/subsonic-android/res/menu/select_video_context.xml @@ -0,0 +1,29 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/song_menu_play_external" + android:title="@string/common.play_external"/> + + <item + android:id="@+id/song_menu_webview" + android:title="@string/common.webview" + /> + + <item + android:id="@+id/song_menu_download" + android:title="@string/common.download" + /> + + <item + android:id="@+id/song_menu_pin" + android:title="@string/common.pin" + /> + + <item + android:id="@+id/song_menu_delete" + android:title="@string/common.delete"/> + + <item + android:id="@+id/song_menu_star" + android:title="@string/common.star"/> +</menu> diff --git a/subsonic-android/res/menu/select_video_context_offline.xml b/subsonic-android/res/menu/select_video_context_offline.xml new file mode 100644 index 00000000..1f0b3ebd --- /dev/null +++ b/subsonic-android/res/menu/select_video_context_offline.xml @@ -0,0 +1,6 @@ +<?xml version="1.0" encoding="utf-8"?> +<menu xmlns:android="http://schemas.android.com/apk/res/android"> + <item + android:id="@+id/song_menu_play_external" + android:title="@string/common.play_external"/> +</menu> |