commit d407f2a05c8f8a81d5ea7bf9ad34bd491dc2d742
author Fabrice Di Meglio <fdimeglio@google.com> Mon Jun 09 10:13:43 2014 -0700
committer Fabrice Di Meglio <fdimeglio@google.com> Mon Jun 09 10:13:43 2014 -0700
tree dcac64809c5a96d760adbf9aed3ad52e14ffc548
parent 38e0a866182c4a534cc33dab2c9fcaab4f8d53cc

Fix DisplaySettings indexing for Search

- was missing the KEY_SCREEN_SAVER case as this Preference
can be removed

See bug: #12910134 Implement Search into the Settings App

Change-Id: I6c6fde41d0208a2e87e7fb1239c0909e034e5b0d

src/com/android/settings/DisplaySettings.java

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 75236de..ae1d8d1 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -299,7 +299,8 @@
                 @Override
                 public List<SearchIndexableResource> getXmlResourcesToIndex(Context context,
                         boolean enabled) {
-                    ArrayList<SearchIndexableResource> result = new ArrayList<>(1);
+                    ArrayList<SearchIndexableResource> result =
+                            new ArrayList<SearchIndexableResource>();
 
                     SearchIndexableResource sir = new SearchIndexableResource(context);
                     sir.xmlResId = R.xml.display_settings;
@@ -310,11 +311,15 @@
 
                 @Override
                 public List<String> getNonIndexableKeys(Context context) {
-                    ArrayList<String> nonIndexableKeys = new ArrayList<>(1);
-                    if (!isAutomaticBrightnessAvailable(context.getResources())) {
-                        nonIndexableKeys.add(KEY_AUTO_BRIGHTNESS);
+                    ArrayList<String> result = new ArrayList<String>();
+                    if (!context.getResources().getBoolean(
+                            com.android.internal.R.bool.config_dreamsSupported)) {
+                        result.add(KEY_SCREEN_SAVER);
                     }
-                    return nonIndexableKeys;
+                    if (!isAutomaticBrightnessAvailable(context.getResources())) {
+                        result.add(KEY_AUTO_BRIGHTNESS);
+                    }
+                    return result;
                 }
             };
 }