Merge "More renaming in DashboardFragment"
This commit is contained in:
committed by
Android (Google) Code Review
commit
572efd22dd
@@ -73,7 +73,7 @@ public class DateTimeSettings extends DashboardFragment implements
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> 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();
|
||||
|
@@ -74,7 +74,7 @@ public class DisplaySettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -52,7 +52,7 @@ public class VibrationSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -62,7 +62,7 @@ public class AccountDashboardFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final String[] authorities = getIntent().getStringArrayExtra(EXTRA_AUTHORITIES);
|
||||
final AccountPreferenceController accountPrefController =
|
||||
|
@@ -109,7 +109,7 @@ public class AccountDetailDashboardFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
mAccountSynController = new AccountSyncPreferenceController(context);
|
||||
controllers.add(mAccountSynController);
|
||||
|
@@ -58,7 +58,7 @@ public class AppAndNotificationDashboardFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final Activity activity = getActivity();
|
||||
final Application app;
|
||||
if (activity != null) {
|
||||
|
@@ -60,7 +60,7 @@ public class DefaultAppSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context);
|
||||
}
|
||||
|
||||
|
@@ -61,7 +61,7 @@ public class SpecialAccessSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context);
|
||||
}
|
||||
|
||||
|
@@ -212,7 +212,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
retrieveAppEntry();
|
||||
if (mPackageInfo == null) {
|
||||
return null;
|
||||
|
@@ -51,7 +51,7 @@ public class ManageAssist extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -61,7 +61,7 @@ public class BackupSettingsFragment extends DashboardFragment {
|
||||
* Get a list of {@link AbstractPreferenceController} for this fragment.
|
||||
*/
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new BackupSettingsPreferenceController(context));
|
||||
return controllers;
|
||||
|
@@ -136,7 +136,7 @@ public class BluetoothDeviceDetailsFragment extends RestrictedDashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
|
||||
if (mCachedDevice != null) {
|
||||
|
@@ -193,7 +193,7 @@ public class BluetoothPairingDetail extends DeviceListPreferenceFragment impleme
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(
|
||||
new BluetoothDeviceRenamePreferenceController(context, KEY_RENAME_DEVICES, this,
|
||||
|
@@ -363,7 +363,7 @@ public class BluetoothSettings extends DeviceListPreferenceFragment implements I
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final Lifecycle lifecycle = getLifecycle();
|
||||
mDeviceNamePrefController = new BluetoothDeviceNamePreferenceController(context, lifecycle);
|
||||
|
@@ -170,7 +170,7 @@ public final class DevicePickerFragment extends DeviceListPreferenceFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@@ -65,7 +65,7 @@ public class AdvancedConnectedDeviceDashboardFragment extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -58,7 +58,7 @@ public class ConnectedDeviceDashboardFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final Lifecycle lifecycle = getLifecycle();
|
||||
|
||||
|
@@ -71,7 +71,7 @@ public class ConnectedDeviceDashboardFragmentOld extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final Lifecycle lifecycle = getLifecycle();
|
||||
final NfcPreferenceController nfcPreferenceController =
|
||||
|
@@ -79,7 +79,7 @@ public class UsbDetailsFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
mUsbBackend = new UsbBackend(context);
|
||||
mControllers = createControllerList(context, mUsbBackend, this);
|
||||
mUsbReceiver = new UsbConnectionBroadcastReceiver(context, mUsbConnectionListener,
|
||||
|
@@ -72,7 +72,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
// Load preference controllers from code
|
||||
final List<AbstractPreferenceController> controllersFromCode =
|
||||
getPreferenceControllers(context);
|
||||
createPreferenceControllers(context);
|
||||
// Load preference controllers from xml definition
|
||||
final List<BasePreferenceController> controllersFromXml = PreferenceControllerListHelper
|
||||
.getPreferenceControllersFromXml(context, getPreferenceScreenResId());
|
||||
@@ -206,7 +206,7 @@ public abstract class DashboardFragment extends SettingsPreferenceFragment
|
||||
@Override
|
||||
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);
|
||||
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<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@@ -169,7 +169,7 @@ public class DataUsageSummary extends DataUsageBaseFragment implements Indexable
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
mSummaryController =
|
||||
new DataUsageSummaryPreferenceController(context);
|
||||
|
@@ -188,7 +188,7 @@ public class DataUsageSummaryLegacy extends DataUsageBaseFragment implements Ind
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@@ -110,7 +110,7 @@ public class AutomaticStorageManagerSettings extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context);
|
||||
}
|
||||
|
||||
|
@@ -302,7 +302,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
if (Utils.isMonkeyRunning()) {
|
||||
mPreferenceControllers = new ArrayList<>();
|
||||
return null;
|
||||
@@ -454,7 +454,7 @@ public class DevelopmentSettingsDashboardFragment extends RestrictedDashboardFra
|
||||
|
||||
@VisibleForTesting
|
||||
<T extends AbstractPreferenceController> T getDevelopmentOptionsController(Class<T> clazz) {
|
||||
return getPreferenceController(clazz);
|
||||
return use(clazz);
|
||||
}
|
||||
|
||||
/**
|
||||
|
@@ -51,7 +51,7 @@ public class FeatureFlagsDashboard extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new FeatureFlagsPreferenceController(context, getLifecycle()));
|
||||
return controllers;
|
||||
|
@@ -40,7 +40,7 @@ public class DevelopmentTileConfigFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
controllers.add(new DevelopmentTilePreferenceController(context));
|
||||
return controllers;
|
||||
|
@@ -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<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getActivity(), this /* fragment */,
|
||||
getLifecycle());
|
||||
}
|
||||
|
@@ -167,7 +167,7 @@ public class StorageDashboardFragment extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
mSummaryController = new StorageSummaryDonutPreferenceController(context);
|
||||
controllers.add(mSummaryController);
|
||||
|
@@ -98,7 +98,7 @@ public class StorageProfileFragment extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final StorageManager sm = context.getSystemService(StorageManager.class);
|
||||
mPreferenceController =
|
||||
|
@@ -94,7 +94,7 @@ public class MyDeviceInfoFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> 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;
|
||||
}
|
||||
|
@@ -76,7 +76,7 @@ public class AmbientDisplaySettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle(),
|
||||
new AmbientDisplayConfiguration(context), mMetricsFeatureProvider,
|
||||
this::updatePreferenceStates);
|
||||
|
@@ -109,7 +109,7 @@ public class DreamSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context);
|
||||
}
|
||||
|
||||
|
@@ -49,7 +49,7 @@ public abstract class ApplicationListFragment extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
ApplicationListPreferenceController controller = new ApplicationListPreferenceController(
|
||||
context, this, context.getPackageManager(), this);
|
||||
|
@@ -51,7 +51,7 @@ public class EnterprisePrivacySettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, true /* async */);
|
||||
}
|
||||
|
||||
|
@@ -48,7 +48,7 @@ public class EnterpriseSetDefaultAppsListFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final EnterpriseSetDefaultAppsListPreferenceController controller =
|
||||
new EnterpriseSetDefaultAppsListPreferenceController(
|
||||
|
@@ -327,7 +327,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final Bundle bundle = getArguments();
|
||||
final int uid = bundle.getInt(EXTRA_UID, 0);
|
||||
|
@@ -167,7 +167,7 @@ public class PowerUsageAdvanced extends PowerUsageBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@@ -123,7 +123,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@@ -228,7 +228,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final Lifecycle lifecycle = getLifecycle();
|
||||
final SettingsActivity activity = (SettingsActivity) getActivity();
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
|
@@ -307,7 +307,7 @@ public class PowerUsageSummaryLegacy extends PowerUsageBase implements
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
mBatteryHeaderPreferenceController = new BatteryHeaderPreferenceController(
|
||||
context, getActivity(), this /* host */, getLifecycle());
|
||||
|
@@ -108,7 +108,7 @@ public class RestrictedAppDetails extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@@ -64,7 +64,7 @@ public class SmartBatterySettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, (SettingsActivity) getActivity(), this);
|
||||
}
|
||||
|
||||
|
@@ -59,7 +59,7 @@ public class BatterySaverSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -51,7 +51,7 @@ public class AssistGestureSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -66,7 +66,7 @@ public class DoubleTapPowerSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -73,7 +73,7 @@ public class DoubleTapScreenSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -66,7 +66,7 @@ public class DoubleTwistGestureSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -63,7 +63,7 @@ public class GestureSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
if (mAmbientDisplayConfig == null) {
|
||||
mAmbientDisplayConfig = new AmbientDisplayConfiguration(context);
|
||||
}
|
||||
|
@@ -73,7 +73,7 @@ public class PickupGestureSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -67,7 +67,7 @@ public class SwipeToNotificationSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -87,7 +87,7 @@ public class LanguageAndInputSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -100,7 +100,7 @@ public class LocationSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, this, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -52,7 +52,7 @@ public class ScanningSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context);
|
||||
}
|
||||
|
||||
|
@@ -90,7 +90,7 @@ public class NetworkDashboardFragment extends DashboardFragment implements
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> 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)
|
||||
|
@@ -110,7 +110,7 @@ public class AppNotificationSettings extends NotificationSettingsBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
mControllers = new ArrayList<>();
|
||||
mControllers.add(new HeaderPreferenceController(context, this));
|
||||
mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));
|
||||
|
@@ -65,7 +65,7 @@ public class ChannelGroupNotificationSettings extends NotificationSettingsBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
mControllers = new ArrayList<>();
|
||||
mControllers.add(new HeaderPreferenceController(context, this));
|
||||
mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));
|
||||
|
@@ -75,7 +75,7 @@ public class ChannelNotificationSettings extends NotificationSettingsBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
mControllers = new ArrayList<>();
|
||||
mControllers.add(new HeaderPreferenceController(context, this));
|
||||
mControllers.add(new BlockPreferenceController(context, mImportanceListener, mBackend));
|
||||
|
@@ -76,7 +76,7 @@ public class ConfigureNotificationSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final Activity activity = getActivity();
|
||||
final Application app;
|
||||
if (activity != null) {
|
||||
|
@@ -107,7 +107,7 @@ public class SoundSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> 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();
|
||||
}
|
||||
|
@@ -37,7 +37,7 @@ public class ZenModeAutomationSettings extends ZenModeSettingsBase {
|
||||
protected final ManagedServiceSettings.Config CONFIG = getConditionProviderConfig();
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
ZenServiceListing serviceListing = new ZenServiceListing(getContext(), CONFIG);
|
||||
serviceListing.reloadApprovedServices();
|
||||
return buildPreferenceControllers(context, this, serviceListing, getLifecycle());
|
||||
|
@@ -32,7 +32,7 @@ import java.util.List;
|
||||
public class ZenModeBehaviorSettings extends ZenModeSettingsBase implements Indexable {
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -78,7 +78,7 @@ public class ZenModeEventRuleSettings extends ZenModeRuleSettingsBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this,
|
||||
getLifecycle());
|
||||
|
@@ -196,7 +196,7 @@ public class ZenModeScheduleRuleSettings extends ZenModeRuleSettingsBase {
|
||||
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
mHeader = new ZenAutomaticRuleHeaderPreferenceController(context, this,
|
||||
getLifecycle());
|
||||
|
@@ -50,7 +50,7 @@ public class ZenModeSettings extends ZenModeSettingsBase {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle(), getFragmentManager());
|
||||
}
|
||||
|
||||
|
@@ -53,7 +53,7 @@ public class EncryptionAndCredential extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -76,7 +76,7 @@ public class LockscreenDashboardFragment extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
final Lifecycle lifecycle = getLifecycle();
|
||||
final LockScreenNotificationPreferenceController notificationController =
|
||||
|
@@ -77,7 +77,7 @@ public class SecuritySettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> 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<AbstractPreferenceController> buildPreferenceControllers(Context context,
|
||||
|
@@ -60,7 +60,7 @@ public class ScreenLockSettings extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> 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<AbstractPreferenceController> buildPreferenceControllers(Context context,
|
||||
|
@@ -52,7 +52,7 @@ public class ResetDashboardFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return buildPreferenceControllers(context, getLifecycle());
|
||||
}
|
||||
|
||||
|
@@ -73,7 +73,7 @@ public class ConfigureWifiSettings extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final NetworkScoreManagerWrapper networkScoreManagerWrapper =
|
||||
new NetworkScoreManagerWrapper(context.getSystemService(NetworkScoreManager.class));
|
||||
mWifiWakeupPreferenceController = new WifiWakeupPreferenceController(context);
|
||||
|
@@ -124,7 +124,7 @@ public class WifiNetworkDetailsFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
ConnectivityManager cm = context.getSystemService(ConnectivityManager.class);
|
||||
mWifiDetailPreferenceController = WifiDetailPreferenceController.newInstance(
|
||||
|
@@ -168,7 +168,7 @@ public class WifiP2pSettings extends DashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||
mPersistentCategoryController =
|
||||
new P2pPersistentCategoryPreferenceController(context);
|
||||
|
@@ -125,7 +125,7 @@ public class WifiTetherSettings extends RestrictedDashboardFragment
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
final List<AbstractPreferenceController> 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();
|
||||
}
|
||||
|
||||
|
@@ -32,7 +32,7 @@ public class DisplaySettingsTest {
|
||||
fragment.getPreferenceScreenResId());
|
||||
final List<String> preferenceKeys = new ArrayList<>();
|
||||
|
||||
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
|
||||
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
|
||||
preferenceKeys.add(controller.getPreferenceKey());
|
||||
}
|
||||
// Nightmode is currently hidden
|
||||
|
@@ -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
|
||||
|
@@ -208,7 +208,7 @@ public class DeviceListPreferenceFragmentTest {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
}
|
||||
|
@@ -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;
|
||||
|
@@ -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<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return mControllers;
|
||||
}
|
||||
|
||||
|
@@ -84,7 +84,7 @@ public class ApplicationListFragmentTest {
|
||||
|
||||
@Test
|
||||
public void getPreferenceControllers() {
|
||||
final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(
|
||||
final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(
|
||||
mContext);
|
||||
assertThat(controllers).isNotNull();
|
||||
assertThat(controllers.size()).isEqualTo(1);
|
||||
|
@@ -90,7 +90,7 @@ public final class EnterprisePrivacySettingsTest {
|
||||
|
||||
@Test
|
||||
public void getPreferenceControllers() throws Exception {
|
||||
final List<AbstractPreferenceController> controllers = mSettings.getPreferenceControllers(
|
||||
final List<AbstractPreferenceController> controllers = mSettings.createPreferenceControllers(
|
||||
ShadowApplication.getInstance().getApplicationContext());
|
||||
verifyPreferenceControllers(controllers);
|
||||
}
|
||||
|
@@ -80,7 +80,7 @@ public class EnterpriseSetDefaultAppsListFragmentTest {
|
||||
|
||||
@Test
|
||||
public void getPreferenceControllers() {
|
||||
final List<AbstractPreferenceController> controllers = mFragment.getPreferenceControllers(mContext);
|
||||
final List<AbstractPreferenceController> controllers = mFragment.createPreferenceControllers(mContext);
|
||||
assertThat(controllers).isNotNull();
|
||||
assertThat(controllers.size()).isEqualTo(1);
|
||||
int position = 0;
|
||||
|
@@ -94,7 +94,7 @@ public class PowerUsageBaseTest {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
@@ -408,7 +408,7 @@ public class PowerUsageSummaryLegacyTest {
|
||||
fragment.getPreferenceScreenResId());
|
||||
final List<String> preferenceKeys = new ArrayList<>();
|
||||
|
||||
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
|
||||
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
|
||||
preferenceKeys.add(controller.getPreferenceKey());
|
||||
}
|
||||
|
||||
|
@@ -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<String> preferenceKeys = new ArrayList<>();
|
||||
|
||||
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
|
||||
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
|
||||
preferenceKeys.add(controller.getPreferenceKey());
|
||||
}
|
||||
|
||||
|
@@ -59,7 +59,7 @@ public class SwipeToNotificationSettingsTest {
|
||||
@Test
|
||||
public void testGetPreferenceControllers_shouldAllBeCreated() {
|
||||
final List<AbstractPreferenceController> controllers =
|
||||
mFragment.getPreferenceControllers(mContext);
|
||||
mFragment.createPreferenceControllers(mContext);
|
||||
|
||||
assertThat(controllers.isEmpty()).isFalse();
|
||||
}
|
||||
|
@@ -107,7 +107,7 @@ public class LanguageAndInputSettingsTest {
|
||||
@Test
|
||||
public void testGetPreferenceControllers_shouldRegisterLifecycleObservers() {
|
||||
final List<AbstractPreferenceController> 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<AbstractPreferenceController> controllers =
|
||||
mFragment.getPreferenceControllers(mActivity);
|
||||
mFragment.createPreferenceControllers(mActivity);
|
||||
|
||||
assertThat(controllers.isEmpty()).isFalse();
|
||||
}
|
||||
@@ -189,7 +189,7 @@ public class LanguageAndInputSettingsTest {
|
||||
fragment.getPreferenceScreenResId());
|
||||
final List<String> preferenceKeys = new ArrayList<>();
|
||||
|
||||
for (AbstractPreferenceController controller : fragment.getPreferenceControllers(context)) {
|
||||
for (AbstractPreferenceController controller : fragment.createPreferenceControllers(context)) {
|
||||
preferenceKeys.add(controller.getPreferenceKey());
|
||||
}
|
||||
|
||||
|
@@ -68,7 +68,7 @@ public class FakeSettingsFragment extends DashboardFragment {
|
||||
}
|
||||
|
||||
@Override
|
||||
protected List<AbstractPreferenceController> getPreferenceControllers(Context context) {
|
||||
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||
return null;
|
||||
}
|
||||
|
||||
|
Reference in New Issue
Block a user