PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix data usage under Wi-Fi has title "Mobile data usage"

Browse Source 
Fix "Wi-Fi data usage" in Wi-Fi section. (Settings -> Network & internet -> Data usage)

Change-Id: I6c4117db321af252a2c3061f554ffbe2f87a714e
Fixes: 76165354
Test: Manual test
This commit is contained in:
Shawn Ding
2018-03-26 16:59:43 +08:00
parent d6e81ab51b
commit a4d78e43c2
1 changed files with 22 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/com/android/settings/datausage/DataUsagePreference.java
View File

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