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

Commit c0171d5e authored by Adam Powell's avatar Adam Powell
Browse files

Fix bug 3242262 - Add queryHint attribute for SearchView 

Change-Id: I211b65139622c2a2cba03bd1323e2543b09bb111
parent a3cdaa53

api/current.xml

+13 −2
Original line number Diff line number Diff line
@@ -7616,6 +7616,17 @@ 
 visibility="public"

>

</field>

<field name="queryHint"

 type="int"

 transient="false"

 volatile="false"

 value="16843610"

 static="true"

 final="true"

 deprecated="not deprecated"

 visibility="public"

>

</field>

<field name="quickContactBadgeStyleSmallWindowLarge"

 type="int"

 transient="false"
@@ -167165,7 +167176,7 @@ 
</parameter>

<parameter name="type" type="android.renderscript.Type">

</parameter>

<parameter name="mc" type="android.renderscript.Allocation.MipmapControl">

<parameter name="mips" type="android.renderscript.Allocation.MipmapControl">

</parameter>

<parameter name="usage" type="int">

</parameter>
@@ -260215,7 +260226,7 @@ 
 deprecated="not deprecated"

 visibility="public"

>

<parameter name="t" type="T">

<parameter name="arg0" type="T">

</parameter>

</method>

</interface>

core/java/android/widget/SearchView.java

+4 −0
Original line number Diff line number Diff line
@@ -217,6 +217,10 @@ public class SearchView extends LinearLayout { 
        if (maxWidth != -1) {

            setMaxWidth(maxWidth);

        }

        CharSequence queryHint = a.getText(R.styleable.SearchView_queryHint);

        if (!TextUtils.isEmpty(queryHint)) {

            setQueryHint(queryHint);

        }

        a.recycle();



        // Save voice intent for later queries/launching

core/res/res/values/attrs.xml

+2 −0
Original line number Diff line number Diff line
@@ -4664,6 +4664,8 @@ 
        <attr name="iconifiedByDefault" format="boolean"/>

        <!-- An optional maximum width of the SearchView. -->

        <attr name="maxWidth" />

        <!-- An optional query hint string to be displayed in the empty query field. -->

        <attr name="queryHint" format="string" />

    </declare-styleable>



    <declare-styleable name="ActionBar_LayoutParams">

core/res/res/values/public.xml

+1 −0
Original line number Diff line number Diff line
@@ -1424,6 +1424,7 @@ 
  <public type="attr" name="alertDialogIcon" />

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

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

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



  <!-- A simple fade-in animation. -->

  <public type="animator" name="fade_in" id="0x010b0000" />