diff options
| author | Scott Jackson <daneren2005@gmail.com> | 2016-07-25 08:26:56 -0700 |
|---|---|---|
| committer | Scott Jackson <daneren2005@gmail.com> | 2016-07-25 08:26:56 -0700 |
| commit | c6a2210258d0f91e147b091d357652d3f921e916 (patch) | |
| tree | 2729aeca66b2dc287e5dfaf91a78073770fc85e6 /app/src/main/res/menu | |
| parent | 21806c87a6290e731b314ade5809424217dd4c31 (diff) | |
| parent | 82399945f6287e8d7630532dfe8a4d1a7fa9c747 (diff) | |
| download | dsub-c6a2210258d0f91e147b091d357652d3f921e916.tar.gz dsub-c6a2210258d0f91e147b091d357652d3f921e916.tar.bz2 dsub-c6a2210258d0f91e147b091d357652d3f921e916.zip | |
Merge branch 'master' into playback_speed
Diffstat (limited to 'app/src/main/res/menu')
| -rw-r--r-- | app/src/main/res/menu/abstract_top_menu.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/main.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/menu/search.xml | 3 | ||||
| -rw-r--r-- | app/src/main/res/menu/select_artist.xml | 5 | ||||
| -rw-r--r-- | app/src/main/res/menu/select_podcasts.xml | 5 |
5 files changed, 13 insertions, 8 deletions
diff --git a/app/src/main/res/menu/abstract_top_menu.xml b/app/src/main/res/menu/abstract_top_menu.xml index 7c8d414d..b768879d 100644 --- a/app/src/main/res/menu/abstract_top_menu.xml +++ b/app/src/main/res/menu/abstract_top_menu.xml @@ -5,7 +5,8 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="always|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="always|collapseActionView"/> <group android:id="@+id/not_touchscreen"> <item diff --git a/app/src/main/res/menu/main.xml b/app/src/main/res/menu/main.xml index 0970c8ce..4b542668 100644 --- a/app/src/main/res/menu/main.xml +++ b/app/src/main/res/menu/main.xml @@ -5,13 +5,14 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="always|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="ifRoom|collapseActionView"/> <item android:id="@+id/menu_global_shuffle" android:icon="?attr/shuffle" android:title="@string/menu.shuffle" - compat:showAsAction="always|withText"/> + compat:showAsAction="ifRoom|withText"/> <group android:id="@+id/madsonic"> <item diff --git a/app/src/main/res/menu/search.xml b/app/src/main/res/menu/search.xml index e9377d68..b957a1e4 100644 --- a/app/src/main/res/menu/search.xml +++ b/app/src/main/res/menu/search.xml @@ -5,7 +5,8 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="ifRoom|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="always|collapseActionView"/> <item android:id="@+id/menu_exit" diff --git a/app/src/main/res/menu/select_artist.xml b/app/src/main/res/menu/select_artist.xml index f94cda8b..e974c28e 100644 --- a/app/src/main/res/menu/select_artist.xml +++ b/app/src/main/res/menu/select_artist.xml @@ -5,13 +5,14 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="always|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="ifRoom|collapseActionView"/> <item android:id="@+id/menu_global_shuffle" android:icon="?attr/shuffle" android:title="@string/menu.shuffle" - compat:showAsAction="always|withText"/> + compat:showAsAction="ifRoom|withText"/> <group android:id="@+id/not_touchscreen"> <item diff --git a/app/src/main/res/menu/select_podcasts.xml b/app/src/main/res/menu/select_podcasts.xml index 41ad62fa..25bb6188 100644 --- a/app/src/main/res/menu/select_podcasts.xml +++ b/app/src/main/res/menu/select_podcasts.xml @@ -5,13 +5,14 @@ android:id="@+id/menu_global_search" android:icon="?attr/search" android:title="@string/menu.search" - compat:showAsAction="always|withText"/> + compat:actionViewClass="android.support.v7.widget.SearchView" + compat:showAsAction="ifRoom|collapseActionView"/> <item android:id="@+id/menu_add_podcast" android:icon="?attr/add" android:title="@string/menu.add_podcast" - compat:showAsAction="always|withText"/> + compat:showAsAction="ifRoom|withText"/> <group android:id="@+id/not_touchscreen"> <item |