summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/MasterClear.java
diff options
context:
space:
mode:
authorKenny Root <kroot@google.com>2011-01-18 15:14:32 -0800
committerKenny Root <kroot@google.com>2011-01-18 15:14:32 -0800
commit3785e390d2538b11d98be17388af69c97c8995b2 (patch)
tree291668b47b8cdc292f6c0bb1097b84c4580b4f98 /src/com/android/settings/MasterClear.java
parent0ad922f0ceee31da2a5b242ecfbaeff74e1f0003 (diff)
downloadpackages_apps_Settings-3785e390d2538b11d98be17388af69c97c8995b2.zip
packages_apps_Settings-3785e390d2538b11d98be17388af69c97c8995b2.tar.gz
packages_apps_Settings-3785e390d2538b11d98be17388af69c97c8995b2.tar.bz2
Don't show separate option for erasing USB storage
On devices with emulated USB storage or SD card, factory reset will wipe all data from that area. Given that, it doesn't make sense to show a different option for wiping USB storage. Bug: 3242568 Change-Id: I257bdde06141f14381c8c09ce6a42c18d7080efd
Diffstat (limited to 'src/com/android/settings/MasterClear.java')
-rw-r--r--src/com/android/settings/MasterClear.java29
1 files changed, 23 insertions, 6 deletions
diff --git a/src/com/android/settings/MasterClear.java b/src/com/android/settings/MasterClear.java
index 3060d3e..1b045ea 100644
--- a/src/com/android/settings/MasterClear.java
+++ b/src/com/android/settings/MasterClear.java
@@ -29,6 +29,7 @@ import android.content.pm.PackageManager;
import android.content.res.Resources;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.os.Environment;
import android.preference.Preference;
import android.preference.PreferenceActivity;
import android.util.Log;
@@ -133,13 +134,29 @@ public class MasterClear extends Fragment {
mExternalStorageContainer = mContentView.findViewById(R.id.erase_external_container);
mExternalStorage = (CheckBox) mContentView.findViewById(R.id.erase_external);
- mExternalStorageContainer.setOnClickListener(new View.OnClickListener() {
+ /*
+ * If the external storage is emulated, it will be erased with a factory
+ * reset at any rate. There is no need to have a separate option until
+ * we have a factory reset that only erases some directories and not
+ * others.
+ */
+ if (Environment.isExternalStorageEmulated()) {
+ mExternalStorageContainer.setVisibility(View.GONE);
- @Override
- public void onClick(View v) {
- mExternalStorage.toggle();
- }
- });
+ final View externalOption = mContentView.findViewById(R.id.erase_external_option_text);
+ externalOption.setVisibility(View.GONE);
+
+ final View externalAlsoErased = mContentView.findViewById(R.id.also_erases_external);
+ externalAlsoErased.setVisibility(View.VISIBLE);
+ } else {
+ mExternalStorageContainer.setOnClickListener(new View.OnClickListener() {
+
+ @Override
+ public void onClick(View v) {
+ mExternalStorage.toggle();
+ }
+ });
+ }
loadAccountList();
}