Merge \"Show \"0\" instead of \"0 B\" in storage settings.\" into nyc-dev

am: 87fcf9e95f Change-Id: I94d18998914552d21099b12b22471ea93857cf52
2016-06-21 18:18:21 +00:00
parent 440199c6c4 87fcf9e95f
commit 698fe0a9b0
1 changed files with 3 additions and 1 deletions
--- a/src/com/android/settings/deviceinfo/StorageItemPreference.java
+++ b/src/com/android/settings/deviceinfo/StorageItemPreference.java
@@ -38,7 +38,9 @@ public class StorageItemPreference extends Preference {
    }

    public void setStorageSize(long size, long total) {
-        setSummary(Formatter.formatFileSize(getContext(), size));
+        setSummary(size == 0
+                ? String.valueOf(0)
+                : Formatter.formatFileSize(getContext(), size));
        if (total == 0) {
            progress = 0;
        } else {