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

Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev

Browse Source 
am: bbb3d3e72c

Change-Id: I515e7d7db8d4d365992b41df2306fa235169dea9
This commit is contained in:
Shawn Ding
2018-03-28 16:47:24 +00:00
committed by android-build-merger
parent dbe1ff67e7 bbb3d3e72c
commit 3711215808
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 controller = new DataUsageController(getContext());
DataUsageController.DataUsageInfo usageInfo = controller.getDataUsageInfo(mTemplate); DataUsageController.DataUsageInfo usageInfo = controller.getDataUsageInfo(mTemplate);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) { 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 { } else {
setTitle(getContext().getString(R.string.cellular_data_usage)); setTitle(mTitleRes);
setSummary(getContext().getString(R.string.data_usage_template, setSummary(getContext().getString(R.string.data_usage_template,
Formatter.formatFileSize(getContext(), usageInfo.usageLevel), usageInfo.period)); Formatter.formatFileSize(getContext(), usageInfo.usageLevel),
usageInfo.period));
} }
setIntent(getIntent()); setIntent(getIntent());
} }
@@ -75,13 +83,17 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
.setDestination(DataUsageList.class.getName()) .setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN); .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) { 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 { } else {
if (mTitleRes > 0) { if (mTitleRes > 0) {
launcher.setTitle(mTitleRes); launcher.setTitle(mTitleRes);
} else { } else {
launcher.setTitle(getTitle()); launcher.setTitle(getTitle());
} }
} }
return launcher.toIntent(); return launcher.toIntent();
} }