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

Rename SubSettingLauncher.setTitle, add java doc

Browse Source 
For make this method usage more clear,
setTitle(charSequence) rename as setTitleText,
add java doc: it is only for user generated string
setTitle(int) rename as setTitleRes.

Change-Id: I972cb6a8ff90873dfdc25c23f6dc3d68103c8e4e
Fixes: 78347436
Test: make RunSettingsRoboTests
This commit is contained in:
hjchangliao
2018-05-02 13:01:07 +08:00
parent ea2bace446
commit e86eec0c07
55 changed files with 101 additions and 85 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/com/android/settings/datausage/BillingCyclePreference.java
View File

@@ -88,7 +88,7 @@ public class BillingCyclePreference extends Preference implements TemplatePrefer
return new SubSettingLauncher(getContext())
.setDestination(BillingCycleSettings.class.getName())
.setArguments(args)
.setTitle(R.string.billing_cycle)
.setTitleRes(R.string.billing_cycle)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN)
.toIntent();
}

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

@@ -155,7 +155,7 @@ public class DataUsageList extends DataUsageBase {
args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
new SubSettingLauncher(getContext())
.setDestination(BillingCycleSettings.class.getName())
.setTitle(R.string.billing_cycle)
.setTitleRes(R.string.billing_cycle)
.setSourceMetricsCategory(getMetricsCategory())
.setArguments(args)
.launch();
@@ -432,7 +432,7 @@ public class DataUsageList extends DataUsageBase {
new SubSettingLauncher(getContext())
.setDestination(AppDataUsage.class.getName())
.setTitle(R.string.app_data_usage)
.setTitleRes(R.string.app_data_usage)
.setArguments(args)
.setSourceMetricsCategory(getMetricsCategory())
.launch();

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

@@ -83,15 +83,15 @@ public class DataUsagePreference extends Preference implements TemplatePreferenc
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
if (FeatureFlagUtils.isEnabled(getContext(), FeatureFlags.DATA_USAGE_SETTINGS_V2)) {
if (mTemplate.isMatchRuleMobile()) {
launcher.setTitle(R.string.app_cellular_data_usage);
launcher.setTitleRes(R.string.app_cellular_data_usage);
} else {
launcher.setTitle(mTitleRes);
launcher.setTitleRes(mTitleRes);
}
} else {
if (mTitleRes > 0) {
launcher.setTitle(mTitleRes);
launcher.setTitleRes(mTitleRes);
} else {
launcher.setTitle(getTitle());
launcher.setTitleText(getTitle());
}
}
return launcher.toIntent();

2
src/com/android/settings/datausage/DataUsageSummaryPreference.java
View File

@@ -207,7 +207,7 @@ public class DataUsageSummaryPreference extends Preference {
.setArguments(args)
.setDestination(DataUsageList.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN);
launcher.setTitle(context.getString(R.string.wifi_data_usage));
launcher.setTitleRes(R.string.wifi_data_usage);
launcher.launch();
}