Merge "Fix data usage under Wi-Fi has title "Mobile data usage"" into pi-dev (bbb3d3e7) · Commits · e / os / android_packages_apps_Settings

src/com/android/settings/datausage/DataUsagePreference.java

+22 −10

Original line number	Diff line number	Diff line
		@@ -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)) {
		if (mTemplate.isMatchRuleMobile()) {
		setTitle(getContext().getString(R.string.app_cellular_data_usage));
		} else {
		setTitle(getContext().getString(R.string.cellular_data_usage));
		setTitle(mTitleRes);
		setSummary(getContext().getString(R.string.data_usage_template,
		Formatter.formatFileSize(getContext(), usageInfo.usageLevel), usageInfo.period));
		Formatter.formatFileSize(getContext(), usageInfo.usageLevel),
		usageInfo.period));
		}
		} else {
		setTitle(mTitleRes);
		setSummary(getContext().getString(R.string.data_usage_template,
		Formatter.formatFileSize(getContext(), usageInfo.usageLevel),
		usageInfo.period));
		}
		setIntent(getIntent());
		}
		@@ -75,7 +83,11 @@ 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)) {
		if (mTemplate.isMatchRuleMobile()) {
		launcher.setTitle(getContext().getString(R.string.app_cellular_data_usage));
		} else {
		launcher.setTitle(mTitleRes);
		}
		} else {
		if (mTitleRes > 0) {
		launcher.setTitle(mTitleRes);