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

Merge "Fix App data usage title not being translated." into pi-dev

Browse Source 
am: 3fff843e57

Change-Id: Idf6dc991d79de90d779cc0a084a210f53e7a99b8
This commit is contained in:
Doris Ling
2018-04-19 17:55:51 -07:00
committed by android-build-merger
parent bef9e8516d 3fff843e57
commit 63c051ff41
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -56,7 +56,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
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)) {
if (mTemplate.isMatchRuleMobile()) { if (mTemplate.isMatchRuleMobile()) {
setTitle(getContext().getString(R.string.app_cellular_data_usage)); setTitle(R.string.app_cellular_data_usage);
} else { } else {
setTitle(mTitleRes); setTitle(mTitleRes);
setSummary(getContext().getString(R.string.data_usage_template, setSummary(getContext().getString(R.string.data_usage_template,
@@ -83,7 +83,7 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
.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)) {
if (mTemplate.isMatchRuleMobile()) { if (mTemplate.isMatchRuleMobile()) {
launcher.setTitle(getContext().getString(R.string.app_cellular_data_usage)); launcher.setTitle(R.string.app_cellular_data_usage);
} else { } else {
launcher.setTitle(mTitleRes); launcher.setTitle(mTitleRes);
} }