Update device admin example to wipe SD card.
Change-Id: I224006f284916761578e3d04b208828f80ea3cb6
diff --git a/samples/ApiDemos/res/layout/device_admin_sample.xml b/samples/ApiDemos/res/layout/device_admin_sample.xml
index 2827c01..16b08ce 100644
--- a/samples/ApiDemos/res/layout/device_admin_sample.xml
+++ b/samples/ApiDemos/res/layout/device_admin_sample.xml
@@ -99,21 +99,27 @@
</LinearLayout>
+ <Button android:id="@+id/force_lock"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/force_lock">
+ </Button>
+
<LinearLayout android:orientation="horizontal" android:gravity="center"
android:layout_width="match_parent" android:layout_height="wrap_content">
- <Button android:id="@+id/force_lock"
- android:layout_width="wrap_content" android:layout_height="wrap_content"
- android:layout_weight="0"
- android:text="@string/force_lock">
- </Button>
-
<Button android:id="@+id/wipe_data"
android:layout_width="wrap_content" android:layout_height="wrap_content"
android:layout_weight="0"
android:text="@string/wipe_data">
</Button>
+ <Button android:id="@+id/wipe_all_data"
+ android:layout_width="wrap_content" android:layout_height="wrap_content"
+ android:layout_weight="0"
+ android:text="@string/wipe_all_data">
+ </Button>
+
</LinearLayout>
<LinearLayout android:orientation="horizontal" android:gravity="center"
diff --git a/samples/ApiDemos/res/values/strings.xml b/samples/ApiDemos/res/values/strings.xml
index 949e91a..4e61b8f 100644
--- a/samples/ApiDemos/res/values/strings.xml
+++ b/samples/ApiDemos/res/values/strings.xml
@@ -479,6 +479,7 @@
<string name="max_failed_pw_hint">Password Attempts Wipe Data</string>
<string name="force_lock">Force Lock</string>
<string name="wipe_data">Wipe Data</string>
+ <string name="wipe_all_data">Wipe All Data</string>
<string name="timeout_hint">Max screen timeout</string>
<string name="set_timeout_label">Set Timeout</string>
diff --git a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
index f7ee2d7..b3fc2f9 100644
--- a/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
+++ b/samples/ApiDemos/src/com/example/android/apis/app/DeviceAdminSample.java
@@ -128,6 +128,7 @@
Button mForceLockButton;
Button mWipeDataButton;
+ Button mWipeAllDataButton;
private Button mTimeoutButton;
@@ -208,6 +209,8 @@
mForceLockButton.setOnClickListener(mForceLockListener);
mWipeDataButton = (Button)findViewById(R.id.wipe_data);
mWipeDataButton.setOnClickListener(mWipeDataListener);
+ mWipeAllDataButton = (Button)findViewById(R.id.wipe_all_data);
+ mWipeAllDataButton.setOnClickListener(mWipeDataListener);
mTimeout = (EditText) findViewById(R.id.timeout);
mTimeoutButton = (Button) findViewById(R.id.set_timeout);
@@ -226,6 +229,7 @@
mResetPasswordButton.setEnabled(true);
mForceLockButton.setEnabled(true);
mWipeDataButton.setEnabled(true);
+ mWipeAllDataButton.setEnabled(true);
} else {
mEnableButton.setEnabled(true);
mDisableButton.setEnabled(false);
@@ -236,6 +240,7 @@
mResetPasswordButton.setEnabled(false);
mForceLockButton.setEnabled(false);
mWipeDataButton.setEnabled(false);
+ mWipeAllDataButton.setEnabled(false);
}
}
@@ -372,7 +377,7 @@
};
private OnClickListener mWipeDataListener = new OnClickListener() {
- public void onClick(View v) {
+ public void onClick(final View v) {
if (mAM.isUserAMonkey()) {
// Don't trust monkeys to do the right thing!
AlertDialog.Builder builder = new AlertDialog.Builder(Controller.this);
@@ -386,14 +391,22 @@
builder.setPositiveButton("Yes", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
AlertDialog.Builder builder = new AlertDialog.Builder(Controller.this);
- builder.setMessage("This is not a test. "
- + "This WILL erase all of your data! "
- + "Are you really absolutely sure?");
+ if (v == mWipeAllDataButton) {
+ builder.setMessage("This is not a test. "
+ + "This WILL erase all of your data, "
+ + "including external storage! "
+ + "Are you really absolutely sure?");
+ } else {
+ builder.setMessage("This is not a test. "
+ + "This WILL erase all of your data! "
+ + "Are you really absolutely sure?");
+ }
builder.setPositiveButton("BOOM!", new DialogInterface.OnClickListener() {
public void onClick(DialogInterface dialog, int which) {
boolean active = mDPM.isAdminActive(mDeviceAdminSample);
if (active) {
- mDPM.wipeData(0);
+ mDPM.wipeData(v == mWipeAllDataButton
+ ? DevicePolicyManager.WIPE_EXTERNAL_STORAGE : 0);
}
}
});
