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

am d05fd6c3: am dbc7e27e: docs: document the \'showSearchIconAsBadge" flag and "icon" attribute as deprecated. bug 2105329

Browse Source 
Merge commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f' into eclair-plus-aosp

* commit 'd05fd6c33518e60664ffdf1bb6cb425f36c2b82f':
  docs: document the 'showSearchIconAsBadge" flag and
This commit is contained in:
Scott Main
2009-11-13 11:11:57 -08:00
committed by Android Git Automerger
parent 0a75f008c2 d05fd6c335
commit 7c8fcc19db
2 changed files with 17 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
core/java/android/app/SearchManager.java
View File

@@ -769,17 +769,15 @@ import java.util.List;
* </tr>
*
* <tr><th>android:icon</th>
* <td>If provided, this icon will be shown in place of the label above the search box.
* This is a reference to a drawable (icon) resource. Note that the application icon
* 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.</td>
* <td><strong>This is deprecated.</strong><br/>The default
* application icon is now always used, so this attribute is
* obsolete.</td>
* <td align="center">No</td>
* </tr>
*
* <tr><th>android:hint</th>
* <td>This is the text to display in the search text field when no user text has been
* entered.</td>
* <td>This is the text to display in the search text field when no text
* has been entered by the user.</td>
* <td align="center">No</td>
* </tr>
*
@@ -790,17 +788,14 @@ import java.util.List;
* <tbody>
* <tr><th>showSearchLabelAsBadge</th>
* <td>If set, this flag enables the display of the search target (label)
* above the search box. If this flag and showSearchIconAsBadge
* (see below) are both not set, no badge will be shown.</td>
* above the search box. As an alternative, you may
* want to instead use "hint" text in the search box.
* See the "android:hint" attribute above.</td>
* </tr>
* <tr><th>showSearchIconAsBadge</th>
* <td>If set, this flag enables the display of the search target (icon)
* above the search box. If this flag and showSearchLabelAsBadge
* (see above) are both not set, no badge will be shown. If both flags
* are set, showSearchIconAsBadge has precedence and the icon will be
* shown. Because the application icon is now used to the left of the
* search box by default, using this search mode is no longer necessary
* and may be deprecated in the future.</td>
* <td><strong>This is deprecated.</strong><br/>The default
* application icon is now always used, so this
* option is obsolete.</td>
* </tr>
* <tr><th>queryRewriteFromData</th>
* <td>If set, this flag causes the suggestion column SUGGEST_COLUMN_INTENT_DATA