Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4c448734 authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android (Google) Code Review
Browse files

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

parents 2ca1a3f5 11a67c14

res/menu/print_service_settings.xml

+1 −2
Original line number Diff line number Diff line
@@ -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

src/com/android/settings/print/PrintSettingsFragment.java

+1 −1
Original line number Diff line number Diff line
@@ -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)));

        }

    }