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

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

Browse Source 
am: c7299663e7

Change-Id: I2873188fb073261695d79719c99617a355f17acc
This commit is contained in:
Daniel Nishi
2017-05-18 22:07:24 +00:00
committed by android-build-merger
parent a3202a9a36 c7299663e7
commit af1a66202f
2 changed files with 2 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
res/values/strings.xml
View File

@@ -8620,10 +8620,6 @@
<!-- Preference label for the Files storage section. [CHAR LIMIT=50] --> <!-- Preference label for the Files storage section. [CHAR LIMIT=50] -->
<string name="storage_files">Files</string> <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] --> <!-- 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> <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]--> <!-- Summary of a single storage volume total space. [CHAR LIMIT=48]-->

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

@@ -235,7 +235,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL); args.putString(VolumeInfo.EXTRA_VOLUME_ID, VolumeInfo.ID_PRIVATE_INTERNAL);
Intent intent = Utils.onBuildStartFragmentIntent(getActivity(), Intent intent = Utils.onBuildStartFragmentIntent(getActivity(),
StorageDashboardFragment.class.getName(), args, null, 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); intent.putExtra(SettingsDrawerActivity.EXTRA_SHOW_MENU, true);
getActivity().startActivity(intent); getActivity().startActivity(intent);
finish(); finish();
@@ -280,7 +280,7 @@ public class StorageSettings extends SettingsPreferenceFragment implements Index
if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId())) { if (VolumeInfo.ID_PRIVATE_INTERNAL.equals(vol.getId())) {
startFragment(this, StorageDashboardFragment.class.getCanonicalName(), startFragment(this, StorageDashboardFragment.class.getCanonicalName(),
R.string.storage_settings_2, 0, args); R.string.storage_settings, 0, args);
} else { } else {
// TODO: Go to the StorageDashboardFragment once it fully handles all of the // TODO: Go to the StorageDashboardFragment once it fully handles all of the
// SD card cases and other private internal storage cases. // SD card cases and other private internal storage cases.