diff options
| -rw-r--r-- | api/current.xml | 15 | ||||
| -rw-r--r-- | core/java/android/widget/SearchView.java | 4 | ||||
| -rwxr-xr-x | core/res/res/values/attrs.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
4 files changed, 20 insertions, 2 deletions
diff --git a/api/current.xml b/api/current.xml index 0c33b8c9324b..7fe7017422ea 100644 --- a/api/current.xml +++ b/api/current.xml @@ -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> diff --git a/core/java/android/widget/SearchView.java b/core/java/android/widget/SearchView.java index 3bf5af33f0ee..2c960562f85f 100644 --- a/core/java/android/widget/SearchView.java +++ b/core/java/android/widget/SearchView.java @@ -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 diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 3a3ca36a4262..a29f4172c408 100755 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -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"> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 6d79569695ba..a4834b2f8dd8 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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" /> |