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

[Provider Model] Add Airplane-safe Networks preference

Browse Source 
- Hide the preference when airplane mode is off.

- Reuse PrimarySwitchPreference for RestrictedSwitchPreference

- Screenshot
  https://screenshot.googleplex.com/8HiC5sc8xaqnhz5

Bug: 174022082
Test: atest -c AirplaneSafeNetworksPreferenceControllerTest
Change-Id: I06a56e8e815778cebf200c4a486c414e92f4cb87
This commit is contained in:
Weng Su
2020-11-23 16:36:14 +00:00
parent c48eacaa82
commit 845db3499d
5 changed files with 265 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

47
src/com/android/settings/widget/PrimarySwitchController.java
View File

@@ -1,5 +1,5 @@
/*
* Copyright (C) 2017 The Android Open Source Project
* Copyright (C) 2020 The Android Open Source Project
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -21,22 +21,32 @@ import androidx.preference.Preference;
import com.android.settings.dashboard.DashboardFragment;
import com.android.settings.overlay.FeatureFactory;
import com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import com.android.settingslib.RestrictedSwitchPreference;
import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
/**
* The switch controller that is used to update the switch widget in the PrimarySwitchPreference
* layout.
* and RestrictedSwitchPreference layouts.
*/
// TODO(b/174022082): Modify the class name to GenericSwitchController.
public class PrimarySwitchController extends SwitchWidgetController implements
Preference.OnPreferenceChangeListener {
private final PrimarySwitchPreference mPreference;
private final MetricsFeatureProvider mMetricsFeatureProvider;
private Preference mPreference;
private MetricsFeatureProvider mMetricsFeatureProvider;
public PrimarySwitchController(PrimarySwitchPreference preference) {
setPreference(preference);
}
public PrimarySwitchController(RestrictedSwitchPreference preference) {
setPreference(preference);
}
private void setPreference(Preference preference) {
mPreference = preference;
mMetricsFeatureProvider = FeatureFactory.getFactory(preference.getContext())
.getMetricsFeatureProvider();
mMetricsFeatureProvider =
FeatureFactory.getFactory(preference.getContext()).getMetricsFeatureProvider();
}
@Override
@@ -55,17 +65,30 @@ public class PrimarySwitchController extends SwitchWidgetController implements
@Override
public void setChecked(boolean checked) {
mPreference.setChecked(checked);
if (mPreference instanceof PrimarySwitchPreference) {
((PrimarySwitchPreference) mPreference).setChecked(checked);
} else if (mPreference instanceof RestrictedSwitchPreference) {
((RestrictedSwitchPreference) mPreference).setChecked(checked);
}
}
@Override
public boolean isChecked() {
return mPreference.isChecked();
if (mPreference instanceof PrimarySwitchPreference) {
return ((PrimarySwitchPreference) mPreference).isChecked();
} else if (mPreference instanceof RestrictedSwitchPreference) {
return ((RestrictedSwitchPreference) mPreference).isChecked();
}
return false;
}
@Override
public void setEnabled(boolean enabled) {
mPreference.setSwitchEnabled(enabled);
if (mPreference instanceof PrimarySwitchPreference) {
((PrimarySwitchPreference) mPreference).setSwitchEnabled(enabled);
} else if (mPreference instanceof RestrictedSwitchPreference) {
((RestrictedSwitchPreference) mPreference).setEnabled(enabled);
}
}
@Override
@@ -83,6 +106,10 @@ public class PrimarySwitchController extends SwitchWidgetController implements
@Override
public void setDisabledByAdmin(EnforcedAdmin admin) {
mPreference.setDisabledByAdmin(admin);
if (mPreference instanceof PrimarySwitchPreference) {
((PrimarySwitchPreference) mPreference).setDisabledByAdmin(admin);
} else if (mPreference instanceof RestrictedSwitchPreference) {
((RestrictedSwitchPreference) mPreference).setDisabledByAdmin(admin);
}
}
}