Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 88cd369c: Merge change 25048 into eclair

Browse Source 
Merge commit '88cd369c33ed2fe194e889b05559eb172e4896ac' into eclair-plus-aosp

* commit '88cd369c33ed2fe194e889b05559eb172e4896ac':
  Revert "Deprecate showSearchIconAsBadge and icon search attrs"
This commit is contained in:
Bjorn Bringert
2009-09-15 13:45:49 -07:00
committed by Android Git Automerger
parent dd4819f377 88cd369c33
commit d8681c9a93
2 changed files with 3 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
api/current.xml
View File

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

9
core/res/res/values/attrs.xml
View File

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