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

Commit d27b1083 authored by Scott Main's avatar Scott Main
Browse files

docs only. 

add Searchable resource information to the Available Resources doc
and update some some of the attribute documentation to indicate
that the icon label is not recommended.
and fixing merge issue...

Change-Id: I1b1a62aa9804f4a0bf2f93328dde90b9f7aec50a
parent e0408aa1

core/java/android/app/SearchManager.java

+12 −12
Original line number Diff line number Diff line
@@ -768,8 +768,11 @@ import java.util.List; 
 *     </tr>

 *     

 *     <tr><th>android:icon</th>

 *         <td>If provided, this icon will be used <i>in place</i> of the label string.  This

 *         is provided in order to present logos or other non-textual banners.</td>

 *         <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 align="center">No</td>

 *     </tr>

 *
@@ -779,11 +782,6 @@ import java.util.List; 
 *         <td align="center">No</td>

 *     </tr>

 *     

 *     <tr><th>android:searchButtonText</th>

 *         <td>If provided, this text will replace the default text in the "Search" button.</td>

 *         <td align="center">No</td>

 *     </tr>

 *     

 *     <tr><th>android:searchMode</th>

 *         <td>If provided and non-zero, sets additional modes for control of the search 

 *             presentation.  The following mode bits are defined:
@@ -791,15 +789,17 @@ import java.util.List; 
 *                 <tbody>

 *                 <tr><th>showSearchLabelAsBadge</th>

 *                     <td>If set, this flag enables the display of the search target (label) 

 *                         within the search bar.  If this flag and showSearchIconAsBadge

 *                         above the search box.  If this flag and showSearchIconAsBadge

 *                         (see below) are both not set, no badge will be shown.</td>

 *                 </tr>

 *                 <tr><th>showSearchIconAsBadge</th>

 *                     <td>If set, this flag enables the display of the search target (icon) within

 *                         the search bar.  If this flag and showSearchLabelAsBadge

 *                     <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.</td>

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

 *                 </tr>

 *                 <tr><th>queryRewriteFromData</th>

 *                     <td>If set, this flag causes the suggestion column SUGGEST_COLUMN_INTENT_DATA

core/res/res/values/attrs.xml

+5 −4
Original line number Diff line number Diff line
@@ -2759,9 +2759,11 @@ 
        For a more in-depth discussion of search configuration, please refer to

        {@link android.app.SearchManager}. -->

    <declare-styleable name="Searchable">

        <!-- If provided, this icon will be shown in place of the label.  It is typically used

             in order to identify a searchable application via a logo or branding, instead of

             plain text.  This is a reference to a drawable (icon) resource.

        <!-- 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.

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

        <attr name="icon" />

        <!-- This is the user-displayed name of the searchable activity.  <i>Required
@@ -3330,4 +3332,3 @@ 




</resources>

docs/html/guide/topics/resources/available-resources.jd

+326 −10

File changed.

Preview size limit exceeded, changes collapsed.