commit b00811da646a2ea335074f2a478f3c18b1a09274
author Fan Zhang <zhfan@google.com> Tue Feb 28 10:52:46 2017 -0800
committer Fan Zhang <zhfan@google.com> Wed Mar 01 12:56:58 2017 -0800
tree 3c1edb4ad2d5e586eb4e334315b5379af6ca92bb
parent 6c146f2ab57f763d90364641aeab6d6217b04aef

Let fragment and indexProvider share prefControllers

Bug: 35812240
Test: make RunSettingsRoboTests
Change-Id: Ifd96f935836a52e0a56f170f3cdf9b9ddf7c499a

src/com/android/settings/DisplaySettings.java

diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java
index 1e0547b..6fbffe8 100644
--- a/src/com/android/settings/DisplaySettings.java
+++ b/src/com/android/settings/DisplaySettings.java
@@ -69,6 +69,15 @@
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context);
+    }
+
+    @Override
+    protected int getHelpResource() {
+        return R.string.help_uri_display;
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new AutoBrightnessPreferenceController(context));
         controllers.add(new AutoRotatePreferenceController(context));
@@ -87,11 +96,6 @@
         return controllers;
     }
 
-    @Override
-    protected int getHelpResource() {
-        return R.string.help_uri_display;
-    }
-
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -106,32 +110,8 @@
                 }
 
                 @Override
-                public List<String> getNonIndexableKeys(Context context) {
-                    ArrayList<String> result = new ArrayList<>();
-
-                    new AutoBrightnessPreferenceController(context).updateNonIndexableKeys(result);
-                    new AutoRotatePreferenceController(context).updateNonIndexableKeys(result);
-                    new CameraGesturePreferenceController(context).updateNonIndexableKeys(result);
-                    new DozePreferenceController(context).updateNonIndexableKeys(result);
-                    new FontSizePreferenceController(context).updateNonIndexableKeys(result);
-                    new LiftToWakePreferenceController(context).updateNonIndexableKeys(result);
-                    new NightDisplayPreferenceController(context).updateNonIndexableKeys(result);
-                    new NightModePreferenceController(context).updateNonIndexableKeys(result);
-                    new ScreenSaverPreferenceController(context).updateNonIndexableKeys(result);
-                    new TapToWakePreferenceController(context).updateNonIndexableKeys(result);
-                    new TimeoutPreferenceController(context).updateNonIndexableKeys(result);
-                    new VrDisplayPreferenceController(context).updateNonIndexableKeys(result);
-                    new WallpaperPreferenceController(context).updateNonIndexableKeys(result);
-                    new ThemePreferenceController(context).updateNonIndexableKeys(result);
-
-                    return result;
-                }
-
-                @Override
                 public List<PreferenceController> getPreferenceControllers(Context context) {
-                    final List<PreferenceController> controllers = new ArrayList<>();
-                    controllers.add(new AutoBrightnessPreferenceController(context));
-                    return controllers;
+                    return buildPreferenceControllers(context);
                 }
             };
 }