PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Always allow formatting of physical storage.

Browse Source 
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
committed by The Android Automerger
parent 96f496ef37
commit 4bba940721
1 changed files with 3 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
src/com/android/settings/deviceinfo/StorageVolumePreferenceCategory.java
View File

@@ -137,6 +137,8 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
public void init() { public void init() {
final Context context = getContext(); final Context context = getContext();
removeAll();
final UserInfo currentUser; final UserInfo currentUser;
try { try {
currentUser = ActivityManagerNative.getDefault().getCurrentUser(); currentUser = ActivityManagerNative.getDefault().getCurrentUser();
@@ -242,9 +244,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) { if (Environment.MEDIA_MOUNTED_READ_ONLY.equals(state)) {
mItemAvailable.setTitle(R.string.memory_available_read_only); mItemAvailable.setTitle(R.string.memory_available_read_only);
if (mFormatPreference != null) {
removePreference(mFormatPreference);
}
} else { } else {
mItemAvailable.setTitle(R.string.memory_available); mItemAvailable.setTitle(R.string.memory_available);
} }
@@ -269,9 +268,6 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
removePreference(mUsageBarPreference); removePreference(mUsageBarPreference);
removePreference(mItemTotal); removePreference(mItemTotal);
removePreference(mItemAvailable); removePreference(mItemAvailable);
if (mFormatPreference != null) {
removePreference(mFormatPreference);
}
} }
if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) || if (mUsbConnected && (UsbManager.USB_FUNCTION_MTP.equals(mUsbFunction) ||
@@ -374,6 +370,7 @@ public class StorageVolumePreferenceCategory extends PreferenceCategory {
} }
public void onStorageStateChanged() { public void onStorageStateChanged() {
init();
measure(); measure();
} }