Always allow formatting of physical storage.

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

Bug: 8985206
Change-Id: I6208e385711b883fb6fc77cc76cbe425d740b0a8
This commit is contained in:
Jeff Sharkey
2013-06-05 17:51:38 -07:00
parent 27d6f8d54b
commit eab49cab9f

View File

@@ -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();
}