diff options
author | Scott Jackson <daneren2005@gmail.com> | 2014-08-24 16:12:58 -0700 |
---|---|---|
committer | Scott Jackson <daneren2005@gmail.com> | 2014-08-24 16:12:58 -0700 |
commit | 050a93815b028eb570f6a5d065d502878de55e4c (patch) | |
tree | e0fac20abdd82359bc0770366f9a65b877867c79 /res/menu | |
parent | bc4bac7a7c2e02e0f65ae804205232f2e256b97a (diff) | |
parent | 67c94f2bd63c65937386991f7232aa053acc101d (diff) | |
download | dsub-050a93815b028eb570f6a5d065d502878de55e4c.tar.gz dsub-050a93815b028eb570f6a5d065d502878de55e4c.tar.bz2 dsub-050a93815b028eb570f6a5d065d502878de55e4c.zip |
Merge branch 'Bookmarks' of https://github.com/daneren2005/Subsonic
Diffstat (limited to 'res/menu')
-rw-r--r-- | res/menu/select_bookmark_context.xml | 8 | ||||
-rw-r--r-- | res/menu/select_song_context.xml | 6 |
2 files changed, 14 insertions, 0 deletions
diff --git a/res/menu/select_bookmark_context.xml b/res/menu/select_bookmark_context.xml index 724c4c78..2b1b83fd 100644 --- a/res/menu/select_bookmark_context.xml +++ b/res/menu/select_bookmark_context.xml @@ -5,6 +5,14 @@ <item android:id="@+id/bookmark_menu_info" android:title="@string/common.info"/> + + <item + android:id="@+id/song_menu_show_album" + android:title="@string/download.menu_show_album"/> + + <item + android:id="@+id/song_menu_show_artist" + android:title="@string/menu.show_artist"/> <item android:id="@+id/song_menu_download" diff --git a/res/menu/select_song_context.xml b/res/menu/select_song_context.xml index 94283f70..5123a0ae 100644 --- a/res/menu/select_song_context.xml +++ b/res/menu/select_song_context.xml @@ -59,4 +59,10 @@ android:id="@+id/song_menu_share" android:title="@string/menu.share"/> </group> + + <group android:id="@+id/server_1.9"> + <item + android:id="@+id/bookmark_menu_delete" + android:title="@string/bookmark.delete"/> + </group> </menu> |