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

Commit 88cd369c authored by Android (Google) Code Review's avatar Android (Google) Code Review
Browse files

Merge change 25048 into eclair 

* changes:
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"
parents 74a0b820 ed2c13a9

api/current.xml

+1 −1
Original line number Original line Diff line number Diff line
@@ -6825,7 +6825,7 @@ 
 value="16843221"

 value="16843221"

 static="true"

 static="true"

 final="true"

 final="true"

 deprecated="deprecated"

 deprecated="not deprecated"

 visibility="public"

 visibility="public"

>

>

</field>

</field>

core/res/res/values/attrs.xml

+2 −7
Original line number Original line Diff line number Diff line
@@ -2843,9 +2843,7 @@ 
             is also used as an icon to the left of the search box and you cannot modify this

             is also used as an icon to the left of the search box and you cannot modify this

             behavior, so including the icon attribute is unecessary and this may be

             behavior, so including the icon attribute is unecessary and this may be

             deprecated in the future.

             deprecated in the future.

             <i>Optional attribute.</i>

             <i>Optional attribute.</i> -->

             {@deprecated This will create a non-standard UI appearance, because the search bar UI

              now puts the activity or application icon beside the search box.} -->

        <attr name="icon" />

        <attr name="icon" />

        <!-- This is the user-displayed name of the searchable activity.  <i>Required

        <!-- This is the user-displayed name of the searchable activity.  <i>Required

            attribute.</i> -->

            attribute.</i> -->
@@ -2870,10 +2868,7 @@ 
          <flag name="showSearchLabelAsBadge" value="0x04" />

          <flag name="showSearchLabelAsBadge" value="0x04" />

          <!-- If set, this flag enables the display of the search target (icon) within the

          <!-- If set, this flag enables the display of the search target (icon) within the

               search bar.  (Note, overrides showSearchLabel)  If neither bad mode is selected,

               search bar.  (Note, overrides showSearchLabel)  If neither bad mode is selected,

               no badge will be shown.

               no badge will be shown.-->

              {@deprecated This will create a non-standard UI appearance, because the search bar UI

              now puts the activity or application icon beside the search box.}

               -->

          <flag name="showSearchIconAsBadge" value="0x08" />

          <flag name="showSearchIconAsBadge" value="0x08" />

          <!-- If set, this flag causes the suggestion column SUGGEST_COLUMN_INTENT_DATA to

          <!-- If set, this flag causes the suggestion column SUGGEST_COLUMN_INTENT_DATA to

               be considered as the text for suggestion query rewriting.  This should only

               be considered as the text for suggestion query rewriting.  This should only