[Provider Model] Modify the class name to GenericSwitchController
- The generic class can be used for multiple controllers Bug: 174022082 Test: - atest -c AirplaneSafeNetworksPreferenceControllerTest - make RunSettingsRoboTests ROBOTEST_FILTER=AllInOneTetherPreferenceControllerTest - make RunSettingsRoboTests ROBOTEST_FILTER=AutomaticStorageManagementSwitchPreferenceControllerTest - make RunSettingsRoboTests ROBOTEST_FILTER=WifiPrimarySwitchPreferenceControllerTest Change-Id: I7d50ae3e6228005eb6dfb0a6c1a2f870c41330f2
This commit is contained in:
@@ -29,7 +29,7 @@ import androidx.preference.PreferenceScreen;
|
|||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.deletionhelper.ActivationWarningFragment;
|
import com.android.settings.deletionhelper.ActivationWarningFragment;
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
import com.android.settings.widget.PrimarySwitchController;
|
import com.android.settings.widget.GenericSwitchController;
|
||||||
import com.android.settings.widget.PrimarySwitchPreference;
|
import com.android.settings.widget.PrimarySwitchPreference;
|
||||||
import com.android.settings.widget.SwitchWidgetController;
|
import com.android.settings.widget.SwitchWidgetController;
|
||||||
import com.android.settingslib.Utils;
|
import com.android.settingslib.Utils;
|
||||||
@@ -44,7 +44,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
|
|||||||
static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
|
static final String STORAGE_MANAGER_ENABLED_BY_DEFAULT_PROPERTY = "ro.storage_manager.enabled";
|
||||||
private final MetricsFeatureProvider mMetricsFeatureProvider;
|
private final MetricsFeatureProvider mMetricsFeatureProvider;
|
||||||
private PrimarySwitchPreference mSwitch;
|
private PrimarySwitchPreference mSwitch;
|
||||||
private PrimarySwitchController mSwitchController;
|
private GenericSwitchController mSwitchController;
|
||||||
private FragmentManager mFragmentManager;
|
private FragmentManager mFragmentManager;
|
||||||
|
|
||||||
public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) {
|
public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) {
|
||||||
@@ -77,7 +77,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
|
|||||||
mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));
|
mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));
|
||||||
|
|
||||||
if (mSwitch != null) {
|
if (mSwitch != null) {
|
||||||
mSwitchController = new PrimarySwitchController(mSwitch);
|
mSwitchController = new GenericSwitchController(mSwitch);
|
||||||
mSwitchController.setListener(this);
|
mSwitchController.setListener(this);
|
||||||
mSwitchController.startListening();
|
mSwitchController.startListening();
|
||||||
}
|
}
|
||||||
|
@@ -25,7 +25,7 @@ import androidx.preference.PreferenceScreen;
|
|||||||
|
|
||||||
import com.android.settings.AirplaneModeEnabler;
|
import com.android.settings.AirplaneModeEnabler;
|
||||||
import com.android.settings.overlay.FeatureFactory;
|
import com.android.settings.overlay.FeatureFactory;
|
||||||
import com.android.settings.widget.PrimarySwitchController;
|
import com.android.settings.widget.GenericSwitchController;
|
||||||
import com.android.settings.wifi.WifiEnabler;
|
import com.android.settings.wifi.WifiEnabler;
|
||||||
import com.android.settingslib.RestrictedSwitchPreference;
|
import com.android.settingslib.RestrictedSwitchPreference;
|
||||||
import com.android.settingslib.core.AbstractPreferenceController;
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
@@ -70,7 +70,7 @@ public class AirplaneSafeNetworksPreferenceController extends AbstractPreference
|
|||||||
public void onStart() {
|
public void onStart() {
|
||||||
mAirplaneModeEnabler.start();
|
mAirplaneModeEnabler.start();
|
||||||
if (mPreference != null) {
|
if (mPreference != null) {
|
||||||
mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mPreference),
|
mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mPreference),
|
||||||
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider());
|
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider());
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -42,7 +42,7 @@ import androidx.preference.PreferenceScreen;
|
|||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.BasePreferenceController;
|
import com.android.settings.core.BasePreferenceController;
|
||||||
import com.android.settings.core.FeatureFlags;
|
import com.android.settings.core.FeatureFlags;
|
||||||
import com.android.settings.widget.PrimarySwitchController;
|
import com.android.settings.widget.GenericSwitchController;
|
||||||
import com.android.settings.widget.PrimarySwitchPreference;
|
import com.android.settings.widget.PrimarySwitchPreference;
|
||||||
import com.android.settingslib.TetherUtil;
|
import com.android.settingslib.TetherUtil;
|
||||||
|
|
||||||
@@ -191,7 +191,7 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
|
|||||||
void initEnabler(Lifecycle lifecycle) {
|
void initEnabler(Lifecycle lifecycle) {
|
||||||
if (mPreference != null) {
|
if (mPreference != null) {
|
||||||
mTetherEnabler = new TetherEnabler(
|
mTetherEnabler = new TetherEnabler(
|
||||||
mContext, new PrimarySwitchController(mPreference), mBluetoothPan);
|
mContext, new GenericSwitchController(mPreference), mBluetoothPan);
|
||||||
if (lifecycle != null) {
|
if (lifecycle != null) {
|
||||||
lifecycle.addObserver(mTetherEnabler);
|
lifecycle.addObserver(mTetherEnabler);
|
||||||
}
|
}
|
||||||
|
@@ -28,18 +28,17 @@ import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
|
|||||||
* The switch controller that is used to update the switch widget in the PrimarySwitchPreference
|
* The switch controller that is used to update the switch widget in the PrimarySwitchPreference
|
||||||
* and RestrictedSwitchPreference layouts.
|
* and RestrictedSwitchPreference layouts.
|
||||||
*/
|
*/
|
||||||
// TODO(b/174022082): Modify the class name to GenericSwitchController.
|
public class GenericSwitchController extends SwitchWidgetController implements
|
||||||
public class PrimarySwitchController extends SwitchWidgetController implements
|
|
||||||
Preference.OnPreferenceChangeListener {
|
Preference.OnPreferenceChangeListener {
|
||||||
|
|
||||||
private Preference mPreference;
|
private Preference mPreference;
|
||||||
private MetricsFeatureProvider mMetricsFeatureProvider;
|
private MetricsFeatureProvider mMetricsFeatureProvider;
|
||||||
|
|
||||||
public PrimarySwitchController(PrimarySwitchPreference preference) {
|
public GenericSwitchController(PrimarySwitchPreference preference) {
|
||||||
setPreference(preference);
|
setPreference(preference);
|
||||||
}
|
}
|
||||||
|
|
||||||
public PrimarySwitchController(RestrictedSwitchPreference preference) {
|
public GenericSwitchController(RestrictedSwitchPreference preference) {
|
||||||
setPreference(preference);
|
setPreference(preference);
|
||||||
}
|
}
|
||||||
|
|
@@ -21,7 +21,7 @@ import androidx.preference.PreferenceScreen;
|
|||||||
|
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
import com.android.settings.core.PreferenceControllerMixin;
|
import com.android.settings.core.PreferenceControllerMixin;
|
||||||
import com.android.settings.widget.PrimarySwitchController;
|
import com.android.settings.widget.GenericSwitchController;
|
||||||
import com.android.settings.widget.PrimarySwitchPreference;
|
import com.android.settings.widget.PrimarySwitchPreference;
|
||||||
import com.android.settings.widget.SummaryUpdater;
|
import com.android.settings.widget.SummaryUpdater;
|
||||||
import com.android.settingslib.core.AbstractPreferenceController;
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
@@ -89,7 +89,7 @@ public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceCon
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mWifiPreference),
|
mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mWifiPreference),
|
||||||
mMetricsFeatureProvider);
|
mMetricsFeatureProvider);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Reference in New Issue
Block a user