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

am 62634b30: am 440ca974: am 8f1bd8a7: Bug 4539424: confirmation dialog always shown

Browse Source 
* commit '62634b309ab6c352a37c4d79d50fc78ab806304f':
  Bug 4539424: confirmation dialog always shown
This commit is contained in:
Gilles Debunne
2011-06-07 17:17:56 -07:00
committed by Android Git Automerger
parent adcbf72c80 62634b309a
commit 94129ad9a2
1 changed files with 10 additions and 30 deletions
Download Patch File Download Diff File Expand all files Collapse all files

40
src/com/android/settings/deviceinfo/Memory.java
View File

@@ -21,7 +21,6 @@ import android.app.Dialog;
import android.content.BroadcastReceiver; import android.content.BroadcastReceiver;
import android.content.Context; import android.content.Context;
import android.content.DialogInterface; import android.content.DialogInterface;
import android.content.DialogInterface.OnCancelListener;
import android.content.Intent; import android.content.Intent;
import android.content.IntentFilter; import android.content.IntentFilter;
import android.content.res.Resources; import android.content.res.Resources;
@@ -42,7 +41,7 @@ import android.widget.Toast;
import com.android.settings.R; import com.android.settings.R;
import com.android.settings.SettingsPreferenceFragment; import com.android.settings.SettingsPreferenceFragment;
public class Memory extends SettingsPreferenceFragment implements OnCancelListener { public class Memory extends SettingsPreferenceFragment {
private static final String TAG = "MemorySettings"; private static final String TAG = "MemorySettings";
private static final int DLG_CONFIRM_UNMOUNT = 1; private static final int DLG_CONFIRM_UNMOUNT = 1;
@@ -50,9 +49,10 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
private Resources mResources; private Resources mResources;
// The mountToggle Preference that has been clicked. // The mountToggle Preference that has last been clicked.
// The click event will be discarded if this value is not null. Reset to null after (un)mount. // Assumes no two successive unmount event on 2 different volumes are performed before the first
private Preference mClickedMountToggle; // one's preference is disabled
private Preference mLastClickedMountToggle;
private String mClickedMountPoint; private String mClickedMountPoint;
// Access using getMountService() // Access using getMountService()
@@ -157,9 +157,8 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
return true; return true;
} }
boolean mountToggleClicked = svpc.mountToggleClicked(preference); if (svpc.mountToggleClicked(preference)) {
if (mountToggleClicked && mClickedMountToggle == null) { mLastClickedMountToggle = preference;
mClickedMountToggle = preference;
final StorageVolume storageVolume = svpc.getStorageVolume(); final StorageVolume storageVolume = svpc.getStorageVolume();
mClickedMountPoint = storageVolume.getPath(); mClickedMountPoint = storageVolume.getPath();
String state = mStorageManager.getVolumeState(storageVolume.getPath()); String state = mStorageManager.getVolumeState(storageVolume.getPath());
@@ -208,32 +207,19 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
return null; return null;
} }
@Override
protected void showDialog(int id) {
super.showDialog(id);
switch (id) {
case DLG_CONFIRM_UNMOUNT:
case DLG_ERROR_UNMOUNT:
setOnCancelListener(this);
break;
}
}
private void doUnmount() { private void doUnmount() {
// Present a toast here // Present a toast here
Toast.makeText(getActivity(), R.string.unmount_inform_text, Toast.LENGTH_SHORT).show(); Toast.makeText(getActivity(), R.string.unmount_inform_text, Toast.LENGTH_SHORT).show();
IMountService mountService = getMountService(); IMountService mountService = getMountService();
try { try {
mClickedMountToggle.setEnabled(false); mLastClickedMountToggle.setEnabled(false);
mClickedMountToggle.setTitle(mResources.getString(R.string.sd_ejecting_title)); mLastClickedMountToggle.setTitle(mResources.getString(R.string.sd_ejecting_title));
mClickedMountToggle.setSummary(mResources.getString(R.string.sd_ejecting_summary)); mLastClickedMountToggle.setSummary(mResources.getString(R.string.sd_ejecting_summary));
mountService.unmountVolume(mClickedMountPoint, true); mountService.unmountVolume(mClickedMountPoint, true);
} catch (RemoteException e) { } catch (RemoteException e) {
// Informative dialog to user that unmount failed. // Informative dialog to user that unmount failed.
showDialogInner(DLG_ERROR_UNMOUNT); showDialogInner(DLG_ERROR_UNMOUNT);
} }
mClickedMountToggle = null;
} }
private void showDialogInner(int id) { private void showDialogInner(int id) {
@@ -274,7 +260,6 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
// Very unlikely. But present an error dialog anyway // Very unlikely. But present an error dialog anyway
Log.e(TAG, "Is MountService running?"); Log.e(TAG, "Is MountService running?");
showDialogInner(DLG_ERROR_UNMOUNT); showDialogInner(DLG_ERROR_UNMOUNT);
mClickedMountToggle = null;
} }
} }
@@ -289,10 +274,5 @@ public class Memory extends SettingsPreferenceFragment implements OnCancelListen
} catch (RemoteException ex) { } catch (RemoteException ex) {
// Not much can be done // Not much can be done
} }
mClickedMountToggle = null;
}
public void onCancel(DialogInterface dialog) {
mClickedMountToggle = null;
} }
} }