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

Commit 4dd4ce29 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am c56096fe: Merge change 5878 into donut 

Merge commit 'c56096fe'

* commit 'c56096fe':
  Add new attribute 'searchSettingsDescription' for use within an app's
parents f73a65c2 c56096fe

api/current.xml

+11 −11
Original line number Original line Diff line number Diff line
@@ -3485,17 +3485,6 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

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

<field name="donut_resource_pad3"

 type="int"

 type="int"

 transient="false"

 transient="false"
@@ -7379,6 +7368,17 @@ 
 visibility="public"

 visibility="public"

>

>

</field>

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

<field name="searchSuggestAuthority"

 type="int"

 type="int"

 transient="false"

 transient="false"

core/res/res/values/attrs.xml

+5 −0
Original line number Original line Diff line number Diff line
@@ -2880,6 +2880,11 @@ 
             The default value is <code>false</code>. <i>Optional attribute.</i>. -->

             The default value is <code>false</code>. <i>Optional attribute.</i>. -->

        <attr name="queryAfterZeroResults" format="boolean" />

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

    </declare-styleable>





    <!-- In order to process special action keys during search, you must define them using

    <!-- In order to process special action keys during search, you must define them using

core/res/res/values/public.xml

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

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

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

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

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

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

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





  <public-padding type="attr" name="donut_resource_pad" end="0x0101029f" />

  <public-padding type="attr" name="donut_resource_pad" end="0x0101029f" />