diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2016-05-30 16:24:54 -0500 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2016-05-30 16:24:54 -0500 |
| commit | 3b6f5ba72e52cade383d1d0361a4974f965ae728 (patch) | |
| tree | 08fc7252f5173b22ba8971cd98de75542d462e95 /app/src/main/res/menu | |
| parent | 403a0b8e6d0d45ffda1c32baa89c187876fa53ef (diff) | |
| parent | fb6048141ee594dc2d30a96be3150b6a94983852 (diff) | |
| download | dsub-3b6f5ba72e52cade383d1d0361a4974f965ae728.tar.gz dsub-3b6f5ba72e52cade383d1d0361a4974f965ae728.tar.bz2 dsub-3b6f5ba72e52cade383d1d0361a4974f965ae728.zip | |
Merge remote-tracking branch 'origin/master' into playback_speed
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/select_artist.xml | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/app/src/main/res/menu/select_artist.xml b/app/src/main/res/menu/select_artist.xml index 66ba37ba..f94cda8b 100644 --- a/app/src/main/res/menu/select_artist.xml +++ b/app/src/main/res/menu/select_artist.xml @@ -1,17 +1,17 @@ <?xml version="1.0" encoding="utf-8"?> <menu xmlns:android="http://schemas.android.com/apk/res/android" xmlns:compat="http://schemas.android.com/apk/res-auto"> + <item + android:id="@+id/menu_global_search" + android:icon="?attr/search" + android:title="@string/menu.search" + compat:showAsAction="always|withText"/> + <item android:id="@+id/menu_global_shuffle" android:icon="?attr/shuffle" android:title="@string/menu.shuffle" compat:showAsAction="always|withText"/> - - <item - android:id="@+id/menu_global_search" - android:icon="?attr/search" - android:title="@string/menu.search" - compat:showAsAction="ifRoom|withText"/> <group android:id="@+id/not_touchscreen"> <item |