Merge "Push Local Printer Search action to the ActionMenu" into lmp-preview-dev

This commit is contained in:
Fabrice Di Meglio
2014-06-02 22:41:06 +00:00
committed by Android (Google) Code Review
2 changed files with 2 additions and 3 deletions

View File

@@ -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

View File

@@ -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)));
}
}