diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-07-01 22:44:50 -0700 |
|---|---|---|
| committer | The Android Open Source Project <initial-contribution@android.com> | 2009-07-01 22:44:50 -0700 |
| commit | 4dd4ce292ed6562193de2e683c15ec510c07df83 (patch) | |
| tree | 299e4f2ed38a18cc75db75e32b829487803d0bbf /core/res | |
| parent | f73a65c2d7c06e5c1b30b84e3931d2a53145417b (diff) | |
| parent | c56096fe1fe3486102079f06ca5de3e2bef12e47 (diff) | |
| download | frameworks_base-4dd4ce292ed6562193de2e683c15ec510c07df83.zip frameworks_base-4dd4ce292ed6562193de2e683c15ec510c07df83.tar.gz frameworks_base-4dd4ce292ed6562193de2e683c15ec510c07df83.tar.bz2 | |
am c56096fe: Merge change 5878 into donut
Merge commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47'
* commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47':
Add new attribute 'searchSettingsDescription' for use within an app's
Diffstat (limited to 'core/res')
| -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 4c84732..b4d9172 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 414382d..7af49a6 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" /> |