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

Commit af1a6620 authored by Daniel Nishi's avatar Daniel Nishi Committed by android-build-merger
Browse files

Merge "Make Storage settings title be "Storage"." into oc-dev 

am: c7299663

Change-Id: I2873188fb073261695d79719c99617a355f17acc
parents a3202a9a c7299663

res/values/strings.xml

+0 −4
Original line number Diff line number Diff line
@@ -8620,10 +8620,6 @@ 
    <!-- Preference label for the Files storage section. [CHAR LIMIT=50] -->

    <string name="storage_files">Files</string>









    <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->









    <string name="storage_settings_2" product="tablet">Tablet storage</string>









    <string name="storage_settings_2" product="default">Phone storage</string>

















    <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->









    <string name="storage_size_large_alternate"><xliff:g id="number" example="128">^1</xliff:g><small> <xliff:g id="unit" example="KB">^2</xliff:g></small></string>









    <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->

























src/com/android/settings/deviceinfo/StorageSettings.java



+2
−2






























Original line number
Diff line number
Diff line







@@ -235,7 +235,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index







            args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);









            Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),









                    StorageDashboardFragment.class.getName(), args, null,









                    R.string.storage_settings_2, null, false, getMetricsCategory());









                    R.string.storage_settings, null, false, getMetricsCategory());









            intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);









            getActivity().startActivity(intent);









            finish();








@@ -280,7 +280,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index

















                if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId())) {









                    startFragment(this, StorageDashboardFragment.class.getCanonicalName(),









                            R.string.storage_settings_2, 0, args);









                            R.string.storage_settings, 0, args);









                } else {









                    // TODO: Go to the StorageDashboardFragment once it fully handles all of the









                    //       SD card cases and other private internal storage cases.