From 4bba940721845d1fc886cedf748d8ce9c982b081 Mon Sep 17 00:00:00 2001
From: Jeff Sharkey <jsharkey@android.com>
Date: Wed, 5 Jun 2013 17:51:38 -0700
Subject: [PATCH] Always allow formatting of physical storage.

Also rebuild UI when volume state changes after a format finishes.

Bug: 8985206
Change-Id: I6208e385711b883fb6fc77cc76cbe425d740b0a8
---
 .../deviceinfo/StorageVolumePreferenceCategory.java      | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

diff --git a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
index 61188ec1c2c..1992facf60e 100644
--- a/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
+++ b/src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
@@ -137,6 +137,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
     public void init() {
         final Context context = getContext();
 
+        removeAll();
+
         final UserInfo currentUser;
         try {
             currentUser = ActivityManagerNative.getDefault().getCurrentUser();
@@ -242,9 +244,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
 
         if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
             mItemAvailable.setTitle(R.string.memory_available_read_only);
-            if (mFormatPreference != null) {
-                removePreference(mFormatPreference);
-            }
         } else {
             mItemAvailable.setTitle(R.string.memory_available);
         }
@@ -269,9 +268,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
             removePreference(mUsageBarPreference);
             removePreference(mItemTotal);
             removePreference(mItemAvailable);
-            if (mFormatPreference != null) {
-                removePreference(mFormatPreference);
-            }
         }
 
         if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) ||
@@ -374,6 +370,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
     }
 
     public void onStorageStateChanged() {
+        init();
         measure();
     }