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

- Change the title from “Wi-Fi data usage” to “Non-carrier data usage”
- Change the warning message from “Carrier data accounting may differ
from device accounting” to “Excludes data that is used by carrier
networks”
- Screenshot:
  https://screenshot.googleplex.com/3bicWHu7g5StH8R
  https://screenshot.googleplex.com/AqceQBtY4AqnuGH

Bug: 172788855
Test: manual test
Change-Id: Ic4d6e5dbb0b7d1d851f6cf033d400a7f780261ac
This commit is contained in:
Weng Su
2020-11-10 18:45:25 +00:00
parent 76eb401911
commit 890d3e039b
5 changed files with 27 additions and 3 deletions

View File

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