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

Commit 4247f06b authored by Alan Viverette's avatar Alan Viverette Committed by Android Git Automerger
Browse files

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

* commit 'b130d596':
  Remove underline and search icon from ActionBar search view
parents 6a6b8280 b130d596

api/current.txt

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

    field public static final int scrollbars = 16842974; // 0x10100de

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

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

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

    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 searchIcon = 16843907; // 0x1010483

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

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

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

    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 Original line Diff line number Diff line
@@ -7220,6 +7220,8 @@ 
        <attr name="goIcon" format="reference" />

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

        <!-- Search icon -->

        <!-- Search icon -->

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

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

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

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

        <!-- Voice button icon -->

        <!-- Voice button icon -->

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

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

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

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

core/res/res/values/public.xml

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

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

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

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

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

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

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





</resources>
 
</resources>

core/res/res/values/strings.xml

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

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

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

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

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

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

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

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

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

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