 +    public void onStop() {
 +        super.onStop();
 +        mHandler.removeMessages(MESSAGE_COOLDOWN);
-+        mHandler.removeMessages(MESSAGE_UPDATE_PROGRESS);
 +        mHandler.removeMessages(MESSAGE_NOTIFY);
 +    }
 +

+}
diff --git a/src/com/android/settings/EncryptUser.java b/src/com/android/settings/EncryptUser.java
new file mode 100644
index 0000000..9c67d29
--- /dev/null
+++ b/src/com/android/settings/EncryptUser.java
@@ -0,0 +1,684 @@
+package com.android.settings;
+
+import android.app.Activity;

 ...gs_unecrypted_device_encrypted_primary_user.xml |   39 ++
 res/xml/security_settings_unencrypted.xml          |    6 +-
 src/com/android/settings/CryptKeeper.java          |   12 +-
 src/com/android/settings/DecryptUserConfirm.java   |  102 ++++
 src/com/android/settings/EncryptUser.java          |  634 ++++++++++++++++++++
 src/com/android/settings/EncryptUserConfirm.java   |  136 +++++
 src/com/android/settings/EncryptUserSettings.java  |  223 +++++++
 src/com/android/settings/SecuritySettings.java     |   33 +-
 src/com/android/settings/Settings.java             |    2 +
 22 files changed, 1949 insertions(+), 3 deletions(-)
 create mode 100644 res/layout/decrypt_user_confirm.xml
 create mode 100644 res/layout/decrypt_user_settings.xml
 create mode 100644 res/layout/encrypt_user_blank.xml
