Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit b940fc3d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

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

parents 13bc82b4 0fc557bb
Loading
Loading
Loading
Loading
+0 −2
Original line number Diff line number Diff line
@@ -8292,8 +8292,6 @@
    <!-- Summary describing external storage for applications [CHAR LIMIT=25] -->
    <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] -->
    <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>
+1 −1
Original line number Diff line number Diff line
@@ -62,7 +62,7 @@ public class AppDataUsageActivity extends SettingsActivity {
        args.putParcelable(AppDataUsage.ARG_APP_ITEM, appItem);
        intent.putExtra(EXTRA_SHOW_FRAGMENT_ARGUMENTS, args);
        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);
    }
+1 −1
Original line number Diff line number Diff line
@@ -419,7 +419,7 @@ public class DataUsageList extends DataUsageBaseFragment {

        new SubSettingLauncher(getContext())
                .setDestination(AppDataUsage.class.getName())
                .setTitleRes(R.string.app_data_usage)
                .setTitleRes(R.string.data_usage_app_summary_title)
                .setArguments(args)
                .setSourceMetricsCategory(getMetricsCategory())
                .launch();
+1 −1
Original line number Diff line number Diff line
@@ -82,7 +82,7 @@ public class UnrestrictedDataAccessPreference extends AppSwitchPreference implem
        if (mDataUsageState.isDataSaverBlacklisted) {
            // app is blacklisted, launch App Data Usage screen
            AppInfoDashboardFragment.startAppInfoFragment(AppDataUsage.class,
                    R.string.app_data_usage,
                    R.string.data_usage_app_summary_title,
                    null /* arguments */,
                    mParentFragment,
                    mEntry);