Add data usage header to mobile network details page
As a part of the work for subscriptions UI improvements, we want to show data usage information at the top of the mobile network details page, and those details need to be specific to the particular subscription we're showing details for, even if that SIM isn't the current default one. This is useful for seeing data usage across your SIMs in dual-SIM devices. This CL adapts our already existing DataUsageSummaryPreferenceController class so that if can be used on any fragment instead of just the DataUsageSummary one, and changes it to take an explicit subscription id instead of assuming it should use the default one. Bug: 122670283 Test: make RunSettingsRoboTests Change-Id: I41e307b0f32580c73b08adec7cabf01c96d7e835
This commit is contained in:
155
res/xml/mobile_network_settings_v2.xml
Normal file
155
res/xml/mobile_network_settings_v2.xml
Normal file
@@ -0,0 +1,155 @@
|
|||||||
|
<?xml version="1.0" encoding="utf-8"?>
|
||||||
|
<!-- Copyright (C) 2019 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.
|
||||||
|
You may obtain a copy of the License at
|
||||||
|
|
||||||
|
http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
|
||||||
|
Unless required by applicable law or agreed to in writing, software
|
||||||
|
distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
See the License for the specific language governing permissions and
|
||||||
|
limitations under the License.
|
||||||
|
-->
|
||||||
|
<PreferenceScreen
|
||||||
|
xmlns:android="http://schemas.android.com/apk/res/android"
|
||||||
|
xmlns:settings="http://schemas.android.com/apk/res-auto"
|
||||||
|
android:key="mobile_network_pref_screen"
|
||||||
|
settings:initialExpandedChildrenCount="5">
|
||||||
|
|
||||||
|
<com.android.settings.datausage.DataUsageSummaryPreference
|
||||||
|
android:key="status_header"
|
||||||
|
android:visibility="gone"
|
||||||
|
android:selectable="false" />
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="cdma_lte_data_service_key"
|
||||||
|
android:title="@string/cdma_lte_data_service"
|
||||||
|
settings:controller="com.android.settings.network.telephony.DataServiceSetupPreferenceController">
|
||||||
|
</Preference>
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="mobile_data_enable"
|
||||||
|
android:title="@string/mobile_data_settings_title"
|
||||||
|
android:summary="@string/mobile_data_settings_summary"
|
||||||
|
settings:controller="com.android.settings.network.telephony.MobileDataPreferenceController"/>
|
||||||
|
|
||||||
|
<com.android.settingslib.RestrictedSwitchPreference
|
||||||
|
android:key="button_roaming_key"
|
||||||
|
android:title="@string/roaming"
|
||||||
|
android:persistent="false"
|
||||||
|
android:summaryOn="@string/roaming_enable"
|
||||||
|
android:summaryOff="@string/roaming_disable"
|
||||||
|
settings:userRestriction="no_data_roaming"
|
||||||
|
settings:controller="com.android.settings.network.telephony.RoamingPreferenceController"/>
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="data_usage_summary"
|
||||||
|
android:title="@string/mobile_data_usage_title"
|
||||||
|
settings:controller="com.android.settings.network.telephony.DataUsagePreferenceController"/>
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="enhanced_4g_lte"
|
||||||
|
android:title="@string/enhanced_4g_lte_mode_title"
|
||||||
|
android:persistent="false"
|
||||||
|
android:summary="@string/enhanced_4g_lte_mode_summary"
|
||||||
|
settings:controller="com.android.settings.network.telephony.Enhanced4gLtePreferenceController"/>
|
||||||
|
|
||||||
|
<ListPreference
|
||||||
|
android:key="preferred_network_mode_key"
|
||||||
|
android:title="@string/preferred_network_mode_title"
|
||||||
|
android:summary="@string/preferred_network_mode_summary"
|
||||||
|
android:entries="@array/preferred_network_mode_choices"
|
||||||
|
android:entryValues="@array/preferred_network_mode_values"
|
||||||
|
android:dialogTitle="@string/preferred_network_mode_dialogtitle"
|
||||||
|
settings:controller="com.android.settings.network.telephony.PreferredNetworkModePreferenceController"/>
|
||||||
|
|
||||||
|
<ListPreference
|
||||||
|
android:key="enabled_networks_key"
|
||||||
|
android:title="@string/preferred_network_mode_title"
|
||||||
|
android:summary="@string/preferred_network_mode_summary"
|
||||||
|
android:entries="@array/enabled_networks_choices"
|
||||||
|
android:entryValues="@array/enabled_networks_values"
|
||||||
|
android:dialogTitle="@string/preferred_network_mode_dialogtitle"
|
||||||
|
settings:controller="com.android.settings.network.telephony.EnabledNetworkModePreferenceController"/>
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="carrier_settings_euicc_key"
|
||||||
|
android:title="@string/carrier_settings_euicc"
|
||||||
|
settings:controller="com.android.settings.network.telephony.EuiccPreferenceController" />
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="calling_category"
|
||||||
|
android:title="@string/call_category">
|
||||||
|
|
||||||
|
<PreferenceScreen
|
||||||
|
android:key="wifi_calling_key"
|
||||||
|
android:title="@string/wifi_calling_settings_title"
|
||||||
|
settings:controller="com.android.settings.network.telephony.WifiCallingPreferenceController" >
|
||||||
|
<intent android:action="android.intent.action.MAIN"
|
||||||
|
android:targetPackage="com.android.settings"
|
||||||
|
android:targetClass="com.android.settings.Settings$WifiCallingSettingsActivity">
|
||||||
|
<extra android:name="show_drawer_menu" android:value="true" />
|
||||||
|
</intent>
|
||||||
|
</PreferenceScreen>
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="video_calling_key"
|
||||||
|
android:title="@string/video_calling_settings_title"
|
||||||
|
android:persistent="true"
|
||||||
|
settings:controller="com.android.settings.network.telephony.VideoCallingPreferenceController" />
|
||||||
|
|
||||||
|
</PreferenceCategory>
|
||||||
|
|
||||||
|
<com.android.settings.network.telephony.cdma.CdmaListPreference
|
||||||
|
android:key="cdma_system_select_key"
|
||||||
|
android:title="@string/cdma_system_select_title"
|
||||||
|
android:summary="@string/cdma_system_select_summary"
|
||||||
|
android:entries="@array/cdma_system_select_choices"
|
||||||
|
android:entryValues="@array/cdma_system_select_values"
|
||||||
|
android:dialogTitle="@string/cdma_system_select_dialogtitle"
|
||||||
|
settings:controller="com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController"/>
|
||||||
|
|
||||||
|
<com.android.settings.network.telephony.cdma.CdmaListPreference
|
||||||
|
android:key="cdma_subscription_key"
|
||||||
|
android:title="@string/cdma_subscription_title"
|
||||||
|
android:summary="@string/cdma_subscription_summary"
|
||||||
|
android:entries="@array/cdma_subscription_choices"
|
||||||
|
android:entryValues="@array/cdma_subscription_values"
|
||||||
|
android:dialogTitle="@string/cdma_subscription_dialogtitle"
|
||||||
|
settings:controller="com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController"/>
|
||||||
|
|
||||||
|
<PreferenceCategory
|
||||||
|
android:key="network_operators_category_key"
|
||||||
|
android:title="@string/network_operator_category"
|
||||||
|
settings:controller="com.android.settings.widget.PreferenceCategoryController">
|
||||||
|
|
||||||
|
<SwitchPreference
|
||||||
|
android:key="auto_select_key"
|
||||||
|
android:title="@string/select_automatically"
|
||||||
|
settings:controller="com.android.settings.network.telephony.gsm.AutoSelectPreferenceController"/>
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="choose_network_key"
|
||||||
|
android:title="@string/choose_network_title"
|
||||||
|
android:fragment="com.android.phone.NetworkSelectSetting"
|
||||||
|
settings:controller="com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenceController"/>
|
||||||
|
</PreferenceCategory>
|
||||||
|
|
||||||
|
<!--We want separate APN setting from reset of settings because we want user to change it with caution-->
|
||||||
|
<com.android.settingslib.RestrictedPreference
|
||||||
|
android:key="telephony_apn_key"
|
||||||
|
android:persistent="false"
|
||||||
|
android:title="@string/mobile_network_apn_title"
|
||||||
|
settings:allowDividerAbove="true"
|
||||||
|
settings:controller="com.android.settings.network.telephony.ApnPreferenceController"/>
|
||||||
|
|
||||||
|
<Preference
|
||||||
|
android:key="carrier_settings_key"
|
||||||
|
android:title="@string/carrier_settings_title"
|
||||||
|
settings:controller="com.android.settings.network.telephony.CarrierPreferenceController">
|
||||||
|
</Preference>
|
||||||
|
|
||||||
|
</PreferenceScreen>
|
@@ -141,7 +141,8 @@ public class DataUsageSummary extends DataUsageBaseFragment implements DataUsage
|
|||||||
final Activity activity = getActivity();
|
final Activity activity = getActivity();
|
||||||
final ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
|
final ArrayList<AbstractPreferenceController> controllers = new ArrayList<>();
|
||||||
mSummaryController =
|
mSummaryController =
|
||||||
new DataUsageSummaryPreferenceController(activity, getSettingsLifecycle(), this);
|
new DataUsageSummaryPreferenceController(activity, getSettingsLifecycle(), this,
|
||||||
|
DataUsageUtils.getDefaultSubscriptionId(activity));
|
||||||
controllers.add(mSummaryController);
|
controllers.add(mSummaryController);
|
||||||
getSettingsLifecycle().addObserver(mSummaryController);
|
getSettingsLifecycle().addObserver(mSummaryController);
|
||||||
return controllers;
|
return controllers;
|
||||||
|
@@ -31,6 +31,7 @@ import android.util.RecurrenceRule;
|
|||||||
|
|
||||||
import androidx.annotation.VisibleForTesting;
|
import androidx.annotation.VisibleForTesting;
|
||||||
import androidx.preference.Preference;
|
import androidx.preference.Preference;
|
||||||
|
import androidx.preference.PreferenceFragmentCompat;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.android.internal.util.CollectionUtils;
|
import com.android.internal.util.CollectionUtils;
|
||||||
@@ -47,9 +48,9 @@ import com.android.settingslib.net.DataUsageController;
|
|||||||
import java.util.List;
|
import java.util.List;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* This is the controller for the top of the data usage screen that retrieves carrier data from the
|
* This is the controller for a data usage header that retrieves carrier data from the new
|
||||||
* new subscriptions framework API if available. The controller reads subscription information from
|
* subscriptions framework API if available. The controller reads subscription information from the
|
||||||
* the framework and falls back to legacy usage data if none are available.
|
* framework and falls back to legacy usage data if none are available.
|
||||||
*/
|
*/
|
||||||
public class DataUsageSummaryPreferenceController extends BasePreferenceController
|
public class DataUsageSummaryPreferenceController extends BasePreferenceController
|
||||||
implements PreferenceControllerMixin, LifecycleObserver, OnStart {
|
implements PreferenceControllerMixin, LifecycleObserver, OnStart {
|
||||||
@@ -63,7 +64,7 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
|
|||||||
private final Activity mActivity;
|
private final Activity mActivity;
|
||||||
private final EntityHeaderController mEntityHeaderController;
|
private final EntityHeaderController mEntityHeaderController;
|
||||||
private final Lifecycle mLifecycle;
|
private final Lifecycle mLifecycle;
|
||||||
private final DataUsageSummary mDataUsageSummary;
|
private final PreferenceFragmentCompat mFragment;
|
||||||
private final DataUsageController mDataUsageController;
|
private final DataUsageController mDataUsageController;
|
||||||
private final DataUsageInfoController mDataInfoController;
|
private final DataUsageInfoController mDataInfoController;
|
||||||
private final NetworkTemplate mDefaultTemplate;
|
private final NetworkTemplate mDefaultTemplate;
|
||||||
@@ -94,28 +95,31 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
|
|||||||
private long mCycleStart;
|
private long mCycleStart;
|
||||||
/** The ending time of the billing cycle in ms since the epoch */
|
/** The ending time of the billing cycle in ms since the epoch */
|
||||||
private long mCycleEnd;
|
private long mCycleEnd;
|
||||||
|
/** The subscription that we should show usage for. */
|
||||||
|
private int mSubscriptionId;
|
||||||
|
|
||||||
private Intent mManageSubscriptionIntent;
|
private Intent mManageSubscriptionIntent;
|
||||||
|
|
||||||
public DataUsageSummaryPreferenceController(Activity activity,
|
public DataUsageSummaryPreferenceController(Activity activity,
|
||||||
Lifecycle lifecycle, DataUsageSummary dataUsageSummary) {
|
Lifecycle lifecycle, PreferenceFragmentCompat fragment, int subscriptionId) {
|
||||||
super(activity, KEY);
|
super(activity, KEY);
|
||||||
|
|
||||||
mActivity = activity;
|
mActivity = activity;
|
||||||
mEntityHeaderController = EntityHeaderController.newInstance(activity,
|
mEntityHeaderController = EntityHeaderController.newInstance(activity,
|
||||||
dataUsageSummary, null);
|
fragment, null);
|
||||||
mLifecycle = lifecycle;
|
mLifecycle = lifecycle;
|
||||||
mDataUsageSummary = dataUsageSummary;
|
mFragment = fragment;
|
||||||
|
mSubscriptionId = subscriptionId;
|
||||||
|
|
||||||
final int defaultSubId = DataUsageUtils.getDefaultSubscriptionId(activity);
|
mDefaultTemplate = DataUsageUtils.getDefaultTemplate(activity, mSubscriptionId);
|
||||||
mDefaultTemplate = DataUsageUtils.getDefaultTemplate(activity, defaultSubId);
|
NetworkPolicyManager policyManager = activity.getSystemService(NetworkPolicyManager.class);
|
||||||
NetworkPolicyManager policyManager = NetworkPolicyManager.from(activity);
|
|
||||||
mPolicyEditor = new NetworkPolicyEditor(policyManager);
|
mPolicyEditor = new NetworkPolicyEditor(policyManager);
|
||||||
|
|
||||||
mHasMobileData = DataUsageUtils.hasMobileData(activity)
|
mHasMobileData = DataUsageUtils.hasMobileData(activity)
|
||||||
&& defaultSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
|
&& mSubscriptionId != SubscriptionManager.INVALID_SUBSCRIPTION_ID;
|
||||||
|
|
||||||
mDataUsageController = new DataUsageController(activity);
|
mDataUsageController = new DataUsageController(activity);
|
||||||
|
mDataUsageController.setSubscriptionId(mSubscriptionId);
|
||||||
mDataInfoController = new DataUsageInfoController();
|
mDataInfoController = new DataUsageInfoController();
|
||||||
|
|
||||||
if (mHasMobileData) {
|
if (mHasMobileData) {
|
||||||
@@ -142,7 +146,8 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
|
|||||||
Activity activity,
|
Activity activity,
|
||||||
Lifecycle lifecycle,
|
Lifecycle lifecycle,
|
||||||
EntityHeaderController entityHeaderController,
|
EntityHeaderController entityHeaderController,
|
||||||
DataUsageSummary dataUsageSummary) {
|
PreferenceFragmentCompat fragment,
|
||||||
|
int subscriptionId) {
|
||||||
super(activity, KEY);
|
super(activity, KEY);
|
||||||
mDataUsageController = dataUsageController;
|
mDataUsageController = dataUsageController;
|
||||||
mDataInfoController = dataInfoController;
|
mDataInfoController = dataInfoController;
|
||||||
@@ -154,12 +159,13 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
|
|||||||
mActivity = activity;
|
mActivity = activity;
|
||||||
mLifecycle = lifecycle;
|
mLifecycle = lifecycle;
|
||||||
mEntityHeaderController = entityHeaderController;
|
mEntityHeaderController = entityHeaderController;
|
||||||
mDataUsageSummary = dataUsageSummary;
|
mFragment = fragment;
|
||||||
|
mSubscriptionId = subscriptionId;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onStart() {
|
public void onStart() {
|
||||||
RecyclerView view = mDataUsageSummary.getListView();
|
RecyclerView view = mFragment.getListView();
|
||||||
mEntityHeaderController.setRecyclerView(view, mLifecycle);
|
mEntityHeaderController.setRecyclerView(view, mLifecycle);
|
||||||
mEntityHeaderController.styleActionBar(mActivity);
|
mEntityHeaderController.styleActionBar(mActivity);
|
||||||
}
|
}
|
||||||
@@ -260,12 +266,18 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
|
|||||||
mCycleEnd = info.cycleEnd;
|
mCycleEnd = info.cycleEnd;
|
||||||
mSnapshotTime = -1L;
|
mSnapshotTime = -1L;
|
||||||
|
|
||||||
final int defaultSubId = SubscriptionManager.getDefaultSubscriptionId();
|
SubscriptionInfo subInfo = mSubscriptionManager.getActiveSubscriptionInfo(mSubscriptionId);
|
||||||
final SubscriptionInfo subInfo = mSubscriptionManager.getDefaultDataSubscriptionInfo();
|
if (subInfo == null) {
|
||||||
|
subInfo = mSubscriptionManager.getAllSubscriptionInfoList().stream().filter(
|
||||||
|
i -> i.getSubscriptionId() == mSubscriptionId).findFirst().orElse(null);
|
||||||
|
}
|
||||||
if (subInfo != null && mHasMobileData) {
|
if (subInfo != null && mHasMobileData) {
|
||||||
mCarrierName = subInfo.getCarrierName();
|
mCarrierName = subInfo.getCarrierName();
|
||||||
List<SubscriptionPlan> plans = mSubscriptionManager.getSubscriptionPlans(defaultSubId);
|
List<SubscriptionPlan> plans = mSubscriptionManager.getSubscriptionPlans(
|
||||||
final SubscriptionPlan primaryPlan = getPrimaryPlan(mSubscriptionManager, defaultSubId);
|
mSubscriptionId);
|
||||||
|
final SubscriptionPlan primaryPlan = getPrimaryPlan(mSubscriptionManager,
|
||||||
|
mSubscriptionId);
|
||||||
|
|
||||||
if (primaryPlan != null) {
|
if (primaryPlan != null) {
|
||||||
mDataplanCount = plans.size();
|
mDataplanCount = plans.size();
|
||||||
mDataplanSize = primaryPlan.getDataLimitBytes();
|
mDataplanSize = primaryPlan.getDataLimitBytes();
|
||||||
@@ -284,8 +296,8 @@ public class DataUsageSummaryPreferenceController extends BasePreferenceControll
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
mManageSubscriptionIntent =
|
mManageSubscriptionIntent =
|
||||||
mSubscriptionManager.createManageSubscriptionIntent(defaultSubId);
|
mSubscriptionManager.createManageSubscriptionIntent(mSubscriptionId);
|
||||||
Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + defaultSubId
|
Log.i(TAG, "Have " + mDataplanCount + " plans, dflt sub-id " + mSubscriptionId
|
||||||
+ ", intent " + mManageSubscriptionIntent);
|
+ ", intent " + mManageSubscriptionIntent);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -34,7 +34,10 @@ import androidx.preference.Preference;
|
|||||||
|
|
||||||
import com.android.internal.telephony.TelephonyIntents;
|
import com.android.internal.telephony.TelephonyIntents;
|
||||||
import com.android.settings.R;
|
import com.android.settings.R;
|
||||||
|
import com.android.settings.core.FeatureFlags;
|
||||||
import com.android.settings.dashboard.RestrictedDashboardFragment;
|
import com.android.settings.dashboard.RestrictedDashboardFragment;
|
||||||
|
import com.android.settings.datausage.DataUsageSummaryPreferenceController;
|
||||||
|
import com.android.settings.development.featureflags.FeatureFlagPersistent;
|
||||||
import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController;
|
import com.android.settings.network.telephony.cdma.CdmaSubscriptionPreferenceController;
|
||||||
import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;
|
import com.android.settings.network.telephony.cdma.CdmaSystemSelectPreferenceController;
|
||||||
import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
|
import com.android.settings.network.telephony.gsm.AutoSelectPreferenceController;
|
||||||
@@ -42,6 +45,7 @@ import com.android.settings.network.telephony.gsm.OpenNetworkSelectPagePreferenc
|
|||||||
import com.android.settings.search.BaseSearchIndexProvider;
|
import com.android.settings.search.BaseSearchIndexProvider;
|
||||||
import com.android.settings.search.Indexable;
|
import com.android.settings.search.Indexable;
|
||||||
import com.android.settings.widget.PreferenceCategoryController;
|
import com.android.settings.widget.PreferenceCategoryController;
|
||||||
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
import com.android.settingslib.search.SearchIndexable;
|
import com.android.settingslib.search.SearchIndexable;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
@@ -105,12 +109,23 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
|
|||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public void onAttach(Context context) {
|
protected List<AbstractPreferenceController> createPreferenceControllers(Context context) {
|
||||||
super.onAttach(context);
|
|
||||||
|
|
||||||
mSubId = getArguments().getInt(Settings.EXTRA_SUB_ID,
|
mSubId = getArguments().getInt(Settings.EXTRA_SUB_ID,
|
||||||
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
|
SubscriptionManager.INVALID_SUBSCRIPTION_ID);
|
||||||
|
|
||||||
|
if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2) &&
|
||||||
|
mSubId != SubscriptionManager.INVALID_SUBSCRIPTION_ID) {
|
||||||
|
return Arrays.asList(
|
||||||
|
new DataUsageSummaryPreferenceController(getActivity(), getSettingsLifecycle(),
|
||||||
|
this, mSubId));
|
||||||
|
}
|
||||||
|
return Arrays.asList();
|
||||||
|
}
|
||||||
|
|
||||||
|
@Override
|
||||||
|
public void onAttach(Context context) {
|
||||||
|
super.onAttach(context);
|
||||||
|
|
||||||
use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
|
use(MobileDataPreferenceController.class).init(getFragmentManager(), mSubId);
|
||||||
use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
|
use(RoamingPreferenceController.class).init(getFragmentManager(), mSubId);
|
||||||
use(ApnPreferenceController.class).init(mSubId);
|
use(ApnPreferenceController.class).init(mSubId);
|
||||||
@@ -163,7 +178,11 @@ public class MobileNetworkSettings extends RestrictedDashboardFragment {
|
|||||||
|
|
||||||
@Override
|
@Override
|
||||||
protected int getPreferenceScreenResId() {
|
protected int getPreferenceScreenResId() {
|
||||||
return R.xml.mobile_network_settings;
|
if (FeatureFlagPersistent.isEnabled(getContext(), FeatureFlags.NETWORK_INTERNET_V2)) {
|
||||||
|
return R.xml.mobile_network_settings_v2;
|
||||||
|
} else {
|
||||||
|
return R.xml.mobile_network_settings;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
@@ -34,11 +34,11 @@ import android.content.Context;
|
|||||||
import android.content.Intent;
|
import android.content.Intent;
|
||||||
import android.net.ConnectivityManager;
|
import android.net.ConnectivityManager;
|
||||||
import android.net.NetworkTemplate;
|
import android.net.NetworkTemplate;
|
||||||
import android.telephony.SubscriptionInfo;
|
|
||||||
import android.telephony.SubscriptionManager;
|
import android.telephony.SubscriptionManager;
|
||||||
import android.telephony.TelephonyManager;
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
import androidx.fragment.app.FragmentActivity;
|
import androidx.fragment.app.FragmentActivity;
|
||||||
|
import androidx.preference.PreferenceFragmentCompat;
|
||||||
import androidx.recyclerview.widget.RecyclerView;
|
import androidx.recyclerview.widget.RecyclerView;
|
||||||
|
|
||||||
import com.android.internal.logging.nano.MetricsProto;
|
import com.android.internal.logging.nano.MetricsProto;
|
||||||
@@ -92,7 +92,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
@Mock(answer = Answers.RETURNS_DEEP_STUBS)
|
||||||
private EntityHeaderController mHeaderController;
|
private EntityHeaderController mHeaderController;
|
||||||
@Mock
|
@Mock
|
||||||
private DataUsageSummary mDataUsageSummary;
|
private PreferenceFragmentCompat mPreferenceFragment;
|
||||||
@Mock
|
@Mock
|
||||||
private TelephonyManager mTelephonyManager;
|
private TelephonyManager mTelephonyManager;
|
||||||
@Mock
|
@Mock
|
||||||
@@ -104,6 +104,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
private FragmentActivity mActivity;
|
private FragmentActivity mActivity;
|
||||||
private Context mContext;
|
private Context mContext;
|
||||||
private DataUsageSummaryPreferenceController mController;
|
private DataUsageSummaryPreferenceController mController;
|
||||||
|
private int mDefaultSubscriptionId;
|
||||||
|
|
||||||
@Before
|
@Before
|
||||||
public void setUp() {
|
public void setUp() {
|
||||||
@@ -125,6 +126,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
.thenReturn(mConnectivityManager);
|
.thenReturn(mConnectivityManager);
|
||||||
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_READY);
|
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_READY);
|
||||||
when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
|
when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
|
||||||
|
mDefaultSubscriptionId = 1234;
|
||||||
mController = new DataUsageSummaryPreferenceController(
|
mController = new DataUsageSummaryPreferenceController(
|
||||||
mDataUsageController,
|
mDataUsageController,
|
||||||
mDataInfoController,
|
mDataInfoController,
|
||||||
@@ -133,7 +135,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
R.string.cell_data_template,
|
R.string.cell_data_template,
|
||||||
true,
|
true,
|
||||||
null,
|
null,
|
||||||
mActivity, null, null, null);
|
mActivity, null, null, null, mDefaultSubscriptionId);
|
||||||
}
|
}
|
||||||
|
|
||||||
@After
|
@After
|
||||||
@@ -355,11 +357,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
R.string.cell_data_template,
|
R.string.cell_data_template,
|
||||||
true,
|
true,
|
||||||
mSubscriptionManager,
|
mSubscriptionManager,
|
||||||
mActivity, null, null, null);
|
mActivity, null, null, null, mDefaultSubscriptionId);
|
||||||
|
|
||||||
final SubscriptionInfo subInfo = new SubscriptionInfo(0, "123456", 0, "name", "carrier",
|
|
||||||
0, 0, "number", 0, null, "123", "456", "ZX", false, null, null);
|
|
||||||
when(mSubscriptionManager.getDefaultDataSubscriptionInfo()).thenReturn(subInfo);
|
|
||||||
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
assertThat(mController.getAvailabilityStatus()).isEqualTo(AVAILABLE);
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -373,7 +371,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
R.string.cell_data_template,
|
R.string.cell_data_template,
|
||||||
true,
|
true,
|
||||||
mSubscriptionManager,
|
mSubscriptionManager,
|
||||||
mActivity, null, null, null);
|
mActivity, null, null, null, mDefaultSubscriptionId);
|
||||||
|
|
||||||
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
|
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
|
||||||
when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
|
when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(false);
|
||||||
@@ -390,7 +388,7 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
R.string.cell_data_template,
|
R.string.cell_data_template,
|
||||||
true,
|
true,
|
||||||
mSubscriptionManager,
|
mSubscriptionManager,
|
||||||
mActivity, null, null, null);
|
mActivity, null, null, null, mDefaultSubscriptionId);
|
||||||
|
|
||||||
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
|
when(mTelephonyManager.getSimState()).thenReturn(TelephonyManager.SIM_STATE_ABSENT);
|
||||||
when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(true);
|
when(mConnectivityManager.isNetworkSupported(TYPE_WIFI)).thenReturn(true);
|
||||||
@@ -409,9 +407,10 @@ public class DataUsageSummaryPreferenceControllerTest {
|
|||||||
R.string.cell_data_template,
|
R.string.cell_data_template,
|
||||||
true,
|
true,
|
||||||
mSubscriptionManager,
|
mSubscriptionManager,
|
||||||
mActivity, mLifecycle, mHeaderController, mDataUsageSummary);
|
mActivity, mLifecycle, mHeaderController, mPreferenceFragment,
|
||||||
|
mDefaultSubscriptionId);
|
||||||
|
|
||||||
when(mDataUsageSummary.getListView()).thenReturn(recyclerView);
|
when(mPreferenceFragment.getListView()).thenReturn(recyclerView);
|
||||||
|
|
||||||
mController.onStart();
|
mController.onStart();
|
||||||
|
|
||||||
|
@@ -0,0 +1,113 @@
|
|||||||
|
/*
|
||||||
|
* Copyright (C) 2019 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.
|
||||||
|
* You may obtain a copy of the License at
|
||||||
|
*
|
||||||
|
* http://www.apache.org/licenses/LICENSE-2.0
|
||||||
|
*
|
||||||
|
* Unless required by applicable law or agreed to in writing, software
|
||||||
|
* distributed under the License is distributed on an "AS IS" BASIS,
|
||||||
|
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||||
|
* See the License for the specific language governing permissions and
|
||||||
|
* limitations under the License.
|
||||||
|
*/
|
||||||
|
|
||||||
|
package com.android.settings.network.telephony;
|
||||||
|
|
||||||
|
import static com.google.common.truth.Truth.assertThat;
|
||||||
|
|
||||||
|
import static org.mockito.ArgumentMatchers.anyInt;
|
||||||
|
import static org.mockito.Mockito.mock;
|
||||||
|
import static org.mockito.Mockito.spy;
|
||||||
|
import static org.mockito.Mockito.when;
|
||||||
|
|
||||||
|
import android.app.usage.NetworkStatsManager;
|
||||||
|
import android.content.Context;
|
||||||
|
import android.net.NetworkPolicyManager;
|
||||||
|
import android.os.Bundle;
|
||||||
|
import android.provider.Settings;
|
||||||
|
import android.telephony.TelephonyManager;
|
||||||
|
|
||||||
|
import com.android.settings.core.FeatureFlags;
|
||||||
|
import com.android.settings.datausage.DataUsageSummaryPreferenceController;
|
||||||
|
import com.android.settings.development.featureflags.FeatureFlagPersistent;
|
||||||
|
import com.android.settings.testutils.shadow.ShadowEntityHeaderController;
|
||||||
|
import com.android.settings.widget.EntityHeaderController;
|
||||||
|
import com.android.settingslib.core.AbstractPreferenceController;
|
||||||
|
|
||||||
|
import org.junit.Before;
|
||||||
|
import org.junit.Test;
|
||||||
|
import org.junit.runner.RunWith;
|
||||||
|
import org.mockito.Mock;
|
||||||
|
import org.mockito.MockitoAnnotations;
|
||||||
|
import org.robolectric.RobolectricTestRunner;
|
||||||
|
import org.robolectric.RuntimeEnvironment;
|
||||||
|
import org.robolectric.annotation.Config;
|
||||||
|
|
||||||
|
import java.util.List;
|
||||||
|
|
||||||
|
import androidx.fragment.app.FragmentActivity;
|
||||||
|
|
||||||
|
@RunWith(RobolectricTestRunner.class)
|
||||||
|
@Config(shadows = ShadowEntityHeaderController.class)
|
||||||
|
public class MobileNetworkSettingsTest {
|
||||||
|
@Mock
|
||||||
|
private TelephonyManager mTelephonyManager;
|
||||||
|
@Mock
|
||||||
|
private NetworkStatsManager mNetworkStatsManager;
|
||||||
|
@Mock
|
||||||
|
private NetworkPolicyManager mNetworkPolicyManager;
|
||||||
|
@Mock
|
||||||
|
private FragmentActivity mActivity;
|
||||||
|
|
||||||
|
private Context mContext;
|
||||||
|
private MobileNetworkSettings mFragment;
|
||||||
|
|
||||||
|
@Before
|
||||||
|
public void setUp() {
|
||||||
|
MockitoAnnotations.initMocks(this);
|
||||||
|
mContext = spy(RuntimeEnvironment.application);
|
||||||
|
when(mContext.getSystemService(Context.TELEPHONY_SERVICE)).thenReturn(mTelephonyManager);
|
||||||
|
when(mTelephonyManager.createForSubscriptionId(anyInt())).thenReturn(mTelephonyManager);
|
||||||
|
when(mContext.getSystemService(NetworkStatsManager.class)).thenReturn(mNetworkStatsManager);
|
||||||
|
ShadowEntityHeaderController.setUseMock(mock(EntityHeaderController.class));
|
||||||
|
|
||||||
|
mFragment = spy(new MobileNetworkSettings());
|
||||||
|
final Bundle args = new Bundle();
|
||||||
|
final int subscriptionId = 1234;
|
||||||
|
args.putInt(Settings.EXTRA_SUB_ID, subscriptionId);
|
||||||
|
mFragment.setArguments(args);
|
||||||
|
when(mFragment.getActivity()).thenReturn(mActivity);
|
||||||
|
when(mActivity.getSystemService(NetworkPolicyManager.class)).thenReturn(
|
||||||
|
mNetworkPolicyManager);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void onAttach_noCrash() {
|
||||||
|
mFragment.onAttach(mContext);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void createPreferenceControllers_noV2Flag_noDataUsageSummaryController() {
|
||||||
|
final List<AbstractPreferenceController> controllers =
|
||||||
|
mFragment.createPreferenceControllers(mContext);
|
||||||
|
assertThat(controllers.stream().filter(
|
||||||
|
c -> c.getClass().equals(DataUsageSummaryPreferenceController.class))
|
||||||
|
.count())
|
||||||
|
.isEqualTo(0);
|
||||||
|
}
|
||||||
|
|
||||||
|
@Test
|
||||||
|
public void createPreferenceControllers_v2Flag_createsDataUsageSummaryController() {
|
||||||
|
FeatureFlagPersistent.setEnabled(mContext, FeatureFlags.NETWORK_INTERNET_V2, true);
|
||||||
|
|
||||||
|
final List<AbstractPreferenceController> controllers =
|
||||||
|
mFragment.createPreferenceControllers(mContext);
|
||||||
|
assertThat(controllers.stream().filter(
|
||||||
|
c -> c.getClass().equals(DataUsageSummaryPreferenceController.class))
|
||||||
|
.count())
|
||||||
|
.isEqualTo(1);
|
||||||
|
}
|
||||||
|
}
|
Reference in New Issue
Block a user