From a4d78e43c2cb74d0e074ccb81bdb25ca71bbc14c Mon Sep 17 00:00:00 2001 From: Shawn Ding Date: Mon, 26 Mar 2018 16:59:43 +0800 Subject: [PATCH] Fix data usage under Wi-Fi has title "Mobile data usage" Fix "Wi-Fi data usage" in Wi-Fi section. (Settings -> Network & internet -> Data usage) Change-Id: I6c4117db321af252a2c3061f554ffbe2f87a714e Fixes: 76165354 Test: Manual test --- .../datausage/DataUsagePreference.java | 32 +++++++++++++------ 1 file changed, 22 insertions(+), 10 deletions(-) diff --git a/src/com/android/settings/datausage/DataUsagePreference.java b/src/com/android/settings/datausage/DataUsagePreference.java index da2d52a8fd8..e6685077684 100644 --- a/src/com/android/settings/datausage/DataUsagePreference.java +++ b/src/com/android/settings/datausage/DataUsagePreference.java @@ -56,11 +56,19 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc DataUsageController controller = new DataUsageController(getContext()); DataUsageController.DataUsageInfo usageInfo = controller.getDataUsageInfo(mTemplate); if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) { - setTitle(getContext().getString(R.string.app_cellular_data_usage)); + if (mTemplate.isMatchRuleMobile()) { + setTitle(getContext().getString(R.string.app_cellular_data_usage)); + } else { + setTitle(mTitleRes); + setSummary(getContext().getString(R.string.data_usage_template, + Formatter.formatFileSize(getContext(), usageInfo.usageLevel), + usageInfo.period)); + } } else { - setTitle(getContext().getString(R.string.cellular_data_usage)); - setSummary(getContext().getString(R.string.data_usage_template, - Formatter.formatFileSize(getContext(), usageInfo.usageLevel), usageInfo.period)); + setTitle(mTitleRes); + setSummary(getContext().getString(R.string.data_usage_template, + Formatter.formatFileSize(getContext(), usageInfo.usageLevel), + usageInfo.period)); } setIntent(getIntent()); } @@ -75,13 +83,17 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc .setDestination(DataUsageList.class.getName()) .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN); if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) { - launcher.setTitle(getContext().getString(R.string.app_cellular_data_usage)); + if (mTemplate.isMatchRuleMobile()) { + launcher.setTitle(getContext().getString(R.string.app_cellular_data_usage)); + } else { + launcher.setTitle(mTitleRes); + } } else { - if (mTitleRes > 0) { - launcher.setTitle(mTitleRes); - } else { - launcher.setTitle(getTitle()); - } + if (mTitleRes > 0) { + launcher.setTitle(mTitleRes); + } else { + launcher.setTitle(getTitle()); + } } return launcher.toIntent(); }