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

+        }
+    }
+
+    /**
+     * Start encrypting the device.
+     */
+    private void encryptionProgressInit() {
+        // Accquire a partial wakelock to prevent the device from sleeping. Note
+        // we never release this wakelock as we will be restarted after the device
+        // is encrypted.
+        Log.d(TAG, "Encryption progress screen initializing.");
+        if (mWakeLock == null) {
+            Log.d(TAG, "Acquiring wakelock.");
+            PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+            mWakeLock = pm.newWakeLock(PowerManager.FULL_WAKE_LOCK, TAG);
+            mWakeLock.acquire();
+        }
+
+        ((ProgressBar) findViewById(R.id.progress_bar)).setIndeterminate(true);
+        // Ignore all back presses from now, both hard and soft keys.
+        mIgnoreBack = true;
+        // Start the first run of progress manually. This method sets up messages to occur at
+        // repeated intervals.
+        updateProgress();
+    }
+
+    private void showFactoryReset() {
+        // Hide the encryption-bot to make room for the "factory reset" button
+        findViewById(R.id.encroid).setVisibility(View.GONE);

+    private static final String TAG = "EncryptUser";
+    private static final int NOT_ENCRYPTED = 1;
+    private static final int ENCRYPTION_COMPLETED = 3;
+    /** Message sent to us to cool-down (waste user's time between password attempts) */
+    private static final int MESSAGE_COOLDOWN = 2;
+    /** Message sent to us to indicate alerting the user that we are waiting for password entry */
