From 11a67c14a2969668d00d30a43d12e0685596884f Mon Sep 17 00:00:00 2001
From: Fabrice Di Meglio <fdimeglio@google.com>
Date: Mon, 2 Jun 2014 13:58:43 -0700
Subject: [PATCH] Push Local Printer Search action to the ActionMenu

See bug #14325350 Printing > CloudPrint ActionBar is overcrowded

Change-Id: I9c7ca08ecbcf2a918239d952dc8c23315c46f152
---
 res/menu/print_service_settings.xml                       | 3 +--
 src/com/android/settings/print/PrintSettingsFragment.java | 2 +-
 2 files changed, 2 insertions(+), 3 deletions(-)

diff --git a/res/menu/print_service_settings.xml b/res/menu/print_service_settings.xml
index a9a4aeda23d..f8a7372629d 100644
--- a/res/menu/print_service_settings.xml
+++ b/res/menu/print_service_settings.xml
@@ -18,9 +18,8 @@
     <item
         android:id="@+id/print_menu_item_search"
         android:title="@string/print_menu_item_search"
-        android:icon="@*android:drawable/ic_menu_search_holo_dark"
         android:actionViewClass="android.widget.SearchView"
-        android:showAsAction="ifRoom|collapseActionView"
+        android:showAsAction="never|collapseActionView"
         android:imeOptions="actionSearch">
     </item>
     <item
diff --git a/src/com/android/settings/print/PrintSettingsFragment.java b/src/com/android/settings/print/PrintSettingsFragment.java
index 3f7362cece5..f512db5b7fb 100644
--- a/src/com/android/settings/print/PrintSettingsFragment.java
+++ b/src/com/android/settings/print/PrintSettingsFragment.java
@@ -154,7 +154,7 @@ public class PrintSettingsFragment extends SettingsPreferenceFragment
                 Settings.Secure.PRINT_SERVICE_SEARCH_URI);
         if (!TextUtils.isEmpty(searchUri)) {
             MenuItem menuItem = menu.add(R.string.print_menu_item_add_service);
-            menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_IF_ROOM);
+            menuItem.setShowAsActionFlags(MenuItem.SHOW_AS_ACTION_NEVER);
             menuItem.setIntent(new Intent(Intent.ACTION_VIEW, Uri.parse(searchUri)));
         }
     }