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

Commit b130d596 authored by Alan Viverette's avatar Alan Viverette Committed by Android (Google) Code Review
Browse files

Merge "Remove underline and search icon from ActionBar search view" into lmp-mr1-dev

parents 552eca1a cb8ed370

api/current.txt

+1 −0
Original line number Diff line number Diff line
@@ -1056,6 +1056,7 @@ package android { 
    field public static final int scrollbars = 16842974; // 0x10100de

    field public static final int scrollingCache = 16843006; // 0x10100fe

    field public static final deprecated int searchButtonText = 16843269; // 0x1010205

    field public static final int searchHintIcon = 16844038; // 0x1010506

    field public static final int searchIcon = 16843907; // 0x1010483

    field public static final int searchMode = 16843221; // 0x10101d5

    field public static final int searchSettingsDescription = 16843402; // 0x101028a

core/java/android/widget/SearchView.java

+117 −96

File changed.

Preview size limit exceeded, changes collapsed.

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -7220,6 +7220,8 @@ 
        <attr name="goIcon" format="reference" />

        <!-- Search icon -->

        <attr name="searchIcon" format="reference" />

        <!-- Search icon displayed as a text field hint -->

        <attr name="searchHintIcon" format="reference" />

        <!-- Voice button icon -->

        <attr name="voiceIcon" format="reference" />

        <!-- Commit icon shown in the query suggestion row -->

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -2600,5 +2600,6 @@ 
    <public type="attr" name="accessibilityTraversalBefore" />

    <public type="attr" name="accessibilityTraversalAfter" />

    <public type="attr" name="dialogPreferredPadding" />

    <public type="attr" name="searchHintIcon" />



</resources>

core/res/res/values/strings.xml

+2 −0
Original line number Diff line number Diff line
@@ -3306,6 +3306,8 @@ 
    <!-- This is the default button label in the system-wide search UI.

         It is also used by the home screen's search "widget". It should be short -->

    <string name="search_go">Search</string>

    <!-- Default hint text for the system-wide search UI's text field. [CHAR LIMIT=30] -->

    <string name="search_hint">Search…</string>

    <!-- SearchView accessibility description for search button [CHAR LIMIT=NONE] -->

    <string name="searchview_description_search">Search</string>

    <!-- SearchView accessibility description for search text field [CHAR LIMIT=NONE] -->