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

Commit ca3f9383 authored by Philip P. Moltmann's avatar Philip P. Moltmann Committed by Android (Google) Code Review
Browse files

Merge "Switch add icons to the default menu add icon"

parents 608797e2 7dfe4f64

packages/PrintSpooler/res/drawable/ic_search.xml→packages/PrintSpooler/res/drawable/ic_add.xml

+25 −0
Original line number Diff line number Diff line 
<?xml version="1.0" encoding="utf-8"?>

<!-- Copyright (C) 2014 The Android Open Source Project

<!-- Copyright (C) 2015 The Android Open Source Project



     Licensed under the Apache License, Version 2.0 (the "License");

     you may not use this file except in compliance with the License.
@@ -14,30 +14,12 @@ 
     limitations under the License.

-->



<selector xmlns:android="http://schemas.android.com/apk/res/android"

    android:autoMirrored="true">



    <item

        android:state_checked="true">

        <bitmap

            android:src="@*android:drawable/ic_menu_search"

            android:tint="?android:attr/colorControlActivated">

        </bitmap>

    </item>



    <item

        android:state_pressed="true">

        <bitmap

            android:src="@*android:drawable/ic_menu_search"

            android:tint="?android:attr/colorControlActivated">

        </bitmap>

    </item>



    <item>

        <bitmap

            android:src="@*android:drawable/ic_menu_search"

            android:tint="?android:attr/colorControlNormal">

        </bitmap>

    </item>



</selector>
 
<vector xmlns:android="http://schemas.android.com/apk/res/android"

        android:width="24dp"

        android:height="24dp"

        android:viewportWidth="24.0"

        android:viewportHeight="24.0">

    <path

        android:pathData="M19,13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z"

        android:fillColor="#FFFFFF"/>

</vector>
 
 No newline at end of file

packages/PrintSpooler/res/menu/select_printer_activity.xml

+2 −2
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
    <item

        android:id="@+id/action_search"

        android:title="@string/search"

        android:icon="@*android:drawable/ic_search"

        android:icon="@*android:drawable/ic_search_api_material"

        android:actionViewClass="android.widget.SearchView"

        android:showAsAction="ifRoom|collapseActionView"

        android:alphabeticShortcut="f"
@@ -29,7 +29,7 @@ 
    <item

        android:id="@+id/action_add_printer"

        android:title="@string/print_add_printer"

        android:icon="@*android:drawable/create_contact"

        android:icon="@drawable/ic_add"

        android:showAsAction="ifRoom"

        android:alphabeticShortcut="a">

    </item>