Merge "Revert "Share preference controller in AdavancedAppSettings search""

src/com/android/settings/applications/AdvancedAppSettings.java

@@ -18,8 +18,8 @@ package com.android.settings.applications;
 import android.app.Activity;
 import android.content.Context;
 import android.provider.SearchIndexableResource;
-import android.text.TextUtils;
 
+import android.text.TextUtils;
 import com.android.internal.logging.nano.MetricsProto.MetricsEvent;
 import com.android.settings.R;
 import com.android.settings.applications.defaultapps.DefaultBrowserPreferenceController;
@@ -57,15 +57,6 @@ public class AdvancedAppSettings extends DashboardFragment {
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
-        return buildPreferenceControllers(context);
-    }
-
-    @Override
-    public int getMetricsCategory() {
-        return MetricsEvent.APPLICATIONS_ADVANCED;
-    }
-
-    private static List<PreferenceController> buildPreferenceControllers(Context context) {
         final List<PreferenceController> controllers = new ArrayList<>();
         controllers.add(new DefaultBrowserPreferenceController(context));
         controllers.add(new DefaultWorkBrowserPreferenceController(context));
@@ -77,6 +68,11 @@ public class AdvancedAppSettings extends DashboardFragment {
         return controllers;
     }
 
+    @Override
+    public int getMetricsCategory() {
+        return MetricsEvent.APPLICATIONS_ADVANCED;
+    }
+
     public static final Indexable.SearchIndexProvider SEARCH_INDEX_DATA_PROVIDER =
             new BaseSearchIndexProvider() {
                 @Override
@@ -98,11 +94,6 @@ public class AdvancedAppSettings extends DashboardFragment {
                             .getPreferenceKey());
                     return keys;
                 }
-
-                @Override
-                public List<PreferenceController> getPreferenceControllers(Context context) {
-                    return buildPreferenceControllers(context);
-                }
             };
 
     static class SummaryProvider implements SummaryLoader.SummaryProvider {

tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider

@@ -1 +1,2 @@
+com.android.settings.applications.AdvancedAppSettings
 com.android.settings.fuelgauge.PowerUsageSummary