diff options
author | Tony Mantler <nicoya@google.com> | 2017-06-13 13:09:25 -0700 |
---|---|---|
committer | Tony Mantler <nicoya@google.com> | 2017-06-26 10:58:36 -0700 |
commit | 1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa (patch) | |
tree | 57a949e2cd7d90057cf387c07a6b215e002205e9 /src/com/android/settings/system/ResetDashboardFragment.java | |
parent | 4bac4215383227edf77a139e6f33bcc5689996b7 (diff) | |
download | packages_apps_Settings-1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa.tar.gz packages_apps_Settings-1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa.tar.bz2 packages_apps_Settings-1d583e125faf3ae4c9cd82636d8f3ecf1cdec3aa.zip |
Make PreferenceController a mixin
Bug: 62912136
Test: Existing tests in BaseSearchIndexProviderTest
Change-Id: Ieda359806c09a019840b2005446c7ec8b61fdb00
Diffstat (limited to 'src/com/android/settings/system/ResetDashboardFragment.java')
-rw-r--r-- | src/com/android/settings/system/ResetDashboardFragment.java | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index c04e3744d1..48295a42e1 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -22,11 +22,11 @@ import android.provider.SearchIndexableResource; import com.android.internal.logging.nano.MetricsProto; import com.android.settings.R; import com.android.settings.applications.ResetAppPrefPreferenceController; -import com.android.settings.core.PreferenceController; import com.android.settings.dashboard.DashboardFragment; import com.android.settings.network.NetworkResetPreferenceController; import com.android.settings.search.BaseSearchIndexProvider; import com.android.settings.search.Indexable; +import com.android.settingslib.core.AbstractPreferenceController; import com.android.settingslib.core.lifecycle.Lifecycle; import java.util.ArrayList; @@ -52,13 +52,13 @@ public class ResetDashboardFragment extends DashboardFragment { } @Override - protected List<PreferenceController> getPreferenceControllers(Context context) { + protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } - private static List<PreferenceController> buildPreferenceControllers(Context context, + private static List<AbstractPreferenceController> buildPreferenceControllers(Context context, Lifecycle lifecycle) { - final List<PreferenceController> controllers = new ArrayList<>(); + final List<AbstractPreferenceController> controllers = new ArrayList<>(); controllers.add(new NetworkResetPreferenceController(context)); controllers.add(new FactoryResetPreferenceController(context)); controllers.add(new ResetAppPrefPreferenceController(context, lifecycle)); @@ -79,7 +79,7 @@ public class ResetDashboardFragment extends DashboardFragment { } @Override - public List<PreferenceController> getPreferenceControllers(Context context) { + public List<AbstractPreferenceController> getPreferenceControllers(Context context) { return buildPreferenceControllers(context, null /* lifecycle */); } }; |