PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Provider Model] Modify the class name to GenericSwitchController

Browse Source 
- 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:
Weng Su
2020-12-03 17:36:47 +00:00
parent 25cca45c09
commit 6c430b370d
5 changed files with 12 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/com/android/settings/deviceinfo/storage/AutomaticStorageManagementSwitchPreferenceController.java
View File

@@ -29,7 +29,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.core.BasePreferenceController;
import com.android.settings.deletionhelper.ActivationWarningFragment;
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.SwitchWidgetController;
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";
private final MetricsFeatureProvider mMetricsFeatureProvider;
private PrimarySwitchPreference mSwitch;
private PrimarySwitchController mSwitchController;
private GenericSwitchController mSwitchController;
private FragmentManager mFragmentManager;
public AutomaticStorageManagementSwitchPreferenceController(Context context, String key) {
@@ -77,7 +77,7 @@ public class AutomaticStorageManagementSwitchPreferenceController extends
mSwitch.setChecked(Utils.isStorageManagerEnabled(mContext));
if (mSwitch != null) {
mSwitchController = new PrimarySwitchController(mSwitch);
mSwitchController = new GenericSwitchController(mSwitch);
mSwitchController.setListener(this);
mSwitchController.startListening();
}

4
src/com/android/settings/network/AirplaneSafeNetworksPreferenceController.java
View File

@@ -25,7 +25,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.AirplaneModeEnabler;
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.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -70,7 +70,7 @@ public class AirplaneSafeNetworksPreferenceController extends AbstractPreference
public void onStart() {
mAirplaneModeEnabler.start();
if (mPreference != null) {
mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mPreference),
mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mPreference),
FeatureFactory.getFactory(mContext).getMetricsFeatureProvider());
}
}

4
src/com/android/settings/network/AllInOneTetherPreferenceController.java
View File

@@ -42,7 +42,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
import com.android.settings.core.BasePreferenceController;
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.settingslib.TetherUtil;
@@ -191,7 +191,7 @@ public class AllInOneTetherPreferenceController extends BasePreferenceController
void initEnabler(Lifecycle lifecycle) {
if (mPreference != null) {
mTetherEnabler = new TetherEnabler(
mContext, new PrimarySwitchController(mPreference), mBluetoothPan);
mContext, new GenericSwitchController(mPreference), mBluetoothPan);
if (lifecycle != null) {
lifecycle.addObserver(mTetherEnabler);
}

7
src/com/android/settings/widget/PrimarySwitchController.java → src/com/android/settings/widget/GenericSwitchController.java
View File

@@ -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
* and RestrictedSwitchPreference layouts.
*/
// TODO(b/174022082): Modify the class name to GenericSwitchController.
public class PrimarySwitchController extends SwitchWidgetController implements
public class GenericSwitchController extends SwitchWidgetController implements
Preference.OnPreferenceChangeListener {
private Preference mPreference;
private MetricsFeatureProvider mMetricsFeatureProvider;
public PrimarySwitchController(PrimarySwitchPreference preference) {
public GenericSwitchController(PrimarySwitchPreference preference) {
setPreference(preference);
}
public PrimarySwitchController(RestrictedSwitchPreference preference) {
public GenericSwitchController(RestrictedSwitchPreference preference) {
setPreference(preference);
}

4
src/com/android/settings/wifi/WifiPrimarySwitchPreferenceController.java
View File

@@ -21,7 +21,7 @@ import androidx.preference.PreferenceScreen;
import com.android.settings.R;
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.SummaryUpdater;
import com.android.settingslib.core.AbstractPreferenceController;
@@ -89,7 +89,7 @@ public class WifiPrimarySwitchPreferenceController extends AbstractPreferenceCon
@Override
public void onStart() {
mWifiEnabler = new WifiEnabler(mContext, new PrimarySwitchController(mWifiPreference),
mWifiEnabler = new WifiEnabler(mContext, new GenericSwitchController(mWifiPreference),
mMetricsFeatureProvider);
}