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

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);
return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName())
.setTitle(R.string.storage_photos_videos)
.setTitleRes(R.string.storage_photos_videos)
.setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent();
@@ -340,7 +340,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
args.putInt(ManageApplications.EXTRA_STORAGE_TYPE, ManageApplications.STORAGE_TYPE_MUSIC);
return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName())
.setTitle(R.string.storage_music_audio)
.setTitleRes(R.string.storage_music_audio)
.setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent();
@@ -357,7 +357,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
args.putString(ManageApplications.EXTRA_VOLUME_NAME, mVolume.getDescription());
return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName())
.setTitle(R.string.apps_storage)
.setTitleRes(R.string.apps_storage)
.setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent();
@@ -369,7 +369,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
Settings.GamesStorageActivity.class.getName());
return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName())
.setTitle(R.string.game_storage_settings)
.setTitleRes(R.string.game_storage_settings)
.setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.toIntent();
@@ -381,7 +381,7 @@ public class StorageItemPreferenceController extends AbstractPreferenceControlle
Settings.MoviesStorageActivity.class.getName());
return new SubSettingLauncher(mContext)
.setDestination(ManageApplications.class.getName())
.setTitle(R.string.storage_movies_tv)
.setTitleRes(R.string.storage_movies_tv)
.setArguments(args)
.setSourceMetricsCategory(mMetricsFeatureProvider.getMetricsCategory(mFragment))
.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)
.setDestination(StorageProfileFragment.class.getName())
.setArguments(args)
.setTitle(mUser.name)
.setTitleText(mUser.name)
.setSourceMetricsCategory(MetricsProto.MetricsEvent.DEVICEINFO_STORAGE)
.launch();
return true;