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

Merge "Rename SubSettingLauncher.setTitle, add java doc"

Browse Source
This commit is contained in:
android-build-team Robot
2018-05-09 18:01:10 +00:00
committed by Android (Google) Code Review
parent 7ce6ba52c5 e86eec0c07
commit c0e0262f9c
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/MasterClear.java
View File

@@ -161,7 +161,7 @@ public class MasterClear extends InstrumentedFragment implements OnGlobalLayoutL
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(MasterClearConfirm.class.getName()) .setDestination(MasterClearConfirm.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.master_clear_confirm_title) .setTitleRes(R.string.master_clear_confirm_title)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
} }

2
src/com/android/settings/ResetNetwork.java
View File

@@ -123,7 +123,7 @@ public class ResetNetwork extends InstrumentedFragment {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(ResetNetworkConfirm.class.getName()) .setDestination(ResetNetworkConfirm.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.reset_network_confirm_title) .setTitleRes(R.string.reset_network_confirm_title)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
} }

2
src/com/android/settings/SettingsActivity.java
View File

@@ -200,7 +200,7 @@ public class SettingsActivity extends SettingsDrawerActivity
.setSourceMetricsCategory(caller instanceof Instrumentable .setSourceMetricsCategory(caller instanceof Instrumentable
? ((Instrumentable) caller).getMetricsCategory() ? ((Instrumentable) caller).getMetricsCategory()
: Instrumentable.METRICS_CATEGORY_UNKNOWN) : Instrumentable.METRICS_CATEGORY_UNKNOWN)
.setTitle(-1) .setTitleRes(-1)
.launch(); .launch();
return true; return true;
} }

2
src/com/android/settings/accounts/AccountPreferenceController.java
View File

@@ -250,7 +250,7 @@ public class AccountPreferenceController extends AbstractPreferenceController
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setSourceMetricsCategory(mParent.getMetricsCategory()) .setSourceMetricsCategory(mParent.getMetricsCategory())
.setDestination(ManagedProfileSettings.class.getName()) .setDestination(ManagedProfileSettings.class.getName())
.setTitle(R.string.managed_profile_settings_title) .setTitleRes(R.string.managed_profile_settings_title)
.setArguments(arguments) .setArguments(arguments)
.launch(); .launch();

2
src/com/android/settings/accounts/AccountSyncPreferenceController.java
View File

@@ -66,7 +66,7 @@ public class AccountSyncPreferenceController extends AbstractPreferenceControlle
.setDestination(AccountSyncSettings.class.getName()) .setDestination(AccountSyncSettings.class.getName())
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory( MetricsProto.MetricsEvent.ACCOUNT) .setSourceMetricsCategory( MetricsProto.MetricsEvent.ACCOUNT)
.setTitle( R.string.account_sync_title) .setTitleRes( R.string.account_sync_title)
.launch(); .launch();
return true; return true;

2
src/com/android/settings/accounts/AccountTypePreference.java
View File

@@ -107,7 +107,7 @@ public class AccountTypePreference extends AppPreference implements OnPreference
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(mFragment) .setDestination(mFragment)
.setArguments(mFragmentArguments) .setArguments(mFragmentArguments)
.setTitle(mTitleResPackageName, mTitleResId) .setTitleRes(mTitleResPackageName, mTitleResId)
.setSourceMetricsCategory(mMetricsCategory) .setSourceMetricsCategory(mMetricsCategory)
.launch(); .launch();
return true; return true;

2
src/com/android/settings/accounts/AccountTypePreferenceLoader.java
View File

@@ -235,7 +235,7 @@ public class AccountTypePreferenceLoader {
? ((Instrumentable) mFragment).getMetricsCategory() ? ((Instrumentable) mFragment).getMetricsCategory()
: Instrumentable.METRICS_CATEGORY_UNKNOWN; : Instrumentable.METRICS_CATEGORY_UNKNOWN;
new SubSettingLauncher(preference.getContext()) new SubSettingLauncher(preference.getContext())
.setTitle(mTitleRes) .setTitleRes(mTitleRes)
.setDestination(mClass) .setDestination(mClass)
.setSourceMetricsCategory(metricsCategory) .setSourceMetricsCategory(metricsCategory)
.launch(); .launch();

2
src/com/android/settings/applications/AppInfoBase.java
View File

@@ -228,7 +228,7 @@ public abstract class AppInfoBase extends SettingsPreferenceFragment
new SubSettingLauncher(source.getContext()) new SubSettingLauncher(source.getContext())
.setDestination(fragment.getName()) .setDestination(fragment.getName())
.setSourceMetricsCategory(sourceMetricsCategory) .setSourceMetricsCategory(sourceMetricsCategory)
.setTitle(titleRes) .setTitleRes(titleRes)
.setArguments(args) .setArguments(args)
.setUserHandle(new UserHandle(UserHandle.getUserId(uid))) .setUserHandle(new UserHandle(UserHandle.getUserId(uid)))
.setResultListener(source, request) .setResultListener(source, request)

2
src/com/android/settings/applications/ConvertToFbe.java
View File

@@ -83,7 +83,7 @@ public class ConvertToFbe extends InstrumentedFragment {
private void convert() { private void convert() {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(ConfirmConvertToFbe.class.getName()) .setDestination(ConfirmConvertToFbe.class.getName())
.setTitle(R.string.convert_to_file_encryption) .setTitleRes(R.string.convert_to_file_encryption)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
} }

2
src/com/android/settings/applications/ProcessStatsBase.java
View File

@@ -141,7 +141,7 @@ public abstract class ProcessStatsBase extends SettingsPreferenceFragment
args.putDouble(ProcessStatsDetail.EXTRA_TOTAL_SCALE, memInfo.totalScale); args.putDouble(ProcessStatsDetail.EXTRA_TOTAL_SCALE, memInfo.totalScale);
new SubSettingLauncher(activity) new SubSettingLauncher(activity)
.setDestination(ProcessStatsDetail.class.getName()) .setDestination(ProcessStatsDetail.class.getName())
.setTitle(R.string.memory_usage) .setTitleRes(R.string.memory_usage)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN) .setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN)
.launch(); .launch();

2
src/com/android/settings/applications/ProcessStatsSummary.java
View File

@@ -118,7 +118,7 @@ public class ProcessStatsSummary extends ProcessStatsBase implements OnPreferenc
mStatsManager.xferStats(); mStatsManager.xferStats();
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(ProcessStatsUi.class.getName()) .setDestination(ProcessStatsUi.class.getName())
.setTitle(R.string.memory_usage_apps) .setTitleRes(R.string.memory_usage_apps)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();

2
src/com/android/settings/applications/RunningProcessesView.java
View File

@@ -416,7 +416,7 @@ public class RunningProcessesView extends FrameLayout
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(RunningServiceDetails.class.getName()) .setDestination(RunningServiceDetails.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.runningservicedetails_settings_title) .setTitleRes(R.string.runningservicedetails_settings_title)
.setSourceMetricsCategory(mOwner.getMetricsCategory()) .setSourceMetricsCategory(mOwner.getMetricsCategory())
.launch(); .launch();
} }

2
src/com/android/settings/applications/appinfo/AppInfoDashboardFragment.java
View File

@@ -556,7 +556,7 @@ public class AppInfoDashboardFragment extends DashboardFragment
new SubSettingLauncher(caller.getContext()) new SubSettingLauncher(caller.getContext())
.setDestination(fragment.getName()) .setDestination(fragment.getName())
.setArguments(args) .setArguments(args)
.setTitle(title) .setTitleRes(title)
.setResultListener(caller, SUB_INFO_FRAGMENT) .setResultListener(caller, SUB_INFO_FRAGMENT)
.setSourceMetricsCategory(caller.getMetricsCategory()) .setSourceMetricsCategory(caller.getMetricsCategory())
.launch(); .launch();

2
src/com/android/settings/applications/appinfo/DefaultAppShortcutPreferenceControllerBase.java
View File

@@ -63,7 +63,7 @@ public abstract class DefaultAppShortcutPreferenceControllerBase extends BasePre
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(DefaultAppSettings.class.getName()) .setDestination(DefaultAppSettings.class.getName())
.setArguments(bundle) .setArguments(bundle)
.setTitle(R.string.configure_apps) .setTitleRes(R.string.configure_apps)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN) .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN)
.launch(); .launch();
return true; return true;

4
src/com/android/settings/applications/manageapplications/ManageApplications.java
View File

@@ -670,14 +670,14 @@ public class ManageApplications extends InstrumentedFragment
if (mListType == LIST_TYPE_NOTIFICATION) { if (mListType == LIST_TYPE_NOTIFICATION) {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(ConfigureNotificationSettings.class.getName()) .setDestination(ConfigureNotificationSettings.class.getName())
.setTitle(R.string.configure_notification_settings) .setTitleRes(R.string.configure_notification_settings)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setResultListener(this, ADVANCED_SETTINGS) .setResultListener(this, ADVANCED_SETTINGS)
.launch(); .launch();
} else { } else {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(DefaultAppSettings.class.getName()) .setDestination(DefaultAppSettings.class.getName())
.setTitle(R.string.configure_apps) .setTitleRes(R.string.configure_apps)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setResultListener(this, ADVANCED_SETTINGS) .setResultListener(this, ADVANCED_SETTINGS)
.launch(); .launch();

2
src/com/android/settings/bluetooth/BluetoothDeviceUpdater.java
View File

@@ -241,7 +241,7 @@ public abstract class BluetoothDeviceUpdater implements BluetoothCallback,
new SubSettingLauncher(mFragment.getContext()) new SubSettingLauncher(mFragment.getContext())
.setDestination(BluetoothDeviceDetailsFragment.class.getName()) .setDestination(BluetoothDeviceDetailsFragment.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.device_details_title) .setTitleRes(R.string.device_details_title)
.setSourceMetricsCategory(mFragment.getMetricsCategory()) .setSourceMetricsCategory(mFragment.getMetricsCategory())
.launch(); .launch();
} }

2
src/com/android/settings/bluetooth/BluetoothPairingPreferenceController.java
View File

@@ -57,7 +57,7 @@ public class BluetoothPairingPreferenceController extends AbstractPreferenceCont
if (KEY_PAIRING.equals(preference.getKey())) { if (KEY_PAIRING.equals(preference.getKey())) {
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(BluetoothPairingDetail.class.getName()) .setDestination(BluetoothPairingDetail.class.getName())
.setTitle(R.string.bluetooth_pairing_page_title) .setTitleRes(R.string.bluetooth_pairing_page_title)
.setSourceMetricsCategory(mFragment.getMetricsCategory()) .setSourceMetricsCategory(mFragment.getMetricsCategory())
.launch(); .launch();

2
src/com/android/settings/connecteddevice/usb/ConnectedUsbDeviceUpdater.java
View File

@@ -82,7 +82,7 @@ public class ConnectedUsbDeviceUpdater {
// New version - uses a separate screen. // New version - uses a separate screen.
new SubSettingLauncher(mFragment.getContext()) new SubSettingLauncher(mFragment.getContext())
.setDestination(UsbDetailsFragment.class.getName()) .setDestination(UsbDetailsFragment.class.getName())
.setTitle(R.string.device_details_title) .setTitleRes(R.string.device_details_title)
.setSourceMetricsCategory(mFragment.getMetricsCategory()) .setSourceMetricsCategory(mFragment.getMetricsCategory())
.launch(); .launch();
return true; return true;

27
src/com/android/settings/core/SubSettingLauncher.java
View File

@@ -48,18 +48,37 @@ public class SubSettingLauncher {
return this; return this;
} }
public SubSettingLauncher setTitle(@StringRes int titleResId) { /**
return setTitle(null /*titlePackageName*/, titleResId); * Set title with resource string id.
*
* @param titleResId res id of string
*/
public SubSettingLauncher setTitleRes(@StringRes int titleResId) {
return setTitleRes(null /*titlePackageName*/, titleResId);
} }
public SubSettingLauncher setTitle(String titlePackageName, @StringRes int titleResId) { /**
* Set title with resource string id, and package name to resolve the resource id.
*
* @param titlePackageName package name to resolve resource
* @param titleResId res id of string, will use package name to resolve
*/
public SubSettingLauncher setTitleRes(String titlePackageName, @StringRes int titleResId) {
mLaunchRequest.titleResPackageName = titlePackageName; mLaunchRequest.titleResPackageName = titlePackageName;
mLaunchRequest.titleResId = titleResId; mLaunchRequest.titleResId = titleResId;
mLaunchRequest.title = null; mLaunchRequest.title = null;
return this; return this;
} }
public SubSettingLauncher setTitle(CharSequence title) { /**
* Set title with text,
* This method is only for user generated string,
* display text will not update after locale change,
* if title string is from resource id, please use setTitleRes.
*
* @param title text title
*/
public SubSettingLauncher setTitleText(CharSequence title) {
mLaunchRequest.title = title; mLaunchRequest.title = title;
return this; return this;
} }

2
src/com/android/settings/dashboard/conditional/BatterySaverCondition.java
View File

@@ -70,7 +70,7 @@ public class BatterySaverCondition extends Condition implements
new SubSettingLauncher(mManager.getContext()) new SubSettingLauncher(mManager.getContext())
.setDestination(BatterySaverSettings.class.getName()) .setDestination(BatterySaverSettings.class.getName())
.setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY) .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
.setTitle(R.string.battery_saver) .setTitleRes(R.string.battery_saver)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.launch(); .launch();
} }

2
src/com/android/settings/dashboard/conditional/DndCondition.java
View File

@@ -107,7 +107,7 @@ public class DndCondition extends Condition {
new SubSettingLauncher(mManager.getContext()) new SubSettingLauncher(mManager.getContext())
.setDestination(ZenModeSettings.class.getName()) .setDestination(ZenModeSettings.class.getName())
.setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY) .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
.setTitle(R.string.zen_mode_settings_title) .setTitleRes(R.string.zen_mode_settings_title)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.launch(); .launch();
} }

2
src/com/android/settings/dashboard/conditional/HotspotCondition.java
View File

@@ -103,7 +103,7 @@ public class HotspotCondition extends Condition {
new SubSettingLauncher(mManager.getContext()) new SubSettingLauncher(mManager.getContext())
.setDestination(TetherSettings.class.getName()) .setDestination(TetherSettings.class.getName())
.setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY) .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
.setTitle(R.string.tether_settings_title_all) .setTitleRes(R.string.tether_settings_title_all)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.launch(); .launch();
} }

2
src/com/android/settings/dashboard/conditional/NightDisplayCondition.java
View File

@@ -66,7 +66,7 @@ public final class NightDisplayCondition extends Condition
new SubSettingLauncher(mManager.getContext()) new SubSettingLauncher(mManager.getContext())
.setDestination(NightDisplaySettings.class.getName()) .setDestination(NightDisplaySettings.class.getName())
.setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY) .setSourceMetricsCategory(MetricsEvent.DASHBOARD_SUMMARY)
.setTitle(R.string.night_display_title) .setTitleRes(R.string.night_display_title)
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.launch(); .launch();
} }

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()) return new SubSettingLauncher(getContext())
.setDestination(BillingCycleSettings.class.getName()) .setDestination(BillingCycleSettings.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.billing_cycle) .setTitleRes(R.string.billing_cycle)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN) .setSourceMetricsCategory(MetricsProto.MetricsEvent.VIEW_UNKNOWN)
.toIntent(); .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); args.putParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE, mTemplate);
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(BillingCycleSettings.class.getName()) .setDestination(BillingCycleSettings.class.getName())
.setTitle(R.string.billing_cycle) .setTitleRes(R.string.billing_cycle)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setArguments(args) .setArguments(args)
.launch(); .launch();
@@ -432,7 +432,7 @@ public class DataUsageList extends DataUsageBase {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(AppDataUsage.class.getName()) .setDestination(AppDataUsage.class.getName())
.setTitle(R.string.app_data_usage) .setTitleRes(R.string.app_data_usage)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .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); .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(R.string.app_cellular_data_usage); launcher.setTitleRes(R.string.app_cellular_data_usage);
} else { } else {
launcher.setTitle(mTitleRes); launcher.setTitleRes(mTitleRes);
} }
} else { } else {
if (mTitleRes > 0) { if (mTitleRes > 0) {
launcher.setTitle(mTitleRes); launcher.setTitleRes(mTitleRes);
} else { } else {
launcher.setTitle(getTitle()); launcher.setTitleText(getTitle());
} }
} }
return launcher.toIntent(); return launcher.toIntent();

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

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

2
src/com/android/settings/deviceinfo/BrandedAccountPreferenceController.java
View File

@@ -72,7 +72,7 @@ public class BrandedAccountPreferenceController extends BasePreferenceController
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(AccountDetailDashboardFragment.class.getName()) .setDestination(AccountDetailDashboardFragment.class.getName())
.setTitle(R.string.account_sync_title) .setTitleRes(R.string.account_sync_title)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(MetricsEvent.DEVICEINFO) .setSourceMetricsCategory(MetricsEvent.DEVICEINFO)
.launch(); .launch();

6
src/com/android/settings/deviceinfo/PrivateVolumeSettings.java
View File

@@ -433,7 +433,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId()); args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
new SubSettingLauncher(context) new SubSettingLauncher(context)
.setDestination(PrivateVolumeUnmount.class.getCanonicalName()) .setDestination(PrivateVolumeUnmount.class.getCanonicalName())
.setTitle(R.string.storage_menu_unmount) .setTitleRes(R.string.storage_menu_unmount)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setArguments(args) .setArguments(args)
.launch(); .launch();
@@ -442,7 +442,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId()); args.putString(VolumeInfo.EXTRA_VOLUME_ID, mVolume.getId());
new SubSettingLauncher(context) new SubSettingLauncher(context)
.setDestination(PrivateVolumeFormat.class.getCanonicalName()) .setDestination(PrivateVolumeFormat.class.getCanonicalName())
.setTitle(R.string.storage_menu_format) .setTitleRes(R.string.storage_menu_format)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setArguments(args) .setArguments(args)
.launch(); .launch();
@@ -487,7 +487,7 @@ public class PrivateVolumeSettings extends SettingsPreferenceFragment {
intent = new SubSettingLauncher(getActivity()) intent = new SubSettingLauncher(getActivity())
.setDestination(ManageApplications.class.getName()) .setDestination(ManageApplications.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.apps_storage) .setTitleRes(R.string.apps_storage)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.toIntent(); .toIntent();

10
src/com/android/settings/deviceinfo/StorageSettings.java
View File

@@ -238,7 +238,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
new SubSettingLauncher(getActivity()) new SubSettingLauncher(getActivity())
.setDestination(StorageDashboardFragment.class.getName()) .setDestination(StorageDashboardFragment.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.storage_settings) .setTitleRes(R.string.storage_settings)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
finish(); finish();
@@ -285,7 +285,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId())) { if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId())) {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(StorageDashboardFragment.class.getCanonicalName()) .setDestination(StorageDashboardFragment.class.getCanonicalName())
.setTitle(R.string.storage_settings) .setTitleRes(R.string.storage_settings)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setArguments(args) .setArguments(args)
.launch(); .launch();
@@ -296,7 +296,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
sTotalInternalStorage)); sTotalInternalStorage));
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(PrivateVolumeSettings.class.getCanonicalName()) .setDestination(PrivateVolumeSettings.class.getCanonicalName())
.setTitle(-1) .setTitleRes(-1)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setArguments(args) .setArguments(args)
.launch(); .launch();
@@ -319,7 +319,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
args.putString(VolumeRecord.EXTRA_FS_UUID, key); args.putString(VolumeRecord.EXTRA_FS_UUID, key);
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(PrivateVolumeForget.class.getCanonicalName()) .setDestination(PrivateVolumeForget.class.getCanonicalName())
.setTitle(R.string.storage_menu_forget) .setTitleRes(R.string.storage_menu_forget)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setArguments(args) .setArguments(args)
.launch(); .launch();
@@ -340,7 +340,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId()); args.putString(VolumeInfo.EXTRA_VOLUME_ID, vol.getId());
new SubSettingLauncher(context) new SubSettingLauncher(context)
.setDestination(PublicVolumeSettings.class.getCanonicalName()) .setDestination(PublicVolumeSettings.class.getCanonicalName())
.setTitle(-1) .setTitleRes(-1)
.setSourceMetricsCategory(METRICS_CATEGORY) .setSourceMetricsCategory(METRICS_CATEGORY)
.setArguments(args) .setArguments(args)
.launch(); .launch();

10
src/com/android/settings/deviceinfo/storage/StorageItemPreferenceController.java
View File

@@ -321,7 +321,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
ManageApplications.STORAGE_TYPE_PHOTOS_VIDEOS); ManageApplications.STORAGE_TYPE_PHOTOS_VIDEOS);
return new SubSettingLauncher(mContext) return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName()) .setDestination(ManageApplications.class.getName())
.setTitle(R.string.storage_photos_videos) .setTitleRes(R.string.storage_photos_videos)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment)) .setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent(); .toIntent();
@@ -340,7 +340,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
args.putInt(ManageApplications.EXTRA_STORAGE_TYPE, ManageApplications.STORAGE_TYPE_MUSIC); args.putInt(ManageApplications.EXTRA_STORAGE_TYPE, ManageApplications.STORAGE_TYPE_MUSIC);
return new SubSettingLauncher(mContext) return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName()) .setDestination(ManageApplications.class.getName())
.setTitle(R.string.storage_music_audio) .setTitleRes(R.string.storage_music_audio)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment)) .setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent(); .toIntent();
@@ -357,7 +357,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription()); args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
return new SubSettingLauncher(mContext) return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName()) .setDestination(ManageApplications.class.getName())
.setTitle(R.string.apps_storage) .setTitleRes(R.string.apps_storage)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment)) .setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent(); .toIntent();
@@ -369,7 +369,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
Settings.GamesStorageActivity.class.getName()); Settings.GamesStorageActivity.class.getName());
return new SubSettingLauncher(mContext) return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName()) .setDestination(ManageApplications.class.getName())
.setTitle(R.string.game_storage_settings) .setTitleRes(R.string.game_storage_settings)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment)) .setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent(); .toIntent();
@@ -381,7 +381,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
Settings.MoviesStorageActivity.class.getName()); Settings.MoviesStorageActivity.class.getName());
return new SubSettingLauncher(mContext) return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName()) .setDestination(ManageApplications.class.getName())
.setTitle(R.string.storage_movies_tv) .setTitleRes(R.string.storage_movies_tv)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment)) .setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent(); .toIntent();

2
src/com/android/settings/deviceinfo/storage/UserProfileController.java
View File

@@ -82,7 +82,7 @@ public class UserProfileController extends AbstractPreferenceController implemen
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(StorageProfileFragment.class.getName()) .setDestination(StorageProfileFragment.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(mUser.name) .setTitleText(mUser.name)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.DEVICEINFO_STORAGE) .setSourceMetricsCategory(MetricsProto.MetricsEvent.DEVICEINFO_STORAGE)
.launch(); .launch();
return true; return true;

4
src/com/android/settings/fuelgauge/AdvancedPowerUsageDetail.java
View File

@@ -156,7 +156,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
new SubSettingLauncher(caller) new SubSettingLauncher(caller)
.setDestination(AdvancedPowerUsageDetail.class.getName()) .setDestination(AdvancedPowerUsageDetail.class.getName())
.setTitle(R.string.battery_details_title) .setTitleRes(R.string.battery_details_title)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(fragment.getMetricsCategory()) .setSourceMetricsCategory(fragment.getMetricsCategory())
.setUserHandle(new UserHandle(getUserIdToLaunchAdvancePowerUsageDetail(sipper))) .setUserHandle(new UserHandle(getUserIdToLaunchAdvancePowerUsageDetail(sipper)))
@@ -192,7 +192,7 @@ public class AdvancedPowerUsageDetail extends DashboardFragment implements
new SubSettingLauncher(caller) new SubSettingLauncher(caller)
.setDestination(AdvancedPowerUsageDetail.class.getName()) .setDestination(AdvancedPowerUsageDetail.class.getName())
.setTitle(R.string.battery_details_title) .setTitleRes(R.string.battery_details_title)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(fragment.getMetricsCategory()) .setSourceMetricsCategory(fragment.getMetricsCategory())
.launch(); .launch();

2
src/com/android/settings/fuelgauge/BatteryOptimizationPreferenceController.java
View File

@@ -89,7 +89,7 @@ public class BatteryOptimizationPreferenceController extends AbstractPreferenceC
new SubSettingLauncher(mSettingsActivity) new SubSettingLauncher(mSettingsActivity)
.setDestination(ManageApplications.class.getName()) .setDestination(ManageApplications.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.high_power_apps) .setTitleRes(R.string.high_power_apps)
.setSourceMetricsCategory(mFragment.getMetricsCategory()) .setSourceMetricsCategory(mFragment.getMetricsCategory())
.launch(); .launch();

2
src/com/android/settings/fuelgauge/PowerUsageAnomalyDetails.java
View File

@@ -70,7 +70,7 @@ public class PowerUsageAnomalyDetails extends DashboardFragment implements
new SubSettingLauncher(caller) new SubSettingLauncher(caller)
.setDestination(PowerUsageAnomalyDetails.class.getName()) .setDestination(PowerUsageAnomalyDetails.class.getName())
.setTitle(R.string.battery_abnormal_details_title) .setTitleRes(R.string.battery_abnormal_details_title)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(fragment.getMetricsCategory()) .setSourceMetricsCategory(fragment.getMetricsCategory())
.launch(); .launch();

2
src/com/android/settings/fuelgauge/PowerUsageSummary.java
View File

@@ -285,7 +285,7 @@ public class PowerUsageSummary extends PowerUsageBase implements OnLongClickList
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(PowerUsageAdvanced.class.getName()) .setDestination(PowerUsageAdvanced.class.getName())
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.setTitle(R.string.advanced_battery_title) .setTitleRes(R.string.advanced_battery_title)
.launch(); .launch();
return true; return true;
default: default:

4
src/com/android/settings/fuelgauge/RestrictedAppDetails.java
View File

@@ -17,7 +17,6 @@
package com.android.settings.fuelgauge; package com.android.settings.fuelgauge;
import android.app.AppOpsManager; import android.app.AppOpsManager;
import android.app.Fragment;
import android.content.Context; import android.content.Context;
import android.content.pm.ApplicationInfo; import android.content.pm.ApplicationInfo;
import android.content.pm.PackageManager; import android.content.pm.PackageManager;
@@ -31,7 +30,6 @@ import android.util.IconDrawableFactory;
import com.android.internal.annotations.VisibleForTesting; import com.android.internal.annotations.VisibleForTesting;
import com.android.internal.logging.nano.MetricsProto; import com.android.internal.logging.nano.MetricsProto;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsActivity;
import com.android.settings.Utils; import com.android.settings.Utils;
import com.android.settings.core.InstrumentedPreferenceFragment; import com.android.settings.core.InstrumentedPreferenceFragment;
import com.android.settings.core.SubSettingLauncher; import com.android.settings.core.SubSettingLauncher;
@@ -75,7 +73,7 @@ public class RestrictedAppDetails extends DashboardFragment {
new SubSettingLauncher(fragment.getContext()) new SubSettingLauncher(fragment.getContext())
.setDestination(RestrictedAppDetails.class.getName()) .setDestination(RestrictedAppDetails.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.restricted_app_title) .setTitleRes(R.string.restricted_app_title)
.setSourceMetricsCategory(fragment.getMetricsCategory()) .setSourceMetricsCategory(fragment.getMetricsCategory())
.launch(); .launch();
} }

2
src/com/android/settings/fuelgauge/batterytip/actions/SmartBatteryAction.java
View File

@@ -47,7 +47,7 @@ public class SmartBatteryAction extends BatteryTipAction {
? ((Instrumentable) mFragment).getMetricsCategory() ? ((Instrumentable) mFragment).getMetricsCategory()
: Instrumentable.METRICS_CATEGORY_UNKNOWN) : Instrumentable.METRICS_CATEGORY_UNKNOWN)
.setDestination(SmartBatterySettings.class.getName()) .setDestination(SmartBatterySettings.class.getName())
.setTitle(R.string.smart_battery_manager_title) .setTitleRes(R.string.smart_battery_manager_title)
.launch(); .launch();
} }

2
src/com/android/settings/inputmethod/UserDictionarySettings.java
View File

@@ -191,7 +191,7 @@ public class UserDictionarySettings extends ListFragment implements Instrumentab
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(UserDictionaryAddWordFragment.class.getName()) .setDestination(UserDictionaryAddWordFragment.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.user_dict_settings_add_dialog_title) .setTitleRes(R.string.user_dict_settings_add_dialog_title)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();

2
src/com/android/settings/language/PhoneLanguagePreferenceController.java
View File

@@ -74,7 +74,7 @@ public class PhoneLanguagePreferenceController extends AbstractPreferenceControl
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(LocaleListEditor.class.getName()) .setDestination(LocaleListEditor.class.getName())
.setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY) .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_LANGUAGE_CATEGORY)
.setTitle(R.string.pref_title_lang_selection) .setTitleRes(R.string.pref_title_lang_selection)
.launch(); .launch();
return true; return true;
} }

2
src/com/android/settings/location/RecentLocationRequestPreferenceController.java
View File

@@ -62,7 +62,7 @@ public class RecentLocationRequestPreferenceController extends LocationBasePrefe
new SubSettingLauncher(mFragment.getContext()) new SubSettingLauncher(mFragment.getContext())
.setDestination(AppInfoDashboardFragment.class.getName()) .setDestination(AppInfoDashboardFragment.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(R.string.application_info_label) .setTitleRes(R.string.application_info_label)
.setUserHandle(mUserHandle) .setUserHandle(mUserHandle)
.setSourceMetricsCategory(mFragment.getMetricsCategory()) .setSourceMetricsCategory(mFragment.getMetricsCategory())
.launch(); .launch();

3
src/com/android/settings/notification/NotificationSettingsBase.java
View File

@@ -20,7 +20,6 @@ import static android.app.NotificationManager.IMPORTANCE_LOW;
import static android.app.NotificationManager.IMPORTANCE_NONE; import static android.app.NotificationManager.IMPORTANCE_NONE;
import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin; import static com.android.settingslib.RestrictedLockUtils.EnforcedAdmin;
import android.app.Activity;
import android.app.Notification; import android.app.Notification;
import android.app.NotificationChannel; import android.app.NotificationChannel;
import android.app.NotificationChannelGroup; import android.app.NotificationChannelGroup;
@@ -286,7 +285,7 @@ abstract public class NotificationSettingsBase extends DashboardFragment {
channelPref.setIntent(new SubSettingLauncher(getActivity()) channelPref.setIntent(new SubSettingLauncher(getActivity())
.setDestination(ChannelNotificationSettings.class.getName()) .setDestination(ChannelNotificationSettings.class.getName())
.setArguments(channelArgs) .setArguments(channelArgs)
.setTitle(R.string.notification_channel_title) .setTitleRes(R.string.notification_channel_title)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.toIntent()); .toIntent());

2
src/com/android/settings/notification/RecentNotifyingAppsPreferenceController.java
View File

@@ -220,7 +220,7 @@ public class RecentNotifyingAppsPreferenceController extends AbstractPreferenceC
pref.setIntent(new SubSettingLauncher(mHost.getActivity()) pref.setIntent(new SubSettingLauncher(mHost.getActivity())
.setDestination(AppNotificationSettings.class.getName()) .setDestination(AppNotificationSettings.class.getName())
.setTitle(R.string.notifications_title) .setTitleRes(R.string.notifications_title)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory( .setSourceMetricsCategory(
MetricsProto.MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS) MetricsProto.MetricsEvent.MANAGE_APPLICATIONS_NOTIFICATIONS)

2
src/com/android/settings/notification/ZenModeVisEffectsCustomPreferenceController.java
View File

@@ -59,7 +59,7 @@ public class ZenModeVisEffectsCustomPreferenceController
pref.setOnGearClickListener(p -> { pref.setOnGearClickListener(p -> {
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(ZenModeBlockedEffectsSettings.class.getName()) .setDestination(ZenModeBlockedEffectsSettings.class.getName())
.setTitle(R.string.zen_mode_what_to_block_title) .setTitleRes(R.string.zen_mode_what_to_block_title)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_ZEN_NOTIFICATIONS) .setSourceMetricsCategory(MetricsProto.MetricsEvent.SETTINGS_ZEN_NOTIFICATIONS)
.launch(); .launch();
}); });

2
src/com/android/settings/search/DatabaseIndexingUtils.java
View File

@@ -62,7 +62,7 @@ public class DatabaseIndexingUtils {
final Intent searchDestination = new SubSettingLauncher(context) final Intent searchDestination = new SubSettingLauncher(context)
.setDestination(className) .setDestination(className)
.setArguments(args) .setArguments(args)
.setTitle(screenTitle) .setTitleText(screenTitle)
.setSourceMetricsCategory(sourceMetricsCategory) .setSourceMetricsCategory(sourceMetricsCategory)
.toIntent(); .toIntent();
searchDestination.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key) searchDestination.putExtra(SettingsActivity.EXTRA_FRAGMENT_ARG_KEY, key)

2
src/com/android/settings/security/ChangeProfileScreenLockPreferenceController.java
View File

@@ -77,7 +77,7 @@ public class ChangeProfileScreenLockPreferenceController extends
extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId); extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName()) .setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName())
.setTitle(R.string.lock_settings_picker_title_profile) .setTitleRes(R.string.lock_settings_picker_title_profile)
.setSourceMetricsCategory(mHost.getMetricsCategory()) .setSourceMetricsCategory(mHost.getMetricsCategory())
.setArguments(extras) .setArguments(extras)
.launch(); .launch();

2
src/com/android/settings/security/ChangeScreenLockPreferenceController.java
View File

@@ -129,7 +129,7 @@ public class ChangeScreenLockPreferenceController extends AbstractPreferenceCont
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName()) .setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName())
.setTitle(R.string.lock_settings_picker_title) .setTitleRes(R.string.lock_settings_picker_title)
.setSourceMetricsCategory(mHost.getMetricsCategory()) .setSourceMetricsCategory(mHost.getMetricsCategory())
.launch(); .launch();
return true; return true;

4
src/com/android/settings/security/LockUnificationPreferenceController.java
View File

@@ -157,7 +157,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId); extras.putInt(Intent.EXTRA_USER_ID, mProfileChallengeUserId);
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName()) .setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName())
.setTitle(R.string.lock_settings_picker_title_profile) .setTitleRes(R.string.lock_settings_picker_title_profile)
.setSourceMetricsCategory(mHost.getMetricsCategory()) .setSourceMetricsCategory(mHost.getMetricsCategory())
.setArguments(extras) .setArguments(extras)
.launch(); .launch();
@@ -213,7 +213,7 @@ public class LockUnificationPreferenceController extends AbstractPreferenceContr
mCurrentProfilePassword); mCurrentProfilePassword);
new SubSettingLauncher(mContext) new SubSettingLauncher(mContext)
.setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName()) .setDestination(ChooseLockGeneric.ChooseLockGenericFragment.class.getName())
.setTitle(R.string.lock_settings_picker_title) .setTitleRes(R.string.lock_settings_picker_title)
.setSourceMetricsCategory(mHost.getMetricsCategory()) .setSourceMetricsCategory(mHost.getMetricsCategory())
.launch(); .launch();
} }

6
src/com/android/settings/users/UserSettings.java
View File

@@ -451,7 +451,7 @@ public class UserSettings extends SettingsPreferenceFragment
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(UserDetailsSettings.class.getName()) .setDestination(UserDetailsSettings.class.getName())
.setArguments(extras) .setArguments(extras)
.setTitle(R.string.user_guest) .setTitleRes(R.string.user_guest)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
return; return;
@@ -464,7 +464,7 @@ public class UserSettings extends SettingsPreferenceFragment
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(RestrictedProfileSettings.class.getName()) .setDestination(RestrictedProfileSettings.class.getName())
.setArguments(extras) .setArguments(extras)
.setTitle(R.string.user_restrictions_title) .setTitleRes(R.string.user_restrictions_title)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
} else if (info.id == UserHandle.myUserId()) { } else if (info.id == UserHandle.myUserId()) {
@@ -476,7 +476,7 @@ public class UserSettings extends SettingsPreferenceFragment
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(UserDetailsSettings.class.getName()) .setDestination(UserDetailsSettings.class.getName())
.setArguments(extras) .setArguments(extras)
.setTitle(info.name) .setTitleText(info.name)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
} }

2
src/com/android/settings/vpn2/AppManagementFragment.java
View File

@@ -105,7 +105,7 @@ public class AppManagementFragment extends SettingsPreferenceFragment
new SubSettingLauncher(context) new SubSettingLauncher(context)
.setDestination(AppManagementFragment.class.getName()) .setDestination(AppManagementFragment.class.getName())
.setArguments(args) .setArguments(args)
.setTitle(pref.getLabel()) .setTitleText(pref.getLabel())
.setSourceMetricsCategory(sourceMetricsCategory) .setSourceMetricsCategory(sourceMetricsCategory)
.setUserHandle(new UserHandle(pref.getUserId())) .setUserHandle(new UserHandle(pref.getUserId()))
.launch(); .launch();

2
src/com/android/settings/wallpaper/WallpaperSuggestionActivity.java
View File

@@ -52,7 +52,7 @@ public class WallpaperSuggestionActivity extends Activity {
// fall back to default wallpaper picker // fall back to default wallpaper picker
new SubSettingLauncher(this) new SubSettingLauncher(this)
.setDestination(WallpaperTypeSettings.class.getName()) .setDestination(WallpaperTypeSettings.class.getName())
.setTitle(R.string.wallpaper_suggestion_title) .setTitleRes(R.string.wallpaper_suggestion_title)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY) .setSourceMetricsCategory(MetricsProto.MetricsEvent.DASHBOARD_SUMMARY)
.addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT) .addFlags(Intent.FLAG_ACTIVITY_FORWARD_RESULT)
.launch(); .launch();

4
src/com/android/settings/wifi/WifiSettings.java
View File

@@ -914,7 +914,7 @@ public class WifiSettings extends RestrictedSettingsFragment
private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) { private void launchNetworkDetailsFragment(ConnectedAccessPointPreference pref) {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setTitle(R.string.pref_title_network_details) .setTitleRes(R.string.pref_title_network_details)
.setDestination(WifiNetworkDetailsFragment.class.getName()) .setDestination(WifiNetworkDetailsFragment.class.getName())
.setArguments(pref.getExtras()) .setArguments(pref.getExtras())
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
@@ -973,7 +973,7 @@ public class WifiSettings extends RestrictedSettingsFragment
final LinkifyUtils.OnClickListener clickListener = final LinkifyUtils.OnClickListener clickListener =
() -> new SubSettingLauncher(getContext()) () -> new SubSettingLauncher(getContext())
.setDestination(ScanningSettings.class.getName()) .setDestination(ScanningSettings.class.getName())
.setTitle(R.string.location_scanning_screen_title) .setTitleRes(R.string.location_scanning_screen_title)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();
mStatusMessagePreference.setText(title, description, clickListener); mStatusMessagePreference.setText(title, description, clickListener);

8
tests/robotests/src/com/android/settings/core/SubSettingLauncherTest.java
View File

@@ -87,7 +87,7 @@ public class SubSettingLauncherTest {
public void launch_shouldIncludeAllParams() { public void launch_shouldIncludeAllParams() {
final ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class); final ArgumentCaptor<Intent> intentArgumentCaptor = ArgumentCaptor.forClass(Intent.class);
final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext)); final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext));
launcher.setTitle("123") launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName()) .setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123) .setSourceMetricsCategory(123)
@@ -111,7 +111,7 @@ public class SubSettingLauncherTest {
when(mFragment.getActivity()).thenReturn(mActivity); when(mFragment.getActivity()).thenReturn(mActivity);
final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext)); final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext));
launcher.setTitle("123") launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName()) .setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123) .setSourceMetricsCategory(123)
@@ -128,7 +128,7 @@ public class SubSettingLauncherTest {
final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext)); final SubSettingLauncher launcher = spy(new SubSettingLauncher(mContext));
doNothing().when(launcher).launchAsUser(any(Intent.class), any(UserHandle.class)); doNothing().when(launcher).launchAsUser(any(Intent.class), any(UserHandle.class));
launcher.setTitle("123") launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName()) .setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123) .setSourceMetricsCategory(123)
@@ -147,7 +147,7 @@ public class SubSettingLauncherTest {
doNothing().when(launcher).launchForResultAsUser( doNothing().when(launcher).launchForResultAsUser(
any(Intent.class), any(UserHandle.class), any(Fragment.class), anyInt()); any(Intent.class), any(UserHandle.class), any(Fragment.class), anyInt());
launcher.setTitle("123") launcher.setTitleText("123")
.setDestination(SubSettingLauncherTest.class.getName()) .setDestination(SubSettingLauncherTest.class.getName())
.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK) .addFlags(Intent.FLAG_ACTIVITY_NEW_TASK)
.setSourceMetricsCategory(123) .setSourceMetricsCategory(123)

4
tests/robotests/src/com/android/settings/datausage/DataUsageSummaryPreferenceTest.java
View File

@@ -518,8 +518,8 @@ public class DataUsageSummaryPreferenceTest {
assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE)) assertThat((NetworkTemplate) actual.getParcelable(DataUsageList.EXTRA_NETWORK_TEMPLATE))
.isEqualTo(NetworkTemplate.buildTemplateWifiWildcard()); .isEqualTo(NetworkTemplate.buildTemplateWifiWildcard());
assertThat(startedIntent.getCharSequenceExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE)) assertThat(startedIntent.getIntExtra(SettingsActivity.EXTRA_SHOW_FRAGMENT_TITLE_RESID, 0))
.isEqualTo(mContext.getString(R.string.wifi_data_usage)); .isEqualTo(R.string.wifi_data_usage);
} }
private void bindViewHolder() { private void bindViewHolder() {

2
tests/unit/src/com/android/settings/bluetooth/BluetoothDeviceDetailsRotationTest.java
View File

@@ -89,7 +89,7 @@ public class BluetoothDeviceDetailsRotationTest {
args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, mDeviceAddress); args.putString(BluetoothDeviceDetailsFragment.KEY_DEVICE_ADDRESS, mDeviceAddress);
new SubSettingLauncher(activity) new SubSettingLauncher(activity)
.setDestination(BluetoothDeviceDetailsFragment.class.getName()) .setDestination(BluetoothDeviceDetailsFragment.class.getName())
.setTitle("test") .setTitleText("test")
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN) .setSourceMetricsCategory(Instrumentable.METRICS_CATEGORY_UNKNOWN)
.launch(); .launch();