More renaming in DashboardFragment

getPreferenceControllers() -> createPreferenceControllers() for the same
reason as in ag/3647936

Bug: 73668763
Test: robotests
Change-Id: I97670a91a2a38d1c844d1b9d37f4222c5e6f45a0
This commit is contained in:
Fan Zhang
2018-02-22 13:51:41 -08:00
parent aed8994f6f
commit f7843adabd
87 changed files with 110 additions and 117 deletions

View File

@@ -73,7 +73,7 @@ public class DateTimeSettings extends DashboardFragment implements
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Activity activity = getActivity(); final Activity activity = getActivity();
final Intent intent = activity.getIntent(); final Intent intent = activity.getIntent();
@@ -112,10 +112,10 @@ public class DateTimeSettings extends DashboardFragment implements
public Dialog onCreateDialog(int id) { public Dialog onCreateDialog(int id) {
switch (id) { switch (id) {
case DatePreferenceController.DIALOG_DATEPICKER: case DatePreferenceController.DIALOG_DATEPICKER:
return getPreferenceController(DatePreferenceController.class) return use(DatePreferenceController.class)
.buildDatePicker(getActivity()); .buildDatePicker(getActivity());
case TimePreferenceController.DIALOG_TIMEPICKER: case TimePreferenceController.DIALOG_TIMEPICKER:
return getPreferenceController(TimePreferenceController.class) return use(TimePreferenceController.class)
.buildTimePicker(getActivity()); .buildTimePicker(getActivity());
default: default:
throw new IllegalArgumentException(); throw new IllegalArgumentException();

View File

@@ -74,7 +74,7 @@ public class DisplaySettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -52,7 +52,7 @@ public class VibrationSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildControllers(context, getLifecycle()); return buildControllers(context, getLifecycle());
} }

View File

@@ -62,7 +62,7 @@ public class AccountDashboardFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES); final String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
final AccountPreferenceController accountPrefController = final AccountPreferenceController accountPrefController =

View File

@@ -109,7 +109,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
mAccountSynController = new AccountSyncPreferenceController(context); mAccountSynController = new AccountSyncPreferenceController(context);
controllers.add(mAccountSynController); controllers.add(mAccountSynController);

View File

@@ -58,7 +58,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final Activity activity = getActivity(); final Activity activity = getActivity();
final Application app; final Application app;
if (activity != null) { if (activity != null) {

View File

@@ -60,7 +60,7 @@ public class DefaultAppSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context); return buildPreferenceControllers(context);
} }

View File

@@ -61,7 +61,7 @@ public class SpecialAccessSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context); return buildPreferenceControllers(context);
} }

View File

@@ -212,7 +212,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
retrieveAppEntry(); retrieveAppEntry();
if (mPackageInfo == null) { if (mPackageInfo == null) {
return null; return null;

View File

@@ -51,7 +51,7 @@ public class ManageAssist extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -61,7 +61,7 @@ public class BackupSettingsFragment extends DashboardFragment {
* Get a list of {@link AbstractPreferenceController} for this fragment. * Get a list of {@link AbstractPreferenceController} for this fragment.
*/ */
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new BackupSettingsPreferenceController(context)); controllers.add(new BackupSettingsPreferenceController(context));
return controllers; return controllers;

View File

@@ -136,7 +136,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
ArrayList<AbstractPreferenceController> controllers = new ArrayList<>(); ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
if (mCachedDevice != null) { if (mCachedDevice != null) {

View File

@@ -193,7 +193,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add( controllers.add(
new BluetoothDeviceRenamePreferenceController(context, KEY_RENAME_DEVICES, this, new BluetoothDeviceRenamePreferenceController(context, KEY_RENAME_DEVICES, this,

View File

@@ -363,7 +363,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle(); final Lifecycle lifecycle = getLifecycle();
mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context, lifecycle); mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context, lifecycle);

View File

@@ -170,7 +170,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }

View File

@@ -65,7 +65,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildControllers(context, getLifecycle()); return buildControllers(context, getLifecycle());
} }

View File

@@ -58,7 +58,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle(); final Lifecycle lifecycle = getLifecycle();

View File

@@ -71,7 +71,7 @@ public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle(); final Lifecycle lifecycle = getLifecycle();
final NfcPreferenceController nfcPreferenceController = final NfcPreferenceController nfcPreferenceController =

View File

@@ -79,7 +79,7 @@ public class UsbDetailsFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mUsbBackend = new UsbBackend(context); mUsbBackend = new UsbBackend(context);
mControllers = createControllerList(context, mUsbBackend, this); mControllers = createControllerList(context, mUsbBackend, this);
mUsbReceiver = new UsbConnectionBroadcastReceiver(context, mUsbConnectionListener, mUsbReceiver = new UsbConnectionBroadcastReceiver(context, mUsbConnectionListener,

View File

@@ -72,7 +72,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
// Load preference controllers from code // Load preference controllers from code
final List<AbstractPreferenceController> controllersFromCode = final List<AbstractPreferenceController> controllersFromCode =
getPreferenceControllers(context); createPreferenceControllers(context);
// Load preference controllers from xml definition // Load preference controllers from xml definition
final List<BasePreferenceController> controllersFromXml = PreferenceControllerListHelper final List<BasePreferenceController> controllersFromXml = PreferenceControllerListHelper
.getPreferenceControllersFromXml(context, getPreferenceScreenResId()); .getPreferenceControllersFromXml(context, getPreferenceScreenResId());
@@ -206,7 +206,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
@Override @Override
protected abstract int getPreferenceScreenResId(); protected abstract int getPreferenceScreenResId();
protected <T extends AbstractPreferenceController> T getPreferenceController(Class<T> clazz) { protected <T extends AbstractPreferenceController> T use(Class<T> clazz) {
List<AbstractPreferenceController> controllerList = mPreferenceControllers.get(clazz); List<AbstractPreferenceController> controllerList = mPreferenceControllers.get(clazz);
if (controllerList != null) { if (controllerList != null) {
if (controllerList.size() > 1) { if (controllerList.size() > 1) {
@@ -242,7 +242,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
/** /**
* Get a list of {@link AbstractPreferenceController} for this fragment. * Get a list of {@link AbstractPreferenceController} for this fragment.
*/ */
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }

View File

@@ -169,7 +169,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final ArrayList<AbstractPreferenceController> controllers = new ArrayList<>(); final ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
mSummaryController = mSummaryController =
new DataUsageSummaryPreferenceController(context); new DataUsageSummaryPreferenceController(context);

View File

@@ -188,7 +188,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }

View File

@@ -110,7 +110,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context); return buildPreferenceControllers(context);
} }

View File

@@ -302,7 +302,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
if (Utils.isMonkeyRunning()) { if (Utils.isMonkeyRunning()) {
mPreferenceControllers = new ArrayList<>(); mPreferenceControllers = new ArrayList<>();
return null; return null;
@@ -454,7 +454,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
@VisibleForTesting @VisibleForTesting
<T extends AbstractPreferenceController> T getDevelopmentOptionsController(Class<T> clazz) { <T extends AbstractPreferenceController> T getDevelopmentOptionsController(Class<T> clazz) {
return getPreferenceController(clazz); return use(clazz);
} }
/** /**

View File

@@ -51,7 +51,7 @@ public class FeatureFlagsDashboard extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new FeatureFlagsPreferenceController(context, getLifecycle())); controllers.add(new FeatureFlagsPreferenceController(context, getLifecycle()));
return controllers; return controllers;

View File

@@ -40,7 +40,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
controllers.add(new DevelopmentTilePreferenceController(context)); controllers.add(new DevelopmentTilePreferenceController(context));
return controllers; return controllers;

View File

@@ -73,7 +73,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
final BuildNumberPreferenceController buildNumberPreferenceController = final BuildNumberPreferenceController buildNumberPreferenceController =
getPreferenceController(BuildNumberPreferenceController.class); use(BuildNumberPreferenceController.class);
if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) { if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
return; return;
} }
@@ -91,7 +91,7 @@ public class DeviceInfoSettings extends DashboardFragment implements Indexable {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getActivity(), this /* fragment */, return buildPreferenceControllers(context, getActivity(), this /* fragment */,
getLifecycle()); getLifecycle());
} }

View File

@@ -167,7 +167,7 @@ public class StorageDashboardFragment extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
mSummaryController = new StorageSummaryDonutPreferenceController(context); mSummaryController = new StorageSummaryDonutPreferenceController(context);
controllers.add(mSummaryController); controllers.add(mSummaryController);

View File

@@ -98,7 +98,7 @@ public class StorageProfileFragment extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final StorageManager sm = context.getSystemService(StorageManager.class); final StorageManager sm = context.getSystemService(StorageManager.class);
mPreferenceController = mPreferenceController =

View File

@@ -94,7 +94,7 @@ public class MyDeviceInfoFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getActivity(), this /* fragment */, return buildPreferenceControllers(context, getActivity(), this /* fragment */,
getLifecycle()); getLifecycle());
} }
@@ -130,7 +130,7 @@ public class MyDeviceInfoFragment extends DashboardFragment {
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
final BuildNumberPreferenceController buildNumberPreferenceController = final BuildNumberPreferenceController buildNumberPreferenceController =
getPreferenceController(BuildNumberPreferenceController.class); use(BuildNumberPreferenceController.class);
if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) { if (buildNumberPreferenceController.onActivityResult(requestCode, resultCode, data)) {
return; return;
} }

View File

@@ -76,7 +76,7 @@ public class AmbientDisplaySettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(), return buildPreferenceControllers(context, getLifecycle(),
new AmbientDisplayConfiguration(context), mMetricsFeatureProvider, new AmbientDisplayConfiguration(context), mMetricsFeatureProvider,
this::updatePreferenceStates); this::updatePreferenceStates);

View File

@@ -109,7 +109,7 @@ public class DreamSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context); return buildPreferenceControllers(context);
} }

View File

@@ -49,7 +49,7 @@ public abstract class ApplicationListFragment extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
ApplicationListPreferenceController controller = new ApplicationListPreferenceController( ApplicationListPreferenceController controller = new ApplicationListPreferenceController(
context, this, context.getPackageManager(), this); context, this, context.getPackageManager(), this);

View File

@@ -51,7 +51,7 @@ public class EnterprisePrivacySettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, true /* async */); return buildPreferenceControllers(context, true /* async */);
} }

View File

@@ -48,7 +48,7 @@ public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final EnterpriseSetDefaultAppsListPreferenceController controller = final EnterpriseSetDefaultAppsListPreferenceController controller =
new EnterpriseSetDefaultAppsListPreferenceController( new EnterpriseSetDefaultAppsListPreferenceController(

View File

@@ -327,7 +327,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Bundle bundle = getArguments(); final Bundle bundle = getArguments();
final int uid = bundle.getInt(EXTRA_UID, 0); final int uid = bundle.getInt(EXTRA_UID, 0);

View File

@@ -167,7 +167,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }

View File

@@ -123,7 +123,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }

View File

@@ -228,7 +228,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final Lifecycle lifecycle = getLifecycle(); final Lifecycle lifecycle = getLifecycle();
final SettingsActivity activity = (SettingsActivity) getActivity(); final SettingsActivity activity = (SettingsActivity) getActivity();
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();

View File

@@ -307,7 +307,7 @@ public class PowerUsageSummaryLegacy extends PowerUsageBase implements
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController( mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController(
context, getActivity(), this /* host */, getLifecycle()); context, getActivity(), this /* host */, getLifecycle());

View File

@@ -108,7 +108,7 @@ public class RestrictedAppDetails extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }

View File

@@ -64,7 +64,7 @@ public class SmartBatterySettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this); return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this);
} }

View File

@@ -59,7 +59,7 @@ public class BatterySaverSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -51,7 +51,7 @@ public class AssistGestureSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -66,7 +66,7 @@ public class DoubleTapPowerSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -73,7 +73,7 @@ public class DoubleTapScreenSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -66,7 +66,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -63,7 +63,7 @@ public class GestureSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
if (mAmbientDisplayConfig == null) { if (mAmbientDisplayConfig == null) {
mAmbientDisplayConfig = new AmbientDisplayConfiguration(context); mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
} }

View File

@@ -73,7 +73,7 @@ public class PickupGestureSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -67,7 +67,7 @@ public class SwipeToNotificationSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -87,7 +87,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -100,7 +100,7 @@ public class LocationSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, this, getLifecycle()); return buildPreferenceControllers(context, this, getLifecycle());
} }

View File

@@ -52,7 +52,7 @@ public class ScanningSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context); return buildPreferenceControllers(context);
} }

View File

@@ -90,7 +90,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(), mMetricsFeatureProvider, this return buildPreferenceControllers(context, getLifecycle(), mMetricsFeatureProvider, this
/* fragment */, /* fragment */,
this /* mobilePlanHost */); this /* mobilePlanHost */);
@@ -140,7 +140,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
switch (dialogId) { switch (dialogId) {
case MANAGE_MOBILE_PLAN_DIALOG_ID: case MANAGE_MOBILE_PLAN_DIALOG_ID:
final MobilePlanPreferenceController controller = final MobilePlanPreferenceController controller =
getPreferenceController(MobilePlanPreferenceController.class); use(MobilePlanPreferenceController.class);
return new AlertDialog.Builder(getActivity()) return new AlertDialog.Builder(getActivity())
.setMessage(controller.getMobilePlanDialogMessage()) .setMessage(controller.getMobilePlanDialogMessage())
.setCancelable(false) .setCancelable(false)

View File

@@ -110,7 +110,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mControllers = new ArrayList<>(); mControllers = new ArrayList<>();
mControllers.add(new HeaderPreferenceController(context, this)); mControllers.add(new HeaderPreferenceController(context, this));
mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend)); mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));

View File

@@ -65,7 +65,7 @@ public class ChannelGroupNotificationSettings extends NotificationSettingsBase {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mControllers = new ArrayList<>(); mControllers = new ArrayList<>();
mControllers.add(new HeaderPreferenceController(context, this)); mControllers.add(new HeaderPreferenceController(context, this));
mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend)); mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));

View File

@@ -75,7 +75,7 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mControllers = new ArrayList<>(); mControllers = new ArrayList<>();
mControllers.add(new HeaderPreferenceController(context, this)); mControllers.add(new HeaderPreferenceController(context, this));
mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend)); mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));

View File

@@ -76,7 +76,7 @@ public class ConfigureNotificationSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final Activity activity = getActivity(); final Activity activity = getActivity();
final Application app; final Application app;
if (activity != null) { if (activity != null) {

View File

@@ -107,7 +107,7 @@ public class SoundSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, this, mVolumeCallback, getLifecycle()); return buildPreferenceControllers(context, this, mVolumeCallback, getLifecycle());
} }
@@ -274,7 +274,7 @@ public class SoundSettings extends DashboardFragment {
void enableWorkSync() { void enableWorkSync() {
final WorkSoundPreferenceController workSoundController = final WorkSoundPreferenceController workSoundController =
getPreferenceController(WorkSoundPreferenceController.class); use(WorkSoundPreferenceController.class);
if (workSoundController != null) { if (workSoundController != null) {
workSoundController.enableWorkSync(); workSoundController.enableWorkSync();
} }

View File

@@ -37,7 +37,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig(); protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
ZenServiceListing serviceListing = new ZenServiceListing(getContext(), CONFIG); ZenServiceListing serviceListing = new ZenServiceListing(getContext(), CONFIG);
serviceListing.reloadApprovedServices(); serviceListing.reloadApprovedServices();
return buildPreferenceControllers(context, this, serviceListing, getLifecycle()); return buildPreferenceControllers(context, this, serviceListing, getLifecycle());

View File

@@ -32,7 +32,7 @@ import java.util.List;
public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable { public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable {
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -78,7 +78,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>(); List<AbstractPreferenceController> controllers = new ArrayList<>();
mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this, mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this,
getLifecycle()); getLifecycle());

View File

@@ -196,7 +196,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
List<AbstractPreferenceController> controllers = new ArrayList<>(); List<AbstractPreferenceController> controllers = new ArrayList<>();
mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this, mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this,
getLifecycle()); getLifecycle());

View File

@@ -50,7 +50,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(), getFragmentManager()); return buildPreferenceControllers(context, getLifecycle(), getFragmentManager());
} }

View File

@@ -53,7 +53,7 @@ public class EncryptionAndCredential extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -76,7 +76,7 @@ public class LockscreenDashboardFragment extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
final Lifecycle lifecycle = getLifecycle(); final Lifecycle lifecycle = getLifecycle();
final LockScreenNotificationPreferenceController notificationController = final LockScreenNotificationPreferenceController notificationController =

View File

@@ -77,7 +77,7 @@ public class SecuritySettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle(), this /* host*/); return buildPreferenceControllers(context, getLifecycle(), this /* host*/);
} }
@@ -86,11 +86,11 @@ public class SecuritySettings extends DashboardFragment {
*/ */
@Override @Override
public void onActivityResult(int requestCode, int resultCode, Intent data) { public void onActivityResult(int requestCode, int resultCode, Intent data) {
if (getPreferenceController(TrustAgentListPreferenceController.class) if (use(TrustAgentListPreferenceController.class)
.handleActivityResult(requestCode, resultCode)) { .handleActivityResult(requestCode, resultCode)) {
return; return;
} }
if (getPreferenceController(LockUnificationPreferenceController.class) if (use(LockUnificationPreferenceController.class)
.handleActivityResult(requestCode, resultCode, data)) { .handleActivityResult(requestCode, resultCode, data)) {
return; return;
} }
@@ -98,16 +98,16 @@ public class SecuritySettings extends DashboardFragment {
} }
void launchConfirmDeviceLockForUnification() { void launchConfirmDeviceLockForUnification() {
getPreferenceController(LockUnificationPreferenceController.class) use(LockUnificationPreferenceController.class)
.launchConfirmDeviceLockForUnification(); .launchConfirmDeviceLockForUnification();
} }
void unifyUncompliantLocks() { void unifyUncompliantLocks() {
getPreferenceController(LockUnificationPreferenceController.class).unifyUncompliantLocks(); use(LockUnificationPreferenceController.class).unifyUncompliantLocks();
} }
void updateUnificationPreference() { void updateUnificationPreference() {
getPreferenceController(LockUnificationPreferenceController.class).updateState(null); use(LockUnificationPreferenceController.class).updateState(null);
} }
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context, private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

View File

@@ -60,7 +60,7 @@ public class ScreenLockSettings extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
mLockPatternUtils = new LockPatternUtils(context); mLockPatternUtils = new LockPatternUtils(context);
return buildPreferenceControllers(context, this /* parent */, getLifecycle(), return buildPreferenceControllers(context, this /* parent */, getLifecycle(),
mLockPatternUtils); mLockPatternUtils);
@@ -68,7 +68,7 @@ public class ScreenLockSettings extends DashboardFragment
@Override @Override
public void onOwnerInfoUpdated() { public void onOwnerInfoUpdated() {
getPreferenceController(OwnerInfoPreferenceController.class).updateSummary(); use(OwnerInfoPreferenceController.class).updateSummary();
} }
private static List<AbstractPreferenceController> buildPreferenceControllers(Context context, private static List<AbstractPreferenceController> buildPreferenceControllers(Context context,

View File

@@ -52,7 +52,7 @@ public class ResetDashboardFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return buildPreferenceControllers(context, getLifecycle()); return buildPreferenceControllers(context, getLifecycle());
} }

View File

@@ -73,7 +73,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final NetworkScoreManagerWrapper networkScoreManagerWrapper = final NetworkScoreManagerWrapper networkScoreManagerWrapper =
new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class)); new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context); mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context);

View File

@@ -124,7 +124,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class); ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance( mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance(

View File

@@ -168,7 +168,7 @@ public class WifiP2pSettings extends DashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
mPersistentCategoryController = mPersistentCategoryController =
new P2pPersistentCategoryPreferenceController(context); new P2pPersistentCategoryPreferenceController(context);

View File

@@ -125,7 +125,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>(); final List<AbstractPreferenceController> controllers = new ArrayList<>();
mSSIDPreferenceController = new WifiTetherSSIDPreferenceController(context, this); mSSIDPreferenceController = new WifiTetherSSIDPreferenceController(context, this);
mPasswordPreferenceController = new WifiTetherPasswordPreferenceController(context, this); mPasswordPreferenceController = new WifiTetherPasswordPreferenceController(context, this);
@@ -174,11 +174,11 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
} }
private void updateDisplayWithNewConfig() { private void updateDisplayWithNewConfig() {
getPreferenceController(WifiTetherSSIDPreferenceController.class) use(WifiTetherSSIDPreferenceController.class)
.updateDisplay(); .updateDisplay();
getPreferenceController(WifiTetherPasswordPreferenceController.class) use(WifiTetherPasswordPreferenceController.class)
.updateDisplay(); .updateDisplay();
getPreferenceController(WifiTetherApBandPreferenceController.class) use(WifiTetherApBandPreferenceController.class)
.updateDisplay(); .updateDisplay();
} }

View File

@@ -32,7 +32,7 @@ public class DisplaySettingsTest {
fragment.getPreferenceScreenResId()); fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>(); final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey()); preferenceKeys.add(controller.getPreferenceKey());
} }
// Nightmode is currently hidden // Nightmode is currently hidden

View File

@@ -24,8 +24,6 @@ import static com.android.settings.applications.appinfo.AppInfoDashboardFragment
import static com.google.common.truth.Truth.assertThat; import static com.google.common.truth.Truth.assertThat;
import static org.mockito.ArgumentMatchers.any; 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.ArgumentMatchers.nullable;
import static org.mockito.Mockito.doNothing; import static org.mockito.Mockito.doNothing;
import static org.mockito.Mockito.doReturn; import static org.mockito.Mockito.doReturn;
@@ -255,7 +253,7 @@ public final class AppInfoDashboardFragmentTest {
public void getPreferenceControllers_noPackageInfo_shouldReturnNull() { public void getPreferenceControllers_noPackageInfo_shouldReturnNull() {
doNothing().when(mFragment).retrieveAppEntry(); doNothing().when(mFragment).retrieveAppEntry();
assertThat(mFragment.getPreferenceControllers(mShadowContext)).isNull(); assertThat(mFragment.createPreferenceControllers(mShadowContext)).isNull();
} }
@Test @Test

View File

@@ -208,7 +208,7 @@ public class DeviceListPreferenceFragmentTest {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }
} }

View File

@@ -57,7 +57,7 @@ public class DashboardFragmentSearchIndexProviderInspector {
} }
try { try {
controllersFromFragment = controllersFromFragment =
((DashboardFragment) fragment).getPreferenceControllers(context); ((DashboardFragment) fragment).createPreferenceControllers(context);
} catch (Throwable e) { } catch (Throwable e) {
// Can't do much with exception, assume the test passed. // Can't do much with exception, assume the test passed.
return true; return true;

View File

@@ -86,7 +86,7 @@ public class DashboardFragmentTest {
final TestPreferenceController controller = new TestPreferenceController(mContext); final TestPreferenceController controller = new TestPreferenceController(mContext);
mTestFragment.addPreferenceController(controller); mTestFragment.addPreferenceController(controller);
final TestPreferenceController retrievedController = mTestFragment.getPreferenceController final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class); (TestPreferenceController.class);
assertThat(controller).isSameAs(retrievedController); assertThat(controller).isSameAs(retrievedController);
@@ -99,7 +99,7 @@ public class DashboardFragmentTest {
final TestPreferenceController controller2 = new TestPreferenceController(mContext); final TestPreferenceController controller2 = new TestPreferenceController(mContext);
mTestFragment.addPreferenceController(controller2); mTestFragment.addPreferenceController(controller2);
final TestPreferenceController retrievedController = mTestFragment.getPreferenceController final TestPreferenceController retrievedController = mTestFragment.use
(TestPreferenceController.class); (TestPreferenceController.class);
assertThat(controller1).isSameAs(retrievedController); assertThat(controller1).isSameAs(retrievedController);
@@ -135,7 +135,7 @@ public class DashboardFragmentTest {
@Test @Test
public void onAttach_shouldCreatePlaceholderPreferenceController() { public void onAttach_shouldCreatePlaceholderPreferenceController() {
final AbstractPreferenceController controller = mTestFragment.getPreferenceController( final AbstractPreferenceController controller = mTestFragment.use(
DashboardTilePlaceholderPreferenceController.class); DashboardTilePlaceholderPreferenceController.class);
assertThat(controller).isNotNull(); assertThat(controller).isNotNull();
@@ -289,7 +289,7 @@ public class DashboardFragmentTest {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return mControllers; return mControllers;
} }

View File

@@ -84,7 +84,7 @@ public class ApplicationListFragmentTest {
@Test @Test
public void getPreferenceControllers() { public void getPreferenceControllers() {
final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers( final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(
mContext); mContext);
assertThat(controllers).isNotNull(); assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(1); assertThat(controllers.size()).isEqualTo(1);

View File

@@ -90,7 +90,7 @@ public final class EnterprisePrivacySettingsTest {
@Test @Test
public void getPreferenceControllers() throws Exception { public void getPreferenceControllers() throws Exception {
final List<AbstractPreferenceController> controllers = mSettings.getPreferenceControllers( final List<AbstractPreferenceController> controllers = mSettings.createPreferenceControllers(
ShadowApplication.getInstance().getApplicationContext()); ShadowApplication.getInstance().getApplicationContext());
verifyPreferenceControllers(controllers); verifyPreferenceControllers(controllers);
} }

View File

@@ -80,7 +80,7 @@ public class EnterpriseSetDefaultAppsListFragmentTest {
@Test @Test
public void getPreferenceControllers() { public void getPreferenceControllers() {
final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext); final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(mContext);
assertThat(controllers).isNotNull(); assertThat(controllers).isNotNull();
assertThat(controllers.size()).isEqualTo(1); assertThat(controllers.size()).isEqualTo(1);
int position = 0; int position = 0;

View File

@@ -94,7 +94,7 @@ public class PowerUsageBaseTest {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }

View File

@@ -408,7 +408,7 @@ public class PowerUsageSummaryLegacyTest {
fragment.getPreferenceScreenResId()); fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>(); final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey()); preferenceKeys.add(controller.getPreferenceKey());
} }

View File

@@ -37,19 +37,14 @@ import android.os.Bundle;
import android.os.PowerManager; import android.os.PowerManager;
import android.support.v7.preference.PreferenceScreen; import android.support.v7.preference.PreferenceScreen;
import android.util.SparseArray; import android.util.SparseArray;
import android.view.Menu;
import android.view.MenuInflater;
import android.view.MenuItem;
import android.view.View; import android.view.View;
import android.widget.TextView; import android.widget.TextView;
import com.android.internal.logging.nano.MetricsProto;
import com.android.internal.os.BatterySipper; import com.android.internal.os.BatterySipper;
import com.android.internal.os.BatteryStatsHelper; import com.android.internal.os.BatteryStatsHelper;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity; import com.android.settings.SettingsActivity;
import com.android.settings.TestConfig; import com.android.settings.TestConfig;
import com.android.settings.Utils;
import com.android.settings.applications.LayoutPreference; import com.android.settings.applications.LayoutPreference;
import com.android.settings.fuelgauge.anomaly.Anomaly; import com.android.settings.fuelgauge.anomaly.Anomaly;
import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy; import com.android.settings.fuelgauge.anomaly.AnomalyDetectionPolicy;
@@ -222,7 +217,7 @@ public class PowerUsageSummaryTest {
fragment.getPreferenceScreenResId()); fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>(); final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey()); preferenceKeys.add(controller.getPreferenceKey());
} }

View File

@@ -59,7 +59,7 @@ public class SwipeToNotificationSettingsTest {
@Test @Test
public void testGetPreferenceControllers_shouldAllBeCreated() { public void testGetPreferenceControllers_shouldAllBeCreated() {
final List<AbstractPreferenceController> controllers = final List<AbstractPreferenceController> controllers =
mFragment.getPreferenceControllers(mContext); mFragment.createPreferenceControllers(mContext);
assertThat(controllers.isEmpty()).isFalse(); assertThat(controllers.isEmpty()).isFalse();
} }

View File

@@ -107,7 +107,7 @@ public class LanguageAndInputSettingsTest {
@Test @Test
public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() { public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
final List<AbstractPreferenceController> controllers = final List<AbstractPreferenceController> controllers =
mFragment.getPreferenceControllers(mActivity); mFragment.createPreferenceControllers(mActivity);
int lifecycleObserverCount = 0; int lifecycleObserverCount = 0;
for (AbstractPreferenceController controller : controllers) { for (AbstractPreferenceController controller : controllers) {
if (controller instanceof LifecycleObserver) { if (controller instanceof LifecycleObserver) {
@@ -121,7 +121,7 @@ public class LanguageAndInputSettingsTest {
@Test @Test
public void testGetPreferenceControllers_shouldAllBeCreated() { public void testGetPreferenceControllers_shouldAllBeCreated() {
final List<AbstractPreferenceController> controllers = final List<AbstractPreferenceController> controllers =
mFragment.getPreferenceControllers(mActivity); mFragment.createPreferenceControllers(mActivity);
assertThat(controllers.isEmpty()).isFalse(); assertThat(controllers.isEmpty()).isFalse();
} }
@@ -189,7 +189,7 @@ public class LanguageAndInputSettingsTest {
fragment.getPreferenceScreenResId()); fragment.getPreferenceScreenResId());
final List<String> preferenceKeys = new ArrayList<>(); final List<String> preferenceKeys = new ArrayList<>();
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) { for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
preferenceKeys.add(controller.getPreferenceKey()); preferenceKeys.add(controller.getPreferenceKey());
} }

View File

@@ -68,7 +68,7 @@ public class FakeSettingsFragment extends DashboardFragment {
} }
@Override @Override
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) { protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
return null; return null;
} }