diff --git a/res/values/strings.xml b/res/values/strings.xml index 28e3ba64bc6..2cfbf482e3c 100644 --- a/res/values/strings.xml +++ b/res/values/strings.xml @@ -10914,7 +10914,7 @@ Data usage charges may apply. %1$d apps installed - %1$s used - %2$s free + %1$s used - %2$s free Dark theme, font size, brightness diff --git a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java index 1955f36059a..05e4f25ee78 100644 --- a/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java +++ b/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceController.java @@ -93,7 +93,7 @@ public class TopLevelStoragePreferenceController extends BasePreferenceControlle private String getSummary(long usedBytes, long totalBytes) { NumberFormat percentageFormat = NumberFormat.getPercentInstance(); - return mContext.getString(R.string.storage_summary, + return mContext.getString(R.string.storage_toplevel_summary, totalBytes == 0L ? "0" : percentageFormat.format(((double) usedBytes) / totalBytes), Formatter.formatFileSize(mContext, totalBytes - usedBytes)); } diff --git a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java index 22e34317702..2a731bf50b7 100644 --- a/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java +++ b/src/com/android/settings/homepage/contextualcards/slices/LowStorageSlice.java @@ -73,7 +73,7 @@ public class LowStorageSlice implements CustomSliceable { if (usedPercentage < LOW_STORAGE_THRESHOLD) { // For clients that ignore error checking, a generic storage slice will be given. final CharSequence titleStorage = mContext.getText(R.string.storage_settings); - final String summaryStorage = mContext.getString(R.string.storage_summary, + final String summaryStorage = mContext.getString(R.string.storage_toplevel_summary, percentageString, freeSizeString); return listBuilder diff --git a/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java b/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java index 6318c9c6914..c5c69af998f 100644 --- a/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java +++ b/tests/unit/src/com/android/settings/deviceinfo/TopLevelStoragePreferenceControllerTest.java @@ -103,6 +103,6 @@ public class TopLevelStoragePreferenceControllerTest { // the background thread. TimeUnit.SECONDS.sleep(5); assertThat(preference.getSummary()).isEqualTo(ResourcesUtils.getResourcesString( - mContext, "storage_summary", percentage, freeSpace)); + mContext, "storage_toplevel_summary", percentage, freeSpace)); } }