commit 8b58ae9d4fad3e3a434bf887ad498e62fcda79c0
author TreeHugger Robot <treehugger-gerrit@google.com> Mon Apr 19 07:41:24 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Mon Apr 19 07:41:24 2021 +0000
tree a36767af6c14f62d4b4ecf37333c73cb7c96f051
parent 36e9a5ffd241deebb5e7e91764b2f870d6edc9c0
parent 2e04e81da8b0bb2c6526fb874042e8789b0012d7

Merge "Update storage usage progress bar summary text" into sc-dev

res/values/strings.xml

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 2a20727..16c7e18 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -11814,9 +11814,9 @@
     <string name="storage_percent_full">used</string>
 
     <!-- Summary of a single storage volume used space. [CHAR LIMIT=24] -->
-    <string name="storage_usage_summary"><xliff:g id="number" example="128">%1$s</xliff:g> <xliff:g id="unit" example="KB">%2$s</xliff:g></string>
+    <string name="storage_usage_summary"><xliff:g id="number" example="128">%1$s</xliff:g> <xliff:g id="unit" example="KB">%2$s</xliff:g> used</string>
     <!-- Summary of a single storage volume total space. [CHAR LIMIT=24] -->
-    <string name="storage_total_summary"><xliff:g id="percentage" example="54%">%1$s</xliff:g> used of <xliff:g id="number" example="128">%2$s</xliff:g> <xliff:g id="unit" example="KB">%3$s</xliff:g></string>
+    <string name="storage_total_summary"><xliff:g id="number" example="128">%1$s</xliff:g> <xliff:g id="unit" example="KB">%2$s</xliff:g> total</string>
 
     <!-- Label for button allow user to remove the instant app from the device. -->
     <string name="clear_instant_app_data">Clear app</string>

src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java

diff --git a/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java b/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java
index ec51db6..6b06daf 100644
--- a/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java
+++ b/src/com/android/settings/deviceinfo/storage/StorageUsageProgressBarPreferenceController.java
@@ -26,7 +26,6 @@
 import androidx.preference.PreferenceScreen;
 
 import com.android.settings.R;
-import com.android.settings.Utils;
 import com.android.settings.core.BasePreferenceController;
 import com.android.settingslib.utils.ThreadUtils;
 import com.android.settingslib.widget.UsageProgressBarPreference;
@@ -108,23 +107,16 @@
 
     @Override
     public void updateState(Preference preference) {
-        final Formatter.BytesResult usedResult = getBytesResult(mUsedBytes);
         mUsageProgressBarPreference.setUsageSummary(
-                mContext.getString(R.string.storage_usage_summary,
-                usedResult.value, usedResult.units));
-
-        final String percentageString = mTotalBytes == 0L
-                ? Utils.formatPercentage(0)
-                : Utils.formatPercentage((mUsedBytes * 100) / mTotalBytes, true /* round */);
-        final Formatter.BytesResult totalResult = getBytesResult(mTotalBytes);
+                getStorageSummary(R.string.storage_usage_summary, mUsedBytes));
         mUsageProgressBarPreference.setTotalSummary(
-                mContext.getString(R.string.storage_total_summary, percentageString,
-                totalResult.value, totalResult.units));
-
+                getStorageSummary(R.string.storage_total_summary, mTotalBytes));
         mUsageProgressBarPreference.setPercent(mUsedBytes, mTotalBytes);
     }
 
-    private Formatter.BytesResult getBytesResult(long bytes) {
-        return Formatter.formatBytes(mContext.getResources(), bytes, Formatter.FLAG_SHORTER);
+    private String getStorageSummary(int resId, long bytes) {
+        final Formatter.BytesResult result = Formatter.formatBytes(mContext.getResources(),
+                bytes, Formatter.FLAG_SHORTER);
+        return mContext.getString(resId, result.value, result.units);
     }
 }