提交: a771c0e925565959173e67fa8478a8c45c0d7d8c - packages-apps-Settings (git)

packages/apps/Settings

Commit MetaInfo

• 修订版: a771c0e925565959173e67fa8478a8c45c0d7d8c (tree)
• 时间: 2016-10-08 21:49:39
• 作者: Steve Kondik <steve@cyng...>
• Commiter: Gerrit Code Review

Log Message

settings: Correctly index SwitchPreferences

Change-Id: I5a2b006823954055b0c3892e8b20ce9df6ca8803

更改概述

• modified: src/com/android/settings/search/Index.java

差异

--- a/src/com/android/settings/search/Index.java
+++ b/src/com/android/settings/search/Index.java
@@ -161,6 +161,7 @@ public class Index {
     private static final String NODE_NAME_PREFERENCE_SCREEN = "PreferenceScreen";
     private static final String NODE_NAME_CHECK_BOX_PREFERENCE = "CheckBoxPreference";
     private static final String NODE_NAME_LIST_PREFERENCE = "ListPreference";
+    private static final String NODE_NAME_SWITCH_PREFERENCE = "SwitchPreference";
 
     private static final List<String> EMPTY_LIST = Collections.<String>emptyList();
 
@@ -900,7 +901,8 @@ public class Index {
                 title = getDataTitle(context, attrs);
                 keywords = getDataKeywords(context, attrs);
 
-                if (!nodeName.equals(NODE_NAME_CHECK_BOX_PREFERENCE)) {
+                if (!nodeName.endsWith(NODE_NAME_CHECK_BOX_PREFERENCE) &&
+                        !nodeName.endsWith(NODE_NAME_SWITCH_PREFERENCE)) {
                     summary = getDataSummary(context, attrs);
 
                     String entries = null;