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

Merge "Fix App data usage screen header title changing after device orientation"

Browse Source
This commit is contained in:
TreeHugger Robot
2018-12-27 15:59:25 +00:00
committed by Android (Google) Code Review
parent 13bc82b456 0fc557bbc9
commit b940fc3d45
4 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
res/values/strings.xml
View File

@@ -8292,8 +8292,6 @@
<!-- Summary describing external storage for applications [CHAR LIMIT=25] --> <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
<string name="storage_type_external">External storage</string> <string name="storage_type_external">External storage</string>
<!-- Title for data usage screen when entered from app info [CHAR LIMIT=30] -->
<string name="app_data_usage">App data usage</string>
<!-- Summary for data usage preference [CHAR LIMIT=15] --> <!-- Summary for data usage preference [CHAR LIMIT=15] -->
<string name="data_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used since <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string> <string name="data_summary_format"><xliff:g id="size" example="30.00MB">%1$s</xliff:g> used since <xliff:g id="date" example="Jan 12">%2$s</xliff:g></string>

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

@@ -62,7 +62,7 @@ public class AppDataUsageActivity extends SettingsActivity {
args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem); args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem);
intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args); intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
intent.putExtra(EXTRA_SHOW_FRAGMENT, AppDataUsage.class.getName()); intent.putExtra(EXTRA_SHOW_FRAGMENT, AppDataUsage.class.getName());
intent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.app_data_usage); intent.putExtra(EXTRA_SHOW_FRAGMENT_TITLE_RESID, R.string.data_usage_app_summary_title);
super.onCreate(savedInstanceState); super.onCreate(savedInstanceState);
} }

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

@@ -419,7 +419,7 @@ public class DataUsageList extends DataUsageBaseFragment {
new SubSettingLauncher(getContext()) new SubSettingLauncher(getContext())
.setDestination(AppDataUsage.class.getName()) .setDestination(AppDataUsage.class.getName())
.setTitleRes(R.string.app_data_usage) .setTitleRes(R.string.data_usage_app_summary_title)
.setArguments(args) .setArguments(args)
.setSourceMetricsCategory(getMetricsCategory()) .setSourceMetricsCategory(getMetricsCategory())
.launch(); .launch();

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

@@ -82,7 +82,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
if (mDataUsageState.isDataSaverBlacklisted) { if (mDataUsageState.isDataSaverBlacklisted) {
// app is blacklisted, launch App Data Usage screen // app is blacklisted, launch App Data Usage screen
AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class, AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
R.string.app_data_usage, R.string.data_usage_app_summary_title,
null /* arguments */, null /* arguments */,
mParentFragment, mParentFragment,
mEntry); mEntry);