am c56096fe: Merge change 5878 into donut

Merge commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47'

* commit 'c56096fe1fe3486102079f06ca5de3e2bef12e47':
  Add new attribute 'searchSettingsDescription' for use within an app's

api/current.xml

@@ -3485,17 +3485,6 @@
  visibility="public"
 >
 </field>
-<field name="donut_resource_pad22"
- type="int"
- transient="false"
- volatile="false"
- value="16843402"
- static="true"
- final="true"
- deprecated="not deprecated"
- visibility="public"
->
-</field>
 <field name="donut_resource_pad3"
  type="int"
  transient="false"
@@ -7379,6 +7368,17 @@
  visibility="public"
 >
 </field>
+<field name="searchSettingsDescription"
+ type="int"
+ transient="false"
+ volatile="false"
+ value="16843402"
+ static="true"
+ final="true"
+ deprecated="not deprecated"
+ visibility="public"
+>
+</field>
 <field name="searchSuggestAuthority"
  type="int"
  transient="false"

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>
 

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" />