From ab50b86b79936623b5e326f2ed84b3c947c8ec93 Mon Sep 17 00:00:00 2001
From: Bjorn Bringert <bringert@android.com>
Date: Fri, 11 Sep 2009 15:44:51 +0100
Subject: [PATCH] Deprecate showSearchIconAsBadge and icon search attrs

mlebeau says:
"Basically, because we now show the app icon for in-app
search, showSearchIconAsBadge is a bit unnecessary, but it does in
fact still work. Basically if either showSearchIconAsBadge or
showSearchLabelAsBadge are specified, we grow the height of the search
bar and place the provided icon or the provided label, respectively,
above the text field and app icon. But we do not remove the app icon
if the developer specifies showSearchIconAsBadge - it's still just the
'badge area' above the icon."

Fixes:
http://b/issue?id=2105329
"Deprecate searchable attributes 'showSearchIconAsBadge' and 'icon'"

Change-Id: Ie2976aafe42b4ab870be9e64b34eb0ed441ebbb0
---
 api/current.xml               | 2 +-
 core/res/res/values/attrs.xml | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/api/current.xml b/api/current.xml
index f2fb7c00d8ad4..f8cf61fdf160e 100644
--- a/api/current.xml
+++ b/api/current.xml
@@ -6825,7 +6825,7 @@
  value="16843221"
  static="true"
  final="true"
- deprecated="not deprecated"
+ deprecated="deprecated"
  visibility="public"
 >
 </field>
diff --git a/core/res/res/values/attrs.xml b/core/res/res/values/attrs.xml
index 568ed920dd29d..d1cb0bd78cf33 100644
--- a/core/res/res/values/attrs.xml
+++ b/core/res/res/values/attrs.xml
@@ -2843,7 +2843,9 @@
              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> -->
+             <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" />
         <!-- This is the user-displayed name of the searchable activity.  <i>Required
             attribute.</i> -->
@@ -2868,7 +2870,10 @@
           <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.-->
+               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" />
           <!-- 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