diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-15 14:51:56 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-09-15 14:51:56 -0400 |
| commit | 88cd369c33ed2fe194e889b05559eb172e4896ac (patch) | |
| tree | e72894b219b931f0c70b535bbf82774a44bc2c3c | |
| parent | 74a0b8209e0228bb48739a4b25e489e2eba2a2c4 (diff) | |
| parent | ed2c13a9d2e8b3c1bdf1ad54e45b1a9ff4d364b7 (diff) | |
| download | frameworks_base-88cd369c33ed2fe194e889b05559eb172e4896ac.zip frameworks_base-88cd369c33ed2fe194e889b05559eb172e4896ac.tar.gz frameworks_base-88cd369c33ed2fe194e889b05559eb172e4896ac.tar.bz2 | |
Merge change 25048 into eclair
* changes:
Revert "Deprecate showSearchIconAsBadge and icon search attrs"
| -rw-r--r-- | api/current.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/attrs.xml | 9 |
2 files changed, 3 insertions, 8 deletions
diff --git a/api/current.xml b/api/current.xml index f7df7c9..7562f2e 100644 --- a/api/current.xml +++ b/api/current.xml @@ -6825,7 +6825,7 @@ value="16843221" static="true" final="true" - deprecated="deprecated" + deprecated="not deprecated" visibility="public" > </field> diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml index d1cb0bd..568ed92 100644 --- a/core/res/res/values/attrs.xml +++ b/core/res/res/values/attrs.xml @@ -2843,9 +2843,7 @@ 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 deprecated in the future. - <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.} --> + <i>Optional attribute.</i> --> <attr name="icon" /> <!-- This is the user-displayed name of the searchable activity. <i>Required attribute.</i> --> @@ -2870,10 +2868,7 @@ <flag name="showSearchLabelAsBadge" value="0x04" /> <!-- 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, - 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.} - --> + no badge will be shown.--> <flag name="showSearchIconAsBadge" value="0x08" /> <!-- 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 |