Internet Picker implementation.
This version is to resolve the Reverted CL, ag/13127781 and make NetworkProviderSettingsTest passed Show mobile network on internet page With mobile network - https://screenshot.googleplex.com/7HzGhnbpitErynY Without mobile network - https://screenshot.googleplex.com/8sNVggTpKEhKeRh Class diff: https://diff.googleplex.com/#key=WosyTF0ANVMf Doc: https://docs.google.com/presentation/d/1azrZVS54pxM2lt9LkZHtFh_6W3fyDw_kTTPVQ_mJCi4/edit#slide=id.g9c7123c172_0_448 Bug: 173105859 Test: atest NetworkMobileProviderControllerTest passed Test: make RunSettingsRoboTests ROBOTEST_FILTER=SubscriptionsPreferenceControllerTest passed Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest passed Change-Id: Ib0bdd148424881353f18307cb83798b4217060fc
This commit is contained in:
@@ -207,6 +207,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
DataUsagePreference mDataUsagePreference;
|
||||
private LinkablePreference mStatusMessagePreference;
|
||||
|
||||
/**
|
||||
* Mobile networks list for provider model
|
||||
*/
|
||||
private static final String PREF_KEY_PROVIDER_MOBILE_NETWORK = "provider_model_mobile_network";
|
||||
private NetworkMobileProviderController mNetworkMobileProviderController;
|
||||
|
||||
/**
|
||||
* Tracks whether the user initiated a connection via clicking in order to autoscroll to the
|
||||
* network once connected.
|
||||
@@ -255,6 +261,16 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
mDataUsagePreference.setTemplate(NetworkTemplate.buildTemplateWifiWildcard(),
|
||||
0 /*subId*/,
|
||||
null /*service*/);
|
||||
addNetworkMobileProviderController();
|
||||
}
|
||||
|
||||
private void addNetworkMobileProviderController() {
|
||||
if (mNetworkMobileProviderController == null) {
|
||||
mNetworkMobileProviderController = new NetworkMobileProviderController(
|
||||
getContext(), PREF_KEY_PROVIDER_MOBILE_NETWORK);
|
||||
}
|
||||
mNetworkMobileProviderController.init(getSettingsLifecycle());
|
||||
mNetworkMobileProviderController.displayPreference(getPreferenceScreen());
|
||||
}
|
||||
|
||||
@Override
|
||||
@@ -340,6 +356,12 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment
|
||||
}
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onAttach(Context context) {
|
||||
super.onAttach(context);
|
||||
|
||||
}
|
||||
|
||||
@Override
|
||||
public void onDestroyView() {
|
||||
mWorkerThread.quit();
|
||||
|
Reference in New Issue
Block a user