Share preference controllers between fragment/searchIndexer

Test: make RunSettingsRoboTests
Change-Id: I9042bac87b7c063b89c143d3089ed4d94f77b994
Fix: 35812240

src/com/android/settings/gestures/AssistGestureSettings.java

@@ -22,6 +22,7 @@ import android.provider.SearchIndexableResource;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@ public class AssistGestureSettings extends DashboardFragment {
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new AssistGesturePreferenceController(context, getLifecycle()));
+        controllers.add(new AssistGesturePreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,6 +75,11 @@ public class AssistGestureSettings extends DashboardFragment {
                     sir.xmlResId = R.xml.assist_gesture_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }
 

src/com/android/settings/gestures/DoubleTapPowerSettings.java

@@ -22,6 +22,7 @@ import android.provider.SearchIndexableResource;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@ public class DoubleTapPowerSettings extends DashboardFragment {
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new DoubleTapPowerPreferenceController(context, getLifecycle()));
+        controllers.add(new DoubleTapPowerPreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,5 +75,10 @@ public class DoubleTapPowerSettings extends DashboardFragment {
                     sir.xmlResId = R.xml.double_tap_power_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }

src/com/android/settings/gestures/DoubleTapScreenSettings.java

@@ -24,6 +24,7 @@ import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,8 +54,13 @@ public class DoubleTapScreenSettings extends DashboardFragment {
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new DoubleTapScreenPreferenceController(context, getLifecycle(),
+        controllers.add(new DoubleTapScreenPreferenceController(context, lifecycle,
                 new AmbientDisplayConfiguration(context), UserHandle.myUserId()));
         return controllers;
     }
@@ -72,5 +78,10 @@ public class DoubleTapScreenSettings extends DashboardFragment {
                     sir.xmlResId = R.xml.double_tap_screen_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }

src/com/android/settings/gestures/DoubleTwistGestureSettings.java

@@ -22,6 +22,7 @@ import android.provider.SearchIndexableResource;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new DoubleTwistPreferenceController(context, getLifecycle()));
+        controllers.add(new DoubleTwistPreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,5 +75,11 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
                     sir.xmlResId = R.xml.double_twist_gesture_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
+
 }

src/com/android/settings/gestures/PickupGestureSettings.java

@@ -24,6 +24,7 @@ import com.android.internal.hardware.AmbientDisplayConfiguration;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -53,8 +54,13 @@ public class PickupGestureSettings extends DashboardFragment {
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new PickupGesturePreferenceController(context, getLifecycle(),
+        controllers.add(new PickupGesturePreferenceController(context, lifecycle,
                 new AmbientDisplayConfiguration(context), UserHandle.myUserId()));
         return controllers;
     }
@@ -72,6 +78,11 @@ public class PickupGestureSettings extends DashboardFragment {
                     sir.xmlResId = R.xml.pick_up_gesture_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 
 }

src/com/android/settings/gestures/SwipeToNotificationSettings.java

@@ -22,6 +22,7 @@ import android.provider.SearchIndexableResource;
 import com.android.internal.logging.nano.MetricsProto;
 import com.android.settings.R;
 import com.android.settings.core.PreferenceController;
+import com.android.settings.core.lifecycle.Lifecycle;
 import com.android.settings.dashboard.DashboardFragment;
 import com.android.settings.overlay.FeatureFactory;
 import com.android.settings.search.BaseSearchIndexProvider;
@@ -51,8 +52,13 @@ public class SwipeToNotificationSettings extends DashboardFragment {
 
     @Override
     protected List<PreferenceController> getPreferenceControllers(Context context) {
+        return buildPreferenceControllers(context, getLifecycle());
+    }
+
+    private static List<PreferenceController> buildPreferenceControllers(Context context,
+            Lifecycle lifecycle) {
         final List<PreferenceController> controllers = new ArrayList<>();
-        controllers.add(new SwipeToNotificationPreferenceController(context, getLifecycle()));
+        controllers.add(new SwipeToNotificationPreferenceController(context, lifecycle));
         return controllers;
     }
 
@@ -69,5 +75,10 @@ public class SwipeToNotificationSettings extends DashboardFragment {
                     sir.xmlResId = R.xml.swipe_to_notification_settings;
                     return Arrays.asList(sir);
                 }
+
+                @Override
+                public List<PreferenceController> getPreferenceControllers(Context context) {
+                    return buildPreferenceControllers(context, null /* lifecycle */);
+                }
             };
 }

tests/robotests/assets/grandfather_not_sharing_pref_controllers_with_search_provider

@@ -1,11 +1,5 @@
-com.android.settings.gestures.PickupGestureSettings
 com.android.settings.language.LanguageAndInputSettings
 com.android.settings.enterprise.EnterprisePrivacySettings
-com.android.settings.gestures.DoubleTapScreenSettings
 com.android.settings.applications.AdvancedAppSettings
-com.android.settings.gestures.AssistGestureSettings
 com.android.settings.fuelgauge.PowerUsageSummary
-com.android.settings.gestures.SwipeToNotificationSettings
 com.android.settings.inputmethod.InputMethodAndLanguageSettings
-com.android.settings.gestures.DoubleTapPowerSettings
-com.android.settings.gestures.DoubleTwistGestureSettings