Merge "[Provider Model] Non-carrier data usage settings UI change"

res/values/strings.xml

@@ -10472,6 +10472,9 @@
     <!-- Label for wifi data usage in data usage screen [CHAR LIMIT=60] -->
     <string name="wifi_data_usage">Wi\u2011Fi data usage</string>
 
+    <!-- Label for non-carrier data usage in data usage screen [CHAR LIMIT=60] -->
+    <string name="non_carrier_data_usage">Non-carrier data usage</string>
+
     <!-- Label for ethernet data usage in data usage screen [CHAR LIMIT=60] -->
     <string name="ethernet_data_usage">Ethernet data usage</string>
 
@@ -10520,6 +10523,9 @@
     <!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
     <string name="operator_warning">Carrier data accounting may differ from device accounting</string>
 
+    <!-- A summary shown on data usage screens to indicate data tracking excluded from carrier networks [CHAR LIMIT=NONE] -->
+    <string name="non_carrier_data_usage_warning">Excludes data that is used by carrier networks</string>
+
     <!-- Format string describing how much data has been used [CHAR LIMIT=20] -->
     <string name="data_used_template"><xliff:g name="amount" example="1 GB">%1$s</xliff:g> used</string>
 

res/xml/data_usage_list.xml

@@ -23,9 +23,15 @@
             android:key="chart_data" />
 
         <Preference
+            android:key="operator_warning"
             android:summary="@string/operator_warning"
             android:selectable="false" />
 
+        <Preference
+            android:key="non_carrier_data_usage_warning"
+            android:summary="@string/non_carrier_data_usage_warning"
+            android:selectable="false" />
+
     </PreferenceCategory>
 
     <PreferenceCategory

res/xml/network_provider_settings.xml

@@ -43,6 +43,6 @@
         android:fragment="com.android.settings.wifi.savedaccesspoints2.SavedAccessPointsWifiSettings2"/>
 
     <com.android.settings.datausage.DataUsagePreference
-        android:key="wifi_data_usage"
+        android:key="non_carrier_data_usage"
-        android:title="@string/wifi_data_usage"/>
+        android:title="@string/non_carrier_data_usage"/>
 </PreferenceScreen>

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);
     }

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;