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

am: 7df9a28fdb

Change-Id: I14d23175a455c21df8d526bfa2ae034e80e199d5

diff --git a/src/com/android/settings/deviceinfo/StorageItemPreference.java b/src/com/android/settings/deviceinfo/StorageItemPreference.java
index b6eedc3..b15794e 100644 (file)
--- 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 {