diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2014-10-19 19:11:28 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2014-10-19 19:11:28 -0700 |
| commit | b0060e1f648516b3f7c0a2656acd2ae99c4af3ed (patch) | |
| tree | 3ed93dee57b0ead26a44295c2ecb22ecbd0124a9 /res/menu | |
| parent | 16da06bb207d744c73159d63705ade4a3def8f2c (diff) | |
| parent | 04cc79c81967ce6a82873d9bac1bf73625cf84be (diff) | |
| download | dsub-b0060e1f648516b3f7c0a2656acd2ae99c4af3ed.tar.gz dsub-b0060e1f648516b3f7c0a2656acd2ae99c4af3ed.tar.bz2 dsub-b0060e1f648516b3f7c0a2656acd2ae99c4af3ed.zip | |
Merge branch 'master' into EQ
Diffstat (limited to 'res/menu')
| -rw-r--r-- | res/menu/select_album.xml | 16 | ||||
| -rw-r--r-- | res/menu/select_song.xml | 4 | ||||
| -rw-r--r-- | res/menu/select_song_offline.xml | 4 |
3 files changed, 16 insertions, 8 deletions
diff --git a/res/menu/select_album.xml b/res/menu/select_album.xml index 4b79d251..fa887c28 100644 --- a/res/menu/select_album.xml +++ b/res/menu/select_album.xml @@ -14,6 +14,22 @@ compat:showAsAction="ifRoom|withText"/> <item + android:id="@+id/menu_top_tracks" + android:title="@string/menu.top_tracks"/> + + <item android:id="@+id/menu_show_all" android:title="@string/menu.show_all"/> + + <item + android:id="@+id/menu_download" + android:title="@string/common.download"/> + + <item + android:id="@+id/menu_cache" + android:title="@string/common.pin"/> + + <item + android:id="@+id/menu_delete" + android:title="@string/menu.delete_cache"/> </menu> diff --git a/res/menu/select_song.xml b/res/menu/select_song.xml index ec4af96a..07fd57a7 100644 --- a/res/menu/select_song.xml +++ b/res/menu/select_song.xml @@ -14,10 +14,6 @@ compat:showAsAction="ifRoom|withText"/> <item - android:id="@+id/menu_select" - android:title="@string/menu.select"/> - - <item android:id="@+id/menu_download" android:title="@string/common.download"/> diff --git a/res/menu/select_song_offline.xml b/res/menu/select_song_offline.xml index 6915c873..c45405fb 100644 --- a/res/menu/select_song_offline.xml +++ b/res/menu/select_song_offline.xml @@ -14,10 +14,6 @@ compat:showAsAction="ifRoom|withText"/> <item - android:id="@+id/menu_select" - android:title="@string/menu.select"/> - - <item android:id="@+id/menu_delete" android:title="@string/menu.delete_cache"/> |