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

[Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.2

Browse Source 
Test: atest CarrierWifiTogglePreferenceControllerTest
Bug: 197066557
Change-Id: I2f1d22fb77c4e56ed10e11dfe11e8b9e880f16ff
This commit is contained in:
Zoey Chen
2021-11-15 21:59:46 +08:00
parent 5515e9bde5
commit 439bc7f9dd
6 changed files with 19 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
res/xml/mobile_network_list.xml
View File

@@ -13,7 +13,8 @@
See the License for the specific language governing permissions and
limitations under the License.
-->
<!-- @deprecated This class will be removed in Android U, use {@link network_provider_sims_list.xml}
instead.-->
<PreferenceScreen
xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:settings="http://schemas.android.com/apk/res-auto"

5
src/com/android/settings/network/CarrierWifiTogglePreferenceController.java
View File

@@ -39,7 +39,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
protected static final String CARRIER_WIFI_NETWORK_PREF_KEY = "carrier_wifi_network";
protected final Context mContext;
protected boolean mIsProviderModelEnabled;
protected int mSubId;
protected WifiPickerTrackerHelper mWifiPickerTrackerHelper;
protected boolean mIsCarrierProvisionWifiEnabled;
@@ -49,7 +48,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
String preferenceKey) {
super(context, preferenceKey);
mContext = context;
mIsProviderModelEnabled = Utils.isProviderModelEnabled(context);
}
/** Initialize related properties */
@@ -62,9 +60,6 @@ public class CarrierWifiTogglePreferenceController extends TogglePreferenceContr
@Override
public int getAvailabilityStatus() {
if (!mIsProviderModelEnabled) {
return CONDITIONALLY_UNAVAILABLE;
}
return mIsCarrierProvisionWifiEnabled ? AVAILABLE : CONDITIONALLY_UNAVAILABLE;
}

5
src/com/android/settings/network/MobileNetworkListController.java
View File

@@ -45,7 +45,12 @@ import java.util.Map;
* This populates the entries on a page which lists all available mobile subscriptions. Each entry
* has the name of the subscription with some subtext giving additional detail, and clicking on the
* entry brings you to a details page for that network.
*
* @deprecated This class will be removed in Android U, use
* {@link NetworkProviderSimsCategoryController} and
* {@link NetworkProviderDownloadedSimsCategoryController} instead.
*/
@Deprecated
public class MobileNetworkListController extends AbstractPreferenceController implements
LifecycleObserver, SubscriptionsChangeListener.SubscriptionsChangeListenerClient {
private static final String TAG = "MobileNetworkListCtlr";

28
src/com/android/settings/network/MobileNetworkListFragment.java
View File

@@ -44,9 +44,7 @@ public class MobileNetworkListFragment extends DashboardFragment {
@Override
protected int getPreferenceScreenResId() {
return Utils.isProviderModelEnabled(getContext())
? R.xml.network_provider_sims_list
: R.xml.mobile_network_list;
return R.xml.network_provider_sims_list;
}
@Override
@@ -63,18 +61,14 @@ public class MobileNetworkListFragment extends DashboardFragment {
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
final List<AbstractPreferenceController> controllers = new ArrayList<>();
if (Utils.isProviderModelEnabled(getContext())) {
NetworkProviderSimsCategoryController simCategoryPrefCtrl =
new NetworkProviderSimsCategoryController(context, KEY_PREFERENCE_CATEGORY_SIM,
getSettingsLifecycle());
controllers.add(simCategoryPrefCtrl);
NetworkProviderDownloadedSimsCategoryController downloadedSimsCategoryCtrl =
new NetworkProviderDownloadedSimsCategoryController(context,
KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM, getSettingsLifecycle());
controllers.add(downloadedSimsCategoryCtrl);
} else {
controllers.add(new MobileNetworkListController(getContext(), getLifecycle()));
}
NetworkProviderSimsCategoryController simCategoryPrefCtrl =
new NetworkProviderSimsCategoryController(context, KEY_PREFERENCE_CATEGORY_SIM,
getSettingsLifecycle());
controllers.add(simCategoryPrefCtrl);
NetworkProviderDownloadedSimsCategoryController downloadedSimsCategoryCtrl =
new NetworkProviderDownloadedSimsCategoryController(context,
KEY_PREFERENCE_CATEGORY_DOWNLOADED_SIM, getSettingsLifecycle());
controllers.add(downloadedSimsCategoryCtrl);
return controllers;
}
@@ -87,9 +81,7 @@ public class MobileNetworkListFragment extends DashboardFragment {
boolean enabled) {
final ArrayList<SearchIndexableResource> result = new ArrayList<>();
final SearchIndexableResource sir = new SearchIndexableResource(context);
sir.xmlResId = Utils.isProviderModelEnabled(context)
? R.xml.network_provider_sims_list
: R.xml.mobile_network_list;
sir.xmlResId = R.xml.network_provider_sims_list;
result.add(sir);
return result;
}

25
src/com/android/settings/network/NetworkDashboardFragment.java
View File

@@ -60,20 +60,13 @@ public class NetworkDashboardFragment extends DashboardFragment implements
@Override
protected int getPreferenceScreenResId() {
if (Utils.isProviderModelEnabled(getContext())) {
return R.xml.network_provider_internet;
} else {
return R.xml.network_and_internet;
}
return R.xml.network_provider_internet;
}
@Override
public void onAttach(Context context) {
super.onAttach(context);
if (!Utils.isProviderModelEnabled(context)) {
use(MultiNetworkHeaderController.class).init(getSettingsLifecycle());
}
use(AirplaneModePreferenceController.class).setFragment(this);
getSettingsLifecycle().addObserver(use(AllInOneTetherPreferenceController.class));
}
@@ -100,16 +93,8 @@ public class NetworkDashboardFragment extends DashboardFragment implements
MobilePlanPreferenceHost mobilePlanHost) {
final MobilePlanPreferenceController mobilePlanPreferenceController =
new MobilePlanPreferenceController(context, mobilePlanHost);
final WifiPrimarySwitchPreferenceController wifiPreferenceController =
Utils.isProviderModelEnabled(context)
? null
: new WifiPrimarySwitchPreferenceController(
context,
metricsFeatureProvider);
final InternetPreferenceController internetPreferenceController =
Utils.isProviderModelEnabled(context)
? new InternetPreferenceController(context, lifecycle)
: null;
new InternetPreferenceController(context, lifecycle);
final VpnPreferenceController vpnPreferenceController =
new VpnPreferenceController(context);
@@ -118,9 +103,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
if (lifecycle != null) {
lifecycle.addObserver(mobilePlanPreferenceController);
if (wifiPreferenceController != null) {
lifecycle.addObserver(wifiPreferenceController);
}
lifecycle.addObserver(vpnPreferenceController);
lifecycle.addObserver(privateDnsPreferenceController);
}
@@ -132,9 +114,6 @@ public class NetworkDashboardFragment extends DashboardFragment implements
controllers.add(vpnPreferenceController);
controllers.add(new ProxyPreferenceController(context));
controllers.add(mobilePlanPreferenceController);
if (wifiPreferenceController != null) {
controllers.add(wifiPreferenceController);
}
if (internetPreferenceController != null) {
controllers.add(internetPreferenceController);
}

8
tests/unit/src/com/android/settings/network/CarrierWifiTogglePreferenceControllerTest.java
View File

@@ -70,7 +70,6 @@ public class CarrierWifiTogglePreferenceControllerTest {
mController = new CarrierWifiTogglePreferenceController(mContext,
CarrierWifiTogglePreferenceController.CARRIER_WIFI_TOGGLE_PREF_KEY);
mController.init(mock(Lifecycle.class), SUB_ID);
mController.mIsProviderModelEnabled = true;
mController.mIsCarrierProvisionWifiEnabled = true;
doReturn(true).when(mWifiPickerTrackerHelper).isCarrierNetworkActive();
doReturn(SSID).when(mWifiPickerTrackerHelper).getCarrierNetworkSsid();
@@ -92,13 +91,6 @@ public class CarrierWifiTogglePreferenceControllerTest {
mController.mCarrierNetworkPreference = mNetworkPreference;
}
@Test
public void getAvailabilityStatus_providerModelDisable_returnUnavailable() {
mController.mIsProviderModelEnabled = false;
assertThat(mController.getAvailabilityStatus()).isEqualTo(CONDITIONALLY_UNAVAILABLE);
}
@Test
public void getAvailabilityStatus_carrierProvisionWifiEnabled_returnAvailable() {
mController.mIsCarrierProvisionWifiEnabled = true;