diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-30 18:44:12 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-06-30 18:44:12 -0700 |
| commit | c56096fe1fe3486102079f06ca5de3e2bef12e47 (patch) | |
| tree | fc4ace607cf39b7b511f43a1781761ea2a8dac15 /core | |
| parent | 65363830c1e5ca8c59b6e12b4b43a3f03688ca2e (diff) | |
| parent | f763e8f42df8e99b84420c80eaff24b3573ff0bc (diff) | |
| download | frameworks_base-c56096fe1fe3486102079f06ca5de3e2bef12e47.zip frameworks_base-c56096fe1fe3486102079f06ca5de3e2bef12e47.tar.gz frameworks_base-c56096fe1fe3486102079f06ca5de3e2bef12e47.tar.bz2 | |
Merge change 5878 into donut
* changes:
Add new attribute 'searchSettingsDescription' for use within an app's searchable.xml. This attribute defines the string to be shown as the description a searchable in the 'searchable items' section of system search settings.
Diffstat (limited to 'core')
| -rw-r--r-- | core/res/res/values/attrs.xml | 5 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 6 insertions, 0 deletions
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index 3e93b02..10308b6 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2879,6 +2879,11 @@ results for "bo", it would not be queried again for "bob". The default value is <code>false</code>. <i>Optional attribute.</i>. --> <attr name="queryAfterZeroResults" format="boolean" /> + + <!-- If provided, this string will be used to describe the searchable item in the + searchable items settings within system search settings. <i>Optional + attribute.</i> --> + <attr name="searchSettingsDescription" format="string" /> </declare-styleable> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 2121669..148935f 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -1123,6 +1123,7 @@ <public type="attr" name="progressBarStyleInverse" /> <public type="attr" name="progressBarStyleSmallInverse" /> <public type="attr" name="progressBarStyleLargeInverse" /> + <public type="attr" name="searchSettingsDescription" /> <public-padding type="attr" name="donut_resource_pad" end="0x0101029f" /> |