simplify visible actionbar icons

2 files changed, 8 insertions, 11 deletions

diff --git a/org.fox.ttrss/src/main/res/menu/main_menu.xml b/org.fox.ttrss/src/main/res/menu/main_menu.xml
index 81e06712..15391862 100644
--- a/org.fox.ttrss/src/main/res/menu/main_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/main_menu.xml
@@ -14,13 +14,13 @@
             <item
                 android:id="@+id/subscribe_to_feed"
                 android:icon="@drawable/ic_new_light"
-                app:showAsAction="ifRoom"
+                app:showAsAction=""
                 android:title="@string/subscribe_to_feed"/>
 
             <item
                 android:id="@+id/show_feeds"
                 android:icon="@drawable/ic_list_light"
-                app:showAsAction="ifRoom"
+                app:showAsAction=""
                 android:title="@string/menu_all_feeds"/>
             <item
                 android:id="@+id/go_offline"
@@ -45,9 +45,8 @@
                 android:title="@string/update_headlines"/>
             <item
                 android:id="@+id/search"
-                app:actionViewClass="android.widget.SearchView"
                 android:icon="@drawable/ic_search_light"
-                app:showAsAction="ifRoom|collapseActionView"
+                app:showAsAction="ifRoom"
                 android:title="@string/search"/>
             <item
                 android:id="@+id/headlines_mark_as_read"
@@ -56,7 +55,7 @@
                 android:title="@string/headlines_mark_as_read"/>
             <item
                 android:id="@+id/headlines_select"
-                app:showAsAction="ifRoom"
+                app:showAsAction=""
                 android:icon="@drawable/ic_select_all_light"
                 android:title="@string/headlines_select"/>
 
@@ -138,7 +137,7 @@
             <item
                 android:id="@+id/set_unread"
                 android:icon="@drawable/ic_read_light"
-                app:showAsAction="ifRoom"
+                app:showAsAction=""
                 android:title="@string/article_set_unread"/>
 
         </group>
diff --git a/org.fox.ttrss/src/main/res/menu/offline_menu.xml b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
index 49709f18..5f20f869 100644
--- a/org.fox.ttrss/src/main/res/menu/offline_menu.xml
+++ b/org.fox.ttrss/src/main/res/menu/offline_menu.xml
@@ -10,15 +10,13 @@
         <item
             android:id="@+id/show_feeds"
             android:icon="@drawable/ic_list_light"
-            app:showAsAction="ifRoom"
+            app:showAsAction=""
             android:title="@string/menu_all_feeds"/>
     </group>
     <group android:id="@+id/menu_group_headlines" >
         <item
             android:id="@+id/search"
-            app:actionViewClass="android.widget.SearchView"
             android:icon="@drawable/ic_search_light"
-            app:showAsAction="ifRoom|collapseActionView"
             android:title="@string/search"/>
         <item
             android:id="@+id/headlines_mark_as_read"
@@ -28,7 +26,7 @@
         <item
             android:id="@+id/headlines_select"
             android:icon="@drawable/ic_select_all_light"
-            app:showAsAction="ifRoom"
+            app:showAsAction=""
             android:title="@string/headlines_select"/>
         <item
             android:id="@+id/headlines_view_mode"
@@ -81,7 +79,7 @@
         <item
             android:id="@+id/set_unread"
             android:icon="@drawable/ic_read_light"
-            app:showAsAction="ifRoom"
+            app:showAsAction=""
             android:title="@string/article_set_unread"/>
         <item
             android:id="@+id/catchup_above"