diff --git a/res/values/strings.xml b/res/values/strings.xml index abbb5143427..b9989843450 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10472,6 +10472,9 @@ Wi\u2011Fi data usage + + Non-carrier data usage + Ethernet data usage @@ -10520,6 +10523,9 @@ Carrier data accounting may differ from device accounting + + Excludes data that is used by carrier networks + %1$s used diff --git a/res/xml/data_usage_list.xml b/res/xml/data_usage_list.xml index 41fbff89439..9ea6a914a77 100644 --- a/res/xml/data_usage_list.xml +++ b/res/xml/data_usage_list.xml @@ -23,9 +23,15 @@ android:key="chart_data" /> + + + android:key="non_carrier_data_usage" + android:title="@string/non_carrier_data_usage"/> diff --git a/src/com/android/settings/datausage/DataUsageList.java b/src/com/android/settings/datausage/DataUsageList.java index 7f1a0d8252d..f72a0067c31 100644 --- a/src/com/android/settings/datausage/DataUsageList.java +++ b/src/com/android/settings/datausage/DataUsageList.java @@ -39,6 +39,7 @@ import android.os.UserManager; import android.provider.Settings; import android.telephony.SubscriptionInfo; import android.telephony.SubscriptionManager; +import android.util.FeatureFlagUtils; import android.util.Log; import android.util.SparseArray; import android.view.View; @@ -140,6 +141,17 @@ public class DataUsageList extends DataUsageBaseFragment mUsageAmount = findPreference(KEY_USAGE_AMOUNT); mChart = findPreference(KEY_CHART_DATA); mApps = findPreference(KEY_APPS_GROUP); + + // TODO(b/167474581): This is a temporary solution to hide unnecessary warning + // preference, when the provider model is completed, the following code should be removed. + final Preference unnecessaryWarningPreference = + FeatureFlagUtils.isEnabled(getContext(), FeatureFlagUtils.SETTINGS_PROVIDER_MODEL) + ? findPreference("operator_warning") + : findPreference("non_carrier_data_usage_warning"); + if (unnecessaryWarningPreference != null) { + unnecessaryWarningPreference.setVisible(false); + } + processArgument(); mDataStateListener = new MobileDataEnabledListener(activity, this); } diff --git a/src/com/android/settings/network/NetworkProviderSettings.java b/src/com/android/settings/network/NetworkProviderSettings.java index 85c7c93522e..5a42a5ae829 100644 --- a/src/com/android/settings/network/NetworkProviderSettings.java +++ b/src/com/android/settings/network/NetworkProviderSettings.java @@ -131,7 +131,7 @@ public class NetworkProviderSettings extends RestrictedSettingsFragment private static final String PREF_KEY_SAVED_NETWORKS = "saved_networks"; private static final String PREF_KEY_STATUS_MESSAGE = "wifi_status_message"; @VisibleForTesting - static final String PREF_KEY_DATA_USAGE = "wifi_data_usage"; + static final String PREF_KEY_DATA_USAGE = "non_carrier_data_usage"; private static final int REQUEST_CODE_WIFI_DPP_ENROLLEE_QR_CODE_SCANNER = 0;