diff --git a/src/com/android/settings/DateTimeSettings.java b/src/com/android/settings/DateTimeSettings.java index 18a7ee1eb4f..2a4934c3f60 100644 --- a/src/com/android/settings/DateTimeSettings.java +++ b/src/com/android/settings/DateTimeSettings.java @@ -73,7 +73,7 @@ public class DateTimeSettings extends DashboardFragment implements } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final Activity activity = getActivity(); final Intent intent = activity.getIntent(); @@ -112,10 +112,10 @@ public class DateTimeSettings extends DashboardFragment implements public Dialog onCreateDialog(int id) { switch (id) { case DatePreferenceController.DIALOG_DATEPICKER: - return getPreferenceController(DatePreferenceController.class) + return use(DatePreferenceController.class) .buildDatePicker(getActivity()); case TimePreferenceController.DIALOG_TIMEPICKER: - return getPreferenceController(TimePreferenceController.class) + return use(TimePreferenceController.class) .buildTimePicker(getActivity()); default: throw new IllegalArgumentException(); diff --git a/src/com/android/settings/DisplaySettings.java b/src/com/android/settings/DisplaySettings.java index fb5aae063cf..5bad368d9c2 100644 --- a/src/com/android/settings/DisplaySettings.java +++ b/src/com/android/settings/DisplaySettings.java @@ -74,7 +74,7 @@ public class DisplaySettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/accessibility/VibrationSettings.java b/src/com/android/settings/accessibility/VibrationSettings.java index fedb98c0ce9..4b19d93359f 100644 --- a/src/com/android/settings/accessibility/VibrationSettings.java +++ b/src/com/android/settings/accessibility/VibrationSettings.java @@ -52,7 +52,7 @@ public class VibrationSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/accounts/AccountDashboardFragment.java b/src/com/android/settings/accounts/AccountDashboardFragment.java index 9702102a862..cab5dab0c1a 100644 --- a/src/com/android/settings/accounts/AccountDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDashboardFragment.java @@ -62,7 +62,7 @@ public class AccountDashboardFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES); final AccountPreferenceController accountPrefController = diff --git a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java index 9239b8e4659..109e782bd15 100644 --- a/src/com/android/settings/accounts/AccountDetailDashboardFragment.java +++ b/src/com/android/settings/accounts/AccountDetailDashboardFragment.java @@ -109,7 +109,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); mAccountSynController = new AccountSyncPreferenceController(context); controllers.add(mAccountSynController); diff --git a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java index 00640c3c88c..7b62078339d 100644 --- a/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java +++ b/src/com/android/settings/applications/AppAndNotificationDashboardFragment.java @@ -58,7 +58,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final Activity activity = getActivity(); final Application app; if (activity != null) { diff --git a/src/com/android/settings/applications/DefaultAppSettings.java b/src/com/android/settings/applications/DefaultAppSettings.java index 07467ef1121..7d74fbdd017 100644 --- a/src/com/android/settings/applications/DefaultAppSettings.java +++ b/src/com/android/settings/applications/DefaultAppSettings.java @@ -60,7 +60,7 @@ public class DefaultAppSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/applications/SpecialAccessSettings.java b/src/com/android/settings/applications/SpecialAccessSettings.java index 3f1ba94581d..6387ec7053d 100644 --- a/src/com/android/settings/applications/SpecialAccessSettings.java +++ b/src/com/android/settings/applications/SpecialAccessSettings.java @@ -61,7 +61,7 @@ public class SpecialAccessSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java index 8c998e9aefc..b878bc8353a 100755 --- a/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java +++ b/src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java @@ -212,7 +212,7 @@ public class AppInfoDashboardFragment extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { retrieveAppEntry(); if (mPackageInfo == null) { return null; diff --git a/src/com/android/settings/applications/assist/ManageAssist.java b/src/com/android/settings/applications/assist/ManageAssist.java index 3fbf756111b..f5a38383180 100644 --- a/src/com/android/settings/applications/assist/ManageAssist.java +++ b/src/com/android/settings/applications/assist/ManageAssist.java @@ -51,7 +51,7 @@ public class ManageAssist extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/backup/BackupSettingsFragment.java b/src/com/android/settings/backup/BackupSettingsFragment.java index e6bb12db860..e9bcc6fe9ec 100644 --- a/src/com/android/settings/backup/BackupSettingsFragment.java +++ b/src/com/android/settings/backup/BackupSettingsFragment.java @@ -61,7 +61,7 @@ public class BackupSettingsFragment extends DashboardFragment { * Get a list of {@link AbstractPreferenceController} for this fragment. */ @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); controllers.add(new BackupSettingsPreferenceController(context)); return controllers; diff --git a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java index a762fa1d853..b9cfa00cc76 100644 --- a/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java +++ b/src/com/android/settings/bluetooth/BluetoothDeviceDetailsFragment.java @@ -136,7 +136,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { ArrayList controllers = new ArrayList<>(); if (mCachedDevice != null) { diff --git a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java index 5e003feda13..0e556c43d7a 100644 --- a/src/com/android/settings/bluetooth/BluetoothPairingDetail.java +++ b/src/com/android/settings/bluetooth/BluetoothPairingDetail.java @@ -193,7 +193,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); controllers.add( new BluetoothDeviceRenamePreferenceController(context, KEY_RENAME_DEVICES, this, diff --git a/src/com/android/settings/bluetooth/BluetoothSettings.java b/src/com/android/settings/bluetooth/BluetoothSettings.java index 7ec0a67fa33..47952c64148 100644 --- a/src/com/android/settings/bluetooth/BluetoothSettings.java +++ b/src/com/android/settings/bluetooth/BluetoothSettings.java @@ -363,7 +363,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final Lifecycle lifecycle = getLifecycle(); mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context, lifecycle); diff --git a/src/com/android/settings/bluetooth/DevicePickerFragment.java b/src/com/android/settings/bluetooth/DevicePickerFragment.java index 847a9c90217..07cda3d0233 100644 --- a/src/com/android/settings/bluetooth/DevicePickerFragment.java +++ b/src/com/android/settings/bluetooth/DevicePickerFragment.java @@ -170,7 +170,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } diff --git a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java index 869444dd0ab..6a1568dfc10 100644 --- a/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/AdvancedConnectedDeviceDashboardFragment.java @@ -65,7 +65,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java index 288c544400f..8aab3cf3dfa 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragment.java @@ -58,7 +58,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final Lifecycle lifecycle = getLifecycle(); diff --git a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java index a9ba6e51c9a..304a369db4d 100644 --- a/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java +++ b/src/com/android/settings/connecteddevice/ConnectedDeviceDashboardFragmentOld.java @@ -71,7 +71,7 @@ public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final Lifecycle lifecycle = getLifecycle(); final NfcPreferenceController nfcPreferenceController = diff --git a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java index 3cb568bada1..f758e23914e 100644 --- a/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java +++ b/src/com/android/settings/connecteddevice/usb/UsbDetailsFragment.java @@ -79,7 +79,7 @@ public class UsbDetailsFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { mUsbBackend = new UsbBackend(context); mControllers = createControllerList(context, mUsbBackend, this); mUsbReceiver = new UsbConnectionBroadcastReceiver(context, mUsbConnectionListener, diff --git a/src/com/android/settings/dashboard/DashboardFragment.java b/src/com/android/settings/dashboard/DashboardFragment.java index 8f9f95ad621..90c781bd94e 100644 --- a/src/com/android/settings/dashboard/DashboardFragment.java +++ b/src/com/android/settings/dashboard/DashboardFragment.java @@ -72,7 +72,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment final List controllers = new ArrayList<>(); // Load preference controllers from code final List controllersFromCode = - getPreferenceControllers(context); + createPreferenceControllers(context); // Load preference controllers from xml definition final List controllersFromXml = PreferenceControllerListHelper .getPreferenceControllersFromXml(context, getPreferenceScreenResId()); @@ -206,7 +206,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment @Override protected abstract int getPreferenceScreenResId(); - protected T getPreferenceController(Class clazz) { + protected T use(Class clazz) { List controllerList = mPreferenceControllers.get(clazz); if (controllerList != null) { if (controllerList.size() > 1) { @@ -242,7 +242,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment /** * Get a list of {@link AbstractPreferenceController} for this fragment. */ - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } diff --git a/src/com/android/settings/datausage/DataUsageSummary.java b/src/com/android/settings/datausage/DataUsageSummary.java index 339de7c022b..2d505892ab3 100644 --- a/src/com/android/settings/datausage/DataUsageSummary.java +++ b/src/com/android/settings/datausage/DataUsageSummary.java @@ -169,7 +169,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final ArrayList controllers = new ArrayList<>(); mSummaryController = new DataUsageSummaryPreferenceController(context); diff --git a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java index 6a241ebc506..f46c91e38b3 100644 --- a/src/com/android/settings/datausage/DataUsageSummaryLegacy.java +++ b/src/com/android/settings/datausage/DataUsageSummaryLegacy.java @@ -188,7 +188,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } diff --git a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java index 6a3f9d67a95..590254538a7 100644 --- a/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java +++ b/src/com/android/settings/deletionhelper/AutomaticStorageManagerSettings.java @@ -110,7 +110,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java index 16ad75267b2..e2495f0036a 100644 --- a/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java +++ b/src/com/android/settings/development/DevelopmentSettingsDashboardFragment.java @@ -302,7 +302,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { if (Utils.isMonkeyRunning()) { mPreferenceControllers = new ArrayList<>(); return null; @@ -454,7 +454,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra @VisibleForTesting T getDevelopmentOptionsController(Class clazz) { - return getPreferenceController(clazz); + return use(clazz); } /** diff --git a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java index 8f37c6793ee..32bc0ab272e 100644 --- a/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java +++ b/src/com/android/settings/development/featureflags/FeatureFlagsDashboard.java @@ -51,7 +51,7 @@ public class FeatureFlagsDashboard extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); controllers.add(new FeatureFlagsPreferenceController(context, getLifecycle())); return controllers; diff --git a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java index ca4181e7ffd..24bb5d1ab51 100644 --- a/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java +++ b/src/com/android/settings/development/qstile/DevelopmentTileConfigFragment.java @@ -40,7 +40,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); controllers.add(new DevelopmentTilePreferenceController(context)); return controllers; diff --git a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java index ac5b549679c..164bf8a4bf6 100644 --- a/src/com/android/settings/deviceinfo/DeviceInfoSettings.java +++ b/src/com/android/settings/deviceinfo/DeviceInfoSettings.java @@ -73,7 +73,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { final BuildNumberPreferenceController buildNumberPreferenceController = - getPreferenceController(BuildNumberPreferenceController.class); + use(BuildNumberPreferenceController.class); if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) { return; } @@ -91,7 +91,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getActivity(), this /* fragment */, getLifecycle()); } diff --git a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java index 4fa698a66b3..9c872a44097 100644 --- a/src/com/android/settings/deviceinfo/StorageDashboardFragment.java +++ b/src/com/android/settings/deviceinfo/StorageDashboardFragment.java @@ -167,7 +167,7 @@ public class StorageDashboardFragment extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); mSummaryController = new StorageSummaryDonutPreferenceController(context); controllers.add(mSummaryController); diff --git a/src/com/android/settings/deviceinfo/StorageProfileFragment.java b/src/com/android/settings/deviceinfo/StorageProfileFragment.java index f2383de4aa6..3f75f5c6472 100644 --- a/src/com/android/settings/deviceinfo/StorageProfileFragment.java +++ b/src/com/android/settings/deviceinfo/StorageProfileFragment.java @@ -98,7 +98,7 @@ public class StorageProfileFragment extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final StorageManager sm = context.getSystemService(StorageManager.class); mPreferenceController = diff --git a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java index 288e33b91a2..05fe326fb15 100644 --- a/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java +++ b/src/com/android/settings/deviceinfo/aboutphone/MyDeviceInfoFragment.java @@ -94,7 +94,7 @@ public class MyDeviceInfoFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getActivity(), this /* fragment */, getLifecycle()); } @@ -130,7 +130,7 @@ public class MyDeviceInfoFragment extends DashboardFragment { @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { final BuildNumberPreferenceController buildNumberPreferenceController = - getPreferenceController(BuildNumberPreferenceController.class); + use(BuildNumberPreferenceController.class); if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) { return; } diff --git a/src/com/android/settings/display/AmbientDisplaySettings.java b/src/com/android/settings/display/AmbientDisplaySettings.java index fec0ef5e275..02db6f1a4c0 100644 --- a/src/com/android/settings/display/AmbientDisplaySettings.java +++ b/src/com/android/settings/display/AmbientDisplaySettings.java @@ -76,7 +76,7 @@ public class AmbientDisplaySettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle(), new AmbientDisplayConfiguration(context), mMetricsFeatureProvider, this::updatePreferenceStates); diff --git a/src/com/android/settings/dream/DreamSettings.java b/src/com/android/settings/dream/DreamSettings.java index f8eeac33ffa..c0d4c400cc0 100644 --- a/src/com/android/settings/dream/DreamSettings.java +++ b/src/com/android/settings/dream/DreamSettings.java @@ -109,7 +109,7 @@ public class DreamSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/enterprise/ApplicationListFragment.java b/src/com/android/settings/enterprise/ApplicationListFragment.java index 7425a30f377..1b41f0396e2 100644 --- a/src/com/android/settings/enterprise/ApplicationListFragment.java +++ b/src/com/android/settings/enterprise/ApplicationListFragment.java @@ -49,7 +49,7 @@ public abstract class ApplicationListFragment extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); ApplicationListPreferenceController controller = new ApplicationListPreferenceController( context, this, context.getPackageManager(), this); diff --git a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java index cd839deb3c0..a0ad55146ca 100644 --- a/src/com/android/settings/enterprise/EnterprisePrivacySettings.java +++ b/src/com/android/settings/enterprise/EnterprisePrivacySettings.java @@ -51,7 +51,7 @@ public class EnterprisePrivacySettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, true /* async */); } diff --git a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java index a1c61deb1a0..1788c333e46 100644 --- a/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java +++ b/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragment.java @@ -48,7 +48,7 @@ public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final EnterpriseSetDefaultAppsListPreferenceController controller = new EnterpriseSetDefaultAppsListPreferenceController( diff --git a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java index 1bbb035612b..1ecb2a86cf7 100644 --- a/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java +++ b/src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java @@ -327,7 +327,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final Bundle bundle = getArguments(); final int uid = bundle.getInt(EXTRA_UID, 0); diff --git a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java index 25351d33db5..2e94e2c74bc 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAdvanced.java @@ -167,7 +167,7 @@ public class PowerUsageAdvanced extends PowerUsageBase { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } diff --git a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java index 2e771bd5cc5..abfb22b46bc 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java +++ b/src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java @@ -123,7 +123,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummary.java b/src/com/android/settings/fuelgauge/PowerUsageSummary.java index e6fd4492c45..07f4a2c3955 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummary.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummary.java @@ -228,7 +228,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final Lifecycle lifecycle = getLifecycle(); final SettingsActivity activity = (SettingsActivity) getActivity(); final List controllers = new ArrayList<>(); diff --git a/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java b/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java index 75e3d383792..ab7863c9bf0 100644 --- a/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java +++ b/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacy.java @@ -307,7 +307,7 @@ public class PowerUsageSummaryLegacy extends PowerUsageBase implements } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController( context, getActivity(), this /* host */, getLifecycle()); diff --git a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java index 656556df609..0843c98cddb 100644 --- a/src/com/android/settings/fuelgauge/RestrictedAppDetails.java +++ b/src/com/android/settings/fuelgauge/RestrictedAppDetails.java @@ -108,7 +108,7 @@ public class RestrictedAppDetails extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } diff --git a/src/com/android/settings/fuelgauge/SmartBatterySettings.java b/src/com/android/settings/fuelgauge/SmartBatterySettings.java index f96842df531..34f930a6b9f 100644 --- a/src/com/android/settings/fuelgauge/SmartBatterySettings.java +++ b/src/com/android/settings/fuelgauge/SmartBatterySettings.java @@ -64,7 +64,7 @@ public class SmartBatterySettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this); } diff --git a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java index 4d89e3e95f1..8009e954e38 100644 --- a/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java +++ b/src/com/android/settings/fuelgauge/batterysaver/BatterySaverSettings.java @@ -59,7 +59,7 @@ public class BatterySaverSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/gestures/AssistGestureSettings.java b/src/com/android/settings/gestures/AssistGestureSettings.java index a4e8f1f3113..84f4ab2ecfe 100644 --- a/src/com/android/settings/gestures/AssistGestureSettings.java +++ b/src/com/android/settings/gestures/AssistGestureSettings.java @@ -51,7 +51,7 @@ public class AssistGestureSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/gestures/DoubleTapPowerSettings.java b/src/com/android/settings/gestures/DoubleTapPowerSettings.java index 3ddc79c6be1..6b159239101 100644 --- a/src/com/android/settings/gestures/DoubleTapPowerSettings.java +++ b/src/com/android/settings/gestures/DoubleTapPowerSettings.java @@ -66,7 +66,7 @@ public class DoubleTapPowerSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/gestures/DoubleTapScreenSettings.java b/src/com/android/settings/gestures/DoubleTapScreenSettings.java index eb11fd0e969..1f0ff03b7df 100644 --- a/src/com/android/settings/gestures/DoubleTapScreenSettings.java +++ b/src/com/android/settings/gestures/DoubleTapScreenSettings.java @@ -73,7 +73,7 @@ public class DoubleTapScreenSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java index 46c9a81b6fc..69517fe46c2 100644 --- a/src/com/android/settings/gestures/DoubleTwistGestureSettings.java +++ b/src/com/android/settings/gestures/DoubleTwistGestureSettings.java @@ -66,7 +66,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/gestures/GestureSettings.java b/src/com/android/settings/gestures/GestureSettings.java index ea787c86258..1efac5bd6f9 100644 --- a/src/com/android/settings/gestures/GestureSettings.java +++ b/src/com/android/settings/gestures/GestureSettings.java @@ -63,7 +63,7 @@ public class GestureSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { if (mAmbientDisplayConfig == null) { mAmbientDisplayConfig = new AmbientDisplayConfiguration(context); } diff --git a/src/com/android/settings/gestures/PickupGestureSettings.java b/src/com/android/settings/gestures/PickupGestureSettings.java index fab2e6631b6..78ae9c4f0be 100644 --- a/src/com/android/settings/gestures/PickupGestureSettings.java +++ b/src/com/android/settings/gestures/PickupGestureSettings.java @@ -73,7 +73,7 @@ public class PickupGestureSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/gestures/SwipeToNotificationSettings.java b/src/com/android/settings/gestures/SwipeToNotificationSettings.java index 69fd019d7f0..9ddf0d4ff90 100644 --- a/src/com/android/settings/gestures/SwipeToNotificationSettings.java +++ b/src/com/android/settings/gestures/SwipeToNotificationSettings.java @@ -67,7 +67,7 @@ public class SwipeToNotificationSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/language/LanguageAndInputSettings.java b/src/com/android/settings/language/LanguageAndInputSettings.java index 75d204da186..c69938c1be1 100644 --- a/src/com/android/settings/language/LanguageAndInputSettings.java +++ b/src/com/android/settings/language/LanguageAndInputSettings.java @@ -87,7 +87,7 @@ public class LanguageAndInputSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/location/LocationSettings.java b/src/com/android/settings/location/LocationSettings.java index 56c4b1835da..153403a31aa 100644 --- a/src/com/android/settings/location/LocationSettings.java +++ b/src/com/android/settings/location/LocationSettings.java @@ -100,7 +100,7 @@ public class LocationSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, this, getLifecycle()); } diff --git a/src/com/android/settings/location/ScanningSettings.java b/src/com/android/settings/location/ScanningSettings.java index 1af6e2bbeb2..91359520ea3 100644 --- a/src/com/android/settings/location/ScanningSettings.java +++ b/src/com/android/settings/location/ScanningSettings.java @@ -52,7 +52,7 @@ public class ScanningSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context); } diff --git a/src/com/android/settings/network/NetworkDashboardFragment.java b/src/com/android/settings/network/NetworkDashboardFragment.java index 822699afa3f..7d8ea18c7a4 100644 --- a/src/com/android/settings/network/NetworkDashboardFragment.java +++ b/src/com/android/settings/network/NetworkDashboardFragment.java @@ -90,7 +90,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle(), mMetricsFeatureProvider, this /* fragment */, this /* mobilePlanHost */); @@ -140,7 +140,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements switch (dialogId) { case MANAGE_MOBILE_PLAN_DIALOG_ID: final MobilePlanPreferenceController controller = - getPreferenceController(MobilePlanPreferenceController.class); + use(MobilePlanPreferenceController.class); return new AlertDialog.Builder(getActivity()) .setMessage(controller.getMobilePlanDialogMessage()) .setCancelable(false) diff --git a/src/com/android/settings/notification/AppNotificationSettings.java b/src/com/android/settings/notification/AppNotificationSettings.java index 78139dc310e..d334b9217b7 100644 --- a/src/com/android/settings/notification/AppNotificationSettings.java +++ b/src/com/android/settings/notification/AppNotificationSettings.java @@ -110,7 +110,7 @@ public class AppNotificationSettings extends NotificationSettingsBase { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { mControllers = new ArrayList<>(); mControllers.add(new HeaderPreferenceController(context, this)); mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend)); diff --git a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java index 707a559234a..d641df7889e 100644 --- a/src/com/android/settings/notification/ChannelGroupNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelGroupNotificationSettings.java @@ -65,7 +65,7 @@ public class ChannelGroupNotificationSettings extends NotificationSettingsBase { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { mControllers = new ArrayList<>(); mControllers.add(new HeaderPreferenceController(context, this)); mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend)); diff --git a/src/com/android/settings/notification/ChannelNotificationSettings.java b/src/com/android/settings/notification/ChannelNotificationSettings.java index 23451ec0a2b..a13842956d2 100644 --- a/src/com/android/settings/notification/ChannelNotificationSettings.java +++ b/src/com/android/settings/notification/ChannelNotificationSettings.java @@ -75,7 +75,7 @@ public class ChannelNotificationSettings extends NotificationSettingsBase { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { mControllers = new ArrayList<>(); mControllers.add(new HeaderPreferenceController(context, this)); mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend)); diff --git a/src/com/android/settings/notification/ConfigureNotificationSettings.java b/src/com/android/settings/notification/ConfigureNotificationSettings.java index b5c755501ba..0e47ed8fe91 100644 --- a/src/com/android/settings/notification/ConfigureNotificationSettings.java +++ b/src/com/android/settings/notification/ConfigureNotificationSettings.java @@ -76,7 +76,7 @@ public class ConfigureNotificationSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final Activity activity = getActivity(); final Application app; if (activity != null) { diff --git a/src/com/android/settings/notification/SoundSettings.java b/src/com/android/settings/notification/SoundSettings.java index 581907b4382..239bb49a7cc 100644 --- a/src/com/android/settings/notification/SoundSettings.java +++ b/src/com/android/settings/notification/SoundSettings.java @@ -107,7 +107,7 @@ public class SoundSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, this, mVolumeCallback, getLifecycle()); } @@ -274,7 +274,7 @@ public class SoundSettings extends DashboardFragment { void enableWorkSync() { final WorkSoundPreferenceController workSoundController = - getPreferenceController(WorkSoundPreferenceController.class); + use(WorkSoundPreferenceController.class); if (workSoundController != null) { workSoundController.enableWorkSync(); } diff --git a/src/com/android/settings/notification/ZenModeAutomationSettings.java b/src/com/android/settings/notification/ZenModeAutomationSettings.java index 969c8ef74b8..1bb6fc678cc 100644 --- a/src/com/android/settings/notification/ZenModeAutomationSettings.java +++ b/src/com/android/settings/notification/ZenModeAutomationSettings.java @@ -37,7 +37,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase { protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig(); @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { ZenServiceListing serviceListing = new ZenServiceListing(getContext(), CONFIG); serviceListing.reloadApprovedServices(); return buildPreferenceControllers(context, this, serviceListing, getLifecycle()); diff --git a/src/com/android/settings/notification/ZenModeBehaviorSettings.java b/src/com/android/settings/notification/ZenModeBehaviorSettings.java index 1733469aed4..2dd5ebd8de2 100644 --- a/src/com/android/settings/notification/ZenModeBehaviorSettings.java +++ b/src/com/android/settings/notification/ZenModeBehaviorSettings.java @@ -32,7 +32,7 @@ import java.util.List; public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable { @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/notification/ZenModeEventRuleSettings.java b/src/com/android/settings/notification/ZenModeEventRuleSettings.java index cf6d7b507d6..9263d3aed72 100644 --- a/src/com/android/settings/notification/ZenModeEventRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeEventRuleSettings.java @@ -78,7 +78,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { List controllers = new ArrayList<>(); mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this, getLifecycle()); diff --git a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java index 9ef1128d593..4633f88bc7d 100644 --- a/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java +++ b/src/com/android/settings/notification/ZenModeScheduleRuleSettings.java @@ -196,7 +196,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase { @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { List controllers = new ArrayList<>(); mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this, getLifecycle()); diff --git a/src/com/android/settings/notification/ZenModeSettings.java b/src/com/android/settings/notification/ZenModeSettings.java index 12e8d7e508d..272bb416588 100644 --- a/src/com/android/settings/notification/ZenModeSettings.java +++ b/src/com/android/settings/notification/ZenModeSettings.java @@ -50,7 +50,7 @@ public class ZenModeSettings extends ZenModeSettingsBase { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle(), getFragmentManager()); } diff --git a/src/com/android/settings/security/EncryptionAndCredential.java b/src/com/android/settings/security/EncryptionAndCredential.java index a684ee7788e..6dae9b7b513 100644 --- a/src/com/android/settings/security/EncryptionAndCredential.java +++ b/src/com/android/settings/security/EncryptionAndCredential.java @@ -53,7 +53,7 @@ public class EncryptionAndCredential extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/security/LockscreenDashboardFragment.java b/src/com/android/settings/security/LockscreenDashboardFragment.java index 65be6e033b6..c438d8128b6 100644 --- a/src/com/android/settings/security/LockscreenDashboardFragment.java +++ b/src/com/android/settings/security/LockscreenDashboardFragment.java @@ -76,7 +76,7 @@ public class LockscreenDashboardFragment extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); final Lifecycle lifecycle = getLifecycle(); final LockScreenNotificationPreferenceController notificationController = diff --git a/src/com/android/settings/security/SecuritySettings.java b/src/com/android/settings/security/SecuritySettings.java index 2af2f049d18..e4d5ef55699 100644 --- a/src/com/android/settings/security/SecuritySettings.java +++ b/src/com/android/settings/security/SecuritySettings.java @@ -77,7 +77,7 @@ public class SecuritySettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle(), this /* host*/); } @@ -86,11 +86,11 @@ public class SecuritySettings extends DashboardFragment { */ @Override public void onActivityResult(int requestCode, int resultCode, Intent data) { - if (getPreferenceController(TrustAgentListPreferenceController.class) + if (use(TrustAgentListPreferenceController.class) .handleActivityResult(requestCode, resultCode)) { return; } - if (getPreferenceController(LockUnificationPreferenceController.class) + if (use(LockUnificationPreferenceController.class) .handleActivityResult(requestCode, resultCode, data)) { return; } @@ -98,16 +98,16 @@ public class SecuritySettings extends DashboardFragment { } void launchConfirmDeviceLockForUnification() { - getPreferenceController(LockUnificationPreferenceController.class) + use(LockUnificationPreferenceController.class) .launchConfirmDeviceLockForUnification(); } void unifyUncompliantLocks() { - getPreferenceController(LockUnificationPreferenceController.class).unifyUncompliantLocks(); + use(LockUnificationPreferenceController.class).unifyUncompliantLocks(); } void updateUnificationPreference() { - getPreferenceController(LockUnificationPreferenceController.class).updateState(null); + use(LockUnificationPreferenceController.class).updateState(null); } private static List buildPreferenceControllers(Context context, diff --git a/src/com/android/settings/security/screenlock/ScreenLockSettings.java b/src/com/android/settings/security/screenlock/ScreenLockSettings.java index cc17fa37697..2fa4124f95e 100644 --- a/src/com/android/settings/security/screenlock/ScreenLockSettings.java +++ b/src/com/android/settings/security/screenlock/ScreenLockSettings.java @@ -60,7 +60,7 @@ public class ScreenLockSettings extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { mLockPatternUtils = new LockPatternUtils(context); return buildPreferenceControllers(context, this /* parent */, getLifecycle(), mLockPatternUtils); @@ -68,7 +68,7 @@ public class ScreenLockSettings extends DashboardFragment @Override public void onOwnerInfoUpdated() { - getPreferenceController(OwnerInfoPreferenceController.class).updateSummary(); + use(OwnerInfoPreferenceController.class).updateSummary(); } private static List buildPreferenceControllers(Context context, diff --git a/src/com/android/settings/system/ResetDashboardFragment.java b/src/com/android/settings/system/ResetDashboardFragment.java index cc67e2583ec..03543cc4989 100644 --- a/src/com/android/settings/system/ResetDashboardFragment.java +++ b/src/com/android/settings/system/ResetDashboardFragment.java @@ -52,7 +52,7 @@ public class ResetDashboardFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return buildPreferenceControllers(context, getLifecycle()); } diff --git a/src/com/android/settings/wifi/ConfigureWifiSettings.java b/src/com/android/settings/wifi/ConfigureWifiSettings.java index 3fd217169d8..b7e01c86e3d 100644 --- a/src/com/android/settings/wifi/ConfigureWifiSettings.java +++ b/src/com/android/settings/wifi/ConfigureWifiSettings.java @@ -73,7 +73,7 @@ public class ConfigureWifiSettings extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final NetworkScoreManagerWrapper networkScoreManagerWrapper = new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class)); mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context); diff --git a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java index 9a5430bcd8b..b2e56b9664e 100644 --- a/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java +++ b/src/com/android/settings/wifi/details/WifiNetworkDetailsFragment.java @@ -124,7 +124,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); ConnectivityManager cm = context.getSystemService(ConnectivityManager.class); mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance( diff --git a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java index fa276d90057..b8710c93e53 100644 --- a/src/com/android/settings/wifi/p2p/WifiP2pSettings.java +++ b/src/com/android/settings/wifi/p2p/WifiP2pSettings.java @@ -168,7 +168,7 @@ public class WifiP2pSettings extends DashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); mPersistentCategoryController = new P2pPersistentCategoryPreferenceController(context); diff --git a/src/com/android/settings/wifi/tether/WifiTetherSettings.java b/src/com/android/settings/wifi/tether/WifiTetherSettings.java index e9533b15fc9..996c73ccc68 100644 --- a/src/com/android/settings/wifi/tether/WifiTetherSettings.java +++ b/src/com/android/settings/wifi/tether/WifiTetherSettings.java @@ -125,7 +125,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { final List controllers = new ArrayList<>(); mSSIDPreferenceController = new WifiTetherSSIDPreferenceController(context, this); mPasswordPreferenceController = new WifiTetherPasswordPreferenceController(context, this); @@ -174,11 +174,11 @@ public class WifiTetherSettings extends RestrictedDashboardFragment } private void updateDisplayWithNewConfig() { - getPreferenceController(WifiTetherSSIDPreferenceController.class) + use(WifiTetherSSIDPreferenceController.class) .updateDisplay(); - getPreferenceController(WifiTetherPasswordPreferenceController.class) + use(WifiTetherPasswordPreferenceController.class) .updateDisplay(); - getPreferenceController(WifiTetherApBandPreferenceController.class) + use(WifiTetherApBandPreferenceController.class) .updateDisplay(); } diff --git a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java index 6f34a2eef36..62743737afb 100644 --- a/tests/robotests/src/com/android/settings/DisplaySettingsTest.java +++ b/tests/robotests/src/com/android/settings/DisplaySettingsTest.java @@ -32,7 +32,7 @@ public class DisplaySettingsTest { fragment.getPreferenceScreenResId()); final List preferenceKeys = new ArrayList<>(); - for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { + for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) { preferenceKeys.add(controller.getPreferenceKey()); } // Nightmode is currently hidden diff --git a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java index 1abbed575a0..01bfda6b28e 100644 --- a/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/applications/appinfo/AppInfoDashboardFragmentTest.java @@ -24,8 +24,6 @@ import static com.android.settings.applications.appinfo.AppInfoDashboardFragment import static com.google.common.truth.Truth.assertThat; import static org.mockito.ArgumentMatchers.any; -import static org.mockito.ArgumentMatchers.anyInt; -import static org.mockito.ArgumentMatchers.anyString; import static org.mockito.ArgumentMatchers.nullable; import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doReturn; @@ -255,7 +253,7 @@ public final class AppInfoDashboardFragmentTest { public void getPreferenceControllers_noPackageInfo_shouldReturnNull() { doNothing().when(mFragment).retrieveAppEntry(); - assertThat(mFragment.getPreferenceControllers(mShadowContext)).isNull(); + assertThat(mFragment.createPreferenceControllers(mShadowContext)).isNull(); } @Test diff --git a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java index 49efecbc42c..94c6add2afc 100644 --- a/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java +++ b/tests/robotests/src/com/android/settings/bluetooth/DeviceListPreferenceFragmentTest.java @@ -208,7 +208,7 @@ public class DeviceListPreferenceFragmentTest { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } } diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java index 3d9783da2ed..80083ed1919 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentSearchIndexProviderInspector.java @@ -57,7 +57,7 @@ public class DashboardFragmentSearchIndexProviderInspector { } try { controllersFromFragment = - ((DashboardFragment) fragment).getPreferenceControllers(context); + ((DashboardFragment) fragment).createPreferenceControllers(context); } catch (Throwable e) { // Can't do much with exception, assume the test passed. return true; diff --git a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java index f16c4a4a4c2..49734b6e24a 100644 --- a/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java +++ b/tests/robotests/src/com/android/settings/dashboard/DashboardFragmentTest.java @@ -86,7 +86,7 @@ public class DashboardFragmentTest { final TestPreferenceController controller = new TestPreferenceController(mContext); mTestFragment.addPreferenceController(controller); - final TestPreferenceController retrievedController = mTestFragment.getPreferenceController + final TestPreferenceController retrievedController = mTestFragment.use (TestPreferenceController.class); assertThat(controller).isSameAs(retrievedController); @@ -99,7 +99,7 @@ public class DashboardFragmentTest { final TestPreferenceController controller2 = new TestPreferenceController(mContext); mTestFragment.addPreferenceController(controller2); - final TestPreferenceController retrievedController = mTestFragment.getPreferenceController + final TestPreferenceController retrievedController = mTestFragment.use (TestPreferenceController.class); assertThat(controller1).isSameAs(retrievedController); @@ -135,7 +135,7 @@ public class DashboardFragmentTest { @Test public void onAttach_shouldCreatePlaceholderPreferenceController() { - final AbstractPreferenceController controller = mTestFragment.getPreferenceController( + final AbstractPreferenceController controller = mTestFragment.use( DashboardTilePlaceholderPreferenceController.class); assertThat(controller).isNotNull(); @@ -289,7 +289,7 @@ public class DashboardFragmentTest { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return mControllers; } diff --git a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java index 80d4aafa46a..7d1aecd984d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/ApplicationListFragmentTest.java @@ -84,7 +84,7 @@ public class ApplicationListFragmentTest { @Test public void getPreferenceControllers() { - final List controllers = mFragment.getPreferenceControllers( + final List controllers = mFragment.createPreferenceControllers( mContext); assertThat(controllers).isNotNull(); assertThat(controllers.size()).isEqualTo(1); diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java index b38b0f09c2e..5e80f66c82d 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterprisePrivacySettingsTest.java @@ -90,7 +90,7 @@ public final class EnterprisePrivacySettingsTest { @Test public void getPreferenceControllers() throws Exception { - final List controllers = mSettings.getPreferenceControllers( + final List controllers = mSettings.createPreferenceControllers( ShadowApplication.getInstance().getApplicationContext()); verifyPreferenceControllers(controllers); } diff --git a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java index 567c06f7a74..033d399a89b 100644 --- a/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java +++ b/tests/robotests/src/com/android/settings/enterprise/EnterpriseSetDefaultAppsListFragmentTest.java @@ -80,7 +80,7 @@ public class EnterpriseSetDefaultAppsListFragmentTest { @Test public void getPreferenceControllers() { - final List controllers = mFragment.getPreferenceControllers(mContext); + final List controllers = mFragment.createPreferenceControllers(mContext); assertThat(controllers).isNotNull(); assertThat(controllers.size()).isEqualTo(1); int position = 0; diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java index eb5d8cfec30..9a55ef0c748 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageBaseTest.java @@ -94,7 +94,7 @@ public class PowerUsageBaseTest { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java index a3786c2b40c..79c7fd0f7fe 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryLegacyTest.java @@ -408,7 +408,7 @@ public class PowerUsageSummaryLegacyTest { fragment.getPreferenceScreenResId()); final List preferenceKeys = new ArrayList<>(); - for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { + for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) { preferenceKeys.add(controller.getPreferenceKey()); } diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java index 32e2b0b3ed6..1debe85ca3c 100644 --- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java +++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageSummaryTest.java @@ -37,19 +37,14 @@ import android.os.Bundle; import android.os.PowerManager; import android.support.v7.preference.PreferenceScreen; import android.util.SparseArray; -import android.view.Menu; -import android.view.MenuInflater; -import android.view.MenuItem; import android.view.View; import android.widget.TextView; -import com.android.internal.logging.nano.MetricsProto; import com.android.internal.os.BatterySipper; import com.android.internal.os.BatteryStatsHelper; import com.android.settings.R; import com.android.settings.SettingsActivity; import com.android.settings.TestConfig; -import com.android.settings.Utils; import com.android.settings.applications.LayoutPreference; import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; @@ -222,7 +217,7 @@ public class PowerUsageSummaryTest { fragment.getPreferenceScreenResId()); final List preferenceKeys = new ArrayList<>(); - for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { + for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) { preferenceKeys.add(controller.getPreferenceKey()); } diff --git a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java index 0b329d3f2b7..d6ecb1ca41a 100644 --- a/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java +++ b/tests/robotests/src/com/android/settings/gestures/SwipeToNotificationSettingsTest.java @@ -59,7 +59,7 @@ public class SwipeToNotificationSettingsTest { @Test public void testGetPreferenceControllers_shouldAllBeCreated() { final List controllers = - mFragment.getPreferenceControllers(mContext); + mFragment.createPreferenceControllers(mContext); assertThat(controllers.isEmpty()).isFalse(); } diff --git a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java index 905d2d68e47..4d82356e47e 100644 --- a/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java +++ b/tests/robotests/src/com/android/settings/language/LanguageAndInputSettingsTest.java @@ -107,7 +107,7 @@ public class LanguageAndInputSettingsTest { @Test public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() { final List controllers = - mFragment.getPreferenceControllers(mActivity); + mFragment.createPreferenceControllers(mActivity); int lifecycleObserverCount = 0; for (AbstractPreferenceController controller : controllers) { if (controller instanceof LifecycleObserver) { @@ -121,7 +121,7 @@ public class LanguageAndInputSettingsTest { @Test public void testGetPreferenceControllers_shouldAllBeCreated() { final List controllers = - mFragment.getPreferenceControllers(mActivity); + mFragment.createPreferenceControllers(mActivity); assertThat(controllers.isEmpty()).isFalse(); } @@ -189,7 +189,7 @@ public class LanguageAndInputSettingsTest { fragment.getPreferenceScreenResId()); final List preferenceKeys = new ArrayList<>(); - for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { + for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) { preferenceKeys.add(controller.getPreferenceKey()); } diff --git a/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java b/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java index ef4bf999369..c314fc2883f 100644 --- a/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java +++ b/tests/robotests/src/com/android/settings/search/indexing/FakeSettingsFragment.java @@ -68,7 +68,7 @@ public class FakeSettingsFragment extends DashboardFragment { } @Override - protected List getPreferenceControllers(Context context) { + protected List createPreferenceControllers(Context context) { return null; }