From f72c65d7064b7ca83571350986f2927fc3f8cbbd Mon Sep 17 00:00:00 2001
From: Jim Miller <jaggies@google.com>
Date: Fri, 15 Oct 2010 12:42:00 -0700
Subject: [PATCH 1/6] Fix 3100926: Prevent proguard from stripping OwnerInfo

This just renames OwnerInfo to OwnerInfoSettings so the existing
proguard rule picks it up.

Change-Id: Ie5682d77e8efe22a922bf750d4689cafd50e7a65
---
 res/xml/settings_headers.xml                                    | 2 +-
 .../android/settings/{OwnerInfo.java => OwnerInfoSettings.java} | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
 rename src/com/android/settings/{OwnerInfo.java => OwnerInfoSettings.java} (98%)

diff --git a/res/xml/settings_headers.xml b/res/xml/settings_headers.xml
index 0292f5ffbdd..5869a37095b 100644
--- a/res/xml/settings_headers.xml
+++ b/res/xml/settings_headers.xml
@@ -159,7 +159,7 @@
     <!-- Owner info -->
 
     <header
-        android:fragment="com.android.settings.OwnerInfo"
+        android:fragment="com.android.settings.OwnerInfoSettings"
         android:icon="@drawable/ic_settings_about"
         android:title="@string/owner_info_settings_title">
     </header>
diff --git a/src/com/android/settings/OwnerInfo.java b/src/com/android/settings/OwnerInfoSettings.java
similarity index 98%
rename from src/com/android/settings/OwnerInfo.java
rename to src/com/android/settings/OwnerInfoSettings.java
index 3cfebe35293..a6df7e36fd1 100644
--- a/src/com/android/settings/OwnerInfo.java
+++ b/src/com/android/settings/OwnerInfoSettings.java
@@ -30,7 +30,7 @@ import android.widget.CompoundButton;
 import android.widget.EditText;
 import android.widget.CompoundButton.OnCheckedChangeListener;
 
-public class OwnerInfo extends Fragment {
+public class OwnerInfoSettings extends Fragment {
     private View mView;
     private CheckBox mCheckbox;
     private EditText mEditText;

From 7d655362a006faed351b1c4f414a00aa9caae4c9 Mon Sep 17 00:00:00 2001
From: Ying Wang <wangying@google.com>
Date: Tue, 23 Nov 2010 12:03:43 -0800
Subject: [PATCH 2/6] Move icons to mipmap.

Change-Id: If3bd32658300cb028411d1aa7a3f56d8c1d234eb
---
 AndroidManifest.xml                                 |   2 +-
 res/layout/settings_actionbar.xml                   |   2 +-
 .../ic_launcher_settings.png                        | Bin
 .../ic_launcher_settings.png                        | Bin
 src/com/android/settings/CreateShortcut.java        |   2 +-
 5 files changed, 3 insertions(+), 3 deletions(-)
 rename res/{drawable-hdpi => mipmap-hdpi}/ic_launcher_settings.png (100%)
 rename res/{drawable-mdpi => mipmap-mdpi}/ic_launcher_settings.png (100%)

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 38579b69e14..1638c9088d6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -43,7 +43,7 @@
     <uses-permission android:name="android.permission.MOVE_PACKAGE" />
 
     <application android:label="@string/settings_label"
-            android:icon="@drawable/ic_launcher_settings"
+            android:icon="@mipmap/ic_launcher_settings"
             android:taskAffinity=""
             android:hardwareAccelerated="true">
 
diff --git a/res/layout/settings_actionbar.xml b/res/layout/settings_actionbar.xml
index 63880255144..711a0a15ddb 100644
--- a/res/layout/settings_actionbar.xml
+++ b/res/layout/settings_actionbar.xml
@@ -23,7 +23,7 @@
         android:layout_height="match_parent">
 
     <!-- ImageView
-            android:src="@drawable/ic_launcher_settings"
+            android:src="@mipmap/ic_launcher_settings"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_vertical"
diff --git a/res/drawable-hdpi/ic_launcher_settings.png b/res/mipmap-hdpi/ic_launcher_settings.png
similarity index 100%
rename from res/drawable-hdpi/ic_launcher_settings.png
rename to res/mipmap-hdpi/ic_launcher_settings.png
diff --git a/res/drawable-mdpi/ic_launcher_settings.png b/res/mipmap-mdpi/ic_launcher_settings.png
similarity index 100%
rename from res/drawable-mdpi/ic_launcher_settings.png
rename to res/mipmap-mdpi/ic_launcher_settings.png
diff --git a/src/com/android/settings/CreateShortcut.java b/src/com/android/settings/CreateShortcut.java
index 5ca63706b29..0312a4bccd2 100644
--- a/src/com/android/settings/CreateShortcut.java
+++ b/src/com/android/settings/CreateShortcut.java
@@ -38,7 +38,7 @@ public class CreateShortcut extends LauncherActivity {
         shortcutIntent.setFlags(Intent.FLAG_ACTIVITY_RESET_TASK_IF_NEEDED);
         Intent intent = new Intent();
         intent.putExtra(Intent.EXTRA_SHORTCUT_ICON_RESOURCE,
-                Intent.ShortcutIconResource.fromContext(this, R.drawable.ic_launcher_settings));
+                Intent.ShortcutIconResource.fromContext(this, R.mipmap.ic_launcher_settings));
         intent.putExtra(Intent.EXTRA_SHORTCUT_INTENT, shortcutIntent);
         intent.putExtra(Intent.EXTRA_SHORTCUT_NAME, itemForPosition(position).label);
         setResult(RESULT_OK, intent);

From 4eb88da595e70ee5df9f4aaea5402b51e120ca88 Mon Sep 17 00:00:00 2001
From: Irfan Sheriff <isheriff@google.com>
Date: Fri, 3 Dec 2010 15:56:02 -0800
Subject: [PATCH 3/6] scan immediately when user indicates so

Bug: 3242989
Change-Id: Ia15d7a61a40b64830a7840b7d31e6b5f96b2ad78
---
 src/com/android/settings/wifi/WifiSettings.java | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/wifi/WifiSettings.java b/src/com/android/settings/wifi/WifiSettings.java
index ff4f390638a..bb3364162b1 100644
--- a/src/com/android/settings/wifi/WifiSettings.java
+++ b/src/com/android/settings/wifi/WifiSettings.java
@@ -240,7 +240,7 @@ public class WifiSettings extends SettingsPreferenceFragment
         switch (item.getItemId()) {
             case MENU_ID_SCAN:
                 if (mWifiManager.isWifiEnabled()) {
-                    mScanner.resume();
+                    mScanner.forceScan();
                 }
                 return true;
             case MENU_ID_ADVANCED:
@@ -497,6 +497,10 @@ public class WifiSettings extends SettingsPreferenceFragment
             }
         }
 
+        void forceScan() {
+            sendEmptyMessage(0);
+        }
+
         void pause() {
             mRetry = 0;
             mAccessPoints.setProgress(false);

From 5a0214e707cf3db3bb97404f720bf85c6cb0b79f Mon Sep 17 00:00:00 2001
From: Jason parks <jparks@google.com>
Date: Fri, 21 Jan 2011 15:48:20 -0600
Subject: [PATCH 4/6] Accquire a wakelock while encrypting.

Bug: 3375491
Change-Id: Ief7dbb450800104f4977ab31f93a1e1a994b25ad
---
 src/com/android/settings/CryptKeeper.java | 52 ++++++++++++++---------
 1 file changed, 31 insertions(+), 21 deletions(-)

diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 88b344e9906..a8b8f2a6b68 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -30,6 +30,7 @@ import android.os.Bundle;
 import android.os.Handler;
 import android.os.IBinder;
 import android.os.Message;
+import android.os.PowerManager;
 import android.os.ServiceManager;
 import android.os.SystemProperties;
 import android.os.storage.IMountService;
@@ -46,7 +47,7 @@ import java.util.Date;
 
 public class CryptKeeper extends Activity implements TextView.OnEditorActionListener {
     private static final String TAG = "CryptKeeper";
-    
+
     private static final String DECRYPT_STATE = "trigger_restart_framework";
 
     private static final int UPDATE_PROGRESS = 1;
@@ -60,15 +61,15 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
     private Handler mHandler = new Handler() {
         @Override
         public void handleMessage(Message msg) {
-            
+
             switch (msg.what) {
-            
+
             case UPDATE_PROGRESS:
                 String state = SystemProperties.get("vold.encrypt_progress");
-                
+
                 ProgressBar progressBar = (ProgressBar) findViewById(R.id.progress_bar);
                 progressBar.setProgress(0);
-                
+
                 try {
                     int progress = Integer.parseInt(state);
                     progressBar.setProgress(progress);
@@ -79,21 +80,21 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
                 // Check the status every 1 second
                 sendEmptyMessageDelayed(0, 1000);
                 break;
-            
+
             case COOLDOWN:
                 TextView tv = (TextView) findViewById(R.id.status);
                 if (mCooldown <= 0) {
                     // Re-enable the password entry
                     EditText passwordEntry = (EditText) findViewById(R.id.passwordEntry);
                     passwordEntry.setEnabled(true);
-                    
+
                     tv.setText(R.string.try_again);
-                    
+
                 } else {
-                    
+
                     CharSequence tempalte = getText(R.string.crypt_keeper_cooldown);
                     tv.setText(TextUtils.expandTemplate(tempalte, Integer.toString(mCooldown)));
-                    
+
                     mCooldown--;
                     mHandler.sendEmptyMessageDelayed(COOLDOWN, 1000); // Tick every second
                 }
@@ -101,23 +102,23 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             }
         }
     };
-    
+
     private int mFailedAttempts = 0;
     private int mCooldown;
-    
+
     @Override
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        
+
         String state = SystemProperties.get("vold.decrypt");
         if ("".equals(state) || DECRYPT_STATE.equals(state)) {
-            // Disable the crypt keeper. 
+            // Disable the crypt keeper.
             PackageManager pm = getPackageManager();
             ComponentName name = new ComponentName(this, CryptKeeper.class);
             pm.setComponentEnabledSetting(name, PackageManager.COMPONENT_ENABLED_STATE_DISABLED, 0);
             return;
         }
-        
+
         // Check to see why we were started.
         String progress = SystemProperties.get("vold.encrypt_progress");
         if ("startup".equals(progress)) {
@@ -128,17 +129,26 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             passwordEntryInit();
         }
     }
-    
+
     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.
+
+        PowerManager pm = (PowerManager) getSystemService(Context.POWER_SERVICE);
+        PowerManager.WakeLock wakeLock = pm.newWakeLock(PowerManager.PARTIAL_WAKE_LOCK, TAG);
+
+        wakeLock.acquire();
+
         mHandler.sendEmptyMessage(UPDATE_PROGRESS);
     }
-    
+
     private void passwordEntryInit() {
         TextView passwordEntry = (TextView) findViewById(R.id.passwordEntry);
         passwordEntry.setOnEditorActionListener(this);
-        
+
         KeyboardView keyboardView = (PasswordEntryKeyboardView) findViewById(R.id.keyboard);
-        
+
         PasswordEntryKeyboardHelper keyboardHelper = new PasswordEntryKeyboardHelper(this,
                 keyboardView, passwordEntry, false);
         keyboardHelper.setKeyboardMode(PasswordEntryKeyboardHelper.KEYBOARD_MODE_ALPHA);
@@ -175,7 +185,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             if (TextUtils.isEmpty(password)) {
                 return true;
             }
-            
+
             // Now that we have the password clear the password field.
             v.setText(null);
 
@@ -203,7 +213,7 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             } catch (Exception e) {
                 Log.e(TAG, "Error while decrypting...", e);
             }
-            
+
             return true;
         }
         return false;

From c9bc0db40d840f29f1b3c2529644460c9a335cca Mon Sep 17 00:00:00 2001
From: Jason parks <jparks@google.com>
Date: Thu, 20 Jan 2011 23:29:28 -0600
Subject: [PATCH 5/6] More UI tweaks and fixes.

* Actually post the correct message every 5 second for the progress bar.
* Update the text for the settings to a more finalish version.
* Check the battery status before allowing encryption to proceed.
* Display a place holder message if no password is set for the device.

Change-Id: I2734300c9a81467dbd0401427d8b656922ab4819
---
 res/values/strings.xml                        |   4 +-
 src/com/android/settings/CryptKeeper.java     |  26 ++--
 .../android/settings/CryptKeeperSettings.java | 115 +++++++++++-------
 3 files changed, 86 insertions(+), 59 deletions(-)

diff --git a/res/values/strings.xml b/res/values/strings.xml
index 472b391ff47..282ce8dd08a 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -587,12 +587,12 @@
     <string name="crypt_keeper_encrypt_summary">Requires you to set a device unlock pin or password</string>
     <string name="crypt_keeper_confirm_title">Confirm encrypt</string>
     
-    <string name="crypt_keeper_desc">Device encryption will convert user data to an ecrypted state, including your accounts, system data, downloaded applications and data, photos, movies, musics, etc.\n\nEncyrption cannot be undone without performing a factory data reset, which would then erase all data.\n\nYou must set up a device lock pin or password to proceed.\n\nThis operation may take up to an hour and may not be interrupted. You must have a fully charged battery and plug in the device to initiate encryption. Running out of power during encryption will cause data loss.</string>
+    <string name="crypt_keeper_desc">You can encrypt your accounts, settings, downloaded applications and their data, media, and other files. Once you encrypt your tablet, you can\'t unencrypt it except by performing a factory data reset, erasing all the data on your tablet.\n\nEncryption takes up to an hour. You must start with a charged battery and keep your tablet plugged in until encryption is complete. If you interrupt the encryption process, you will lose some or all of your data.</string>
     
     <string name="crypt_keeper_button_text" product="tablet">Encrypt tablet</string>
     <string name="crypt_keeper_button_text" product="default">Encrypt phone</string>
     
-    <string name="crypt_keeper_final_desc">Encrypt user data? This operation is not reversible and may not be interrupted without loos of data! Encryption may take up to an hour.</string>
+    <string name="crypt_keeper_final_desc">Encrypt user data? This operation is not reversible and may not be interrupted without loss of data! Encryption may take up to an hour.</string>
     
     <string name="crypt_keeper_setup_title">Encrypting</string>
 
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index a8b8f2a6b68..737c92ab1e2 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -76,9 +76,9 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
                 } catch (Exception e) {
                     Log.w(TAG, "Error parsing progress: " + e.toString());
                 }
-                
-                // Check the status every 1 second
-                sendEmptyMessageDelayed(0, 1000);
+
+                // Check the status every 5 second
+                sendEmptyMessageDelayed(UPDATE_PROGRESS, 5000);
                 break;
 
             case COOLDOWN:
@@ -128,6 +128,12 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             setContentView(R.layout.crypt_keeper_password_entry);
             passwordEntryInit();
         }
+
+        // Disable the status bar
+        StatusBarManager sbm = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
+        sbm.disable(StatusBarManager.DISABLE_EXPAND | StatusBarManager.DISABLE_NOTIFICATION_ICONS
+                | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
+                | StatusBarManager.DISABLE_SYSTEM_INFO | StatusBarManager.DISABLE_NAVIGATION);
     }
 
     private void encryptionProgressInit() {
@@ -160,12 +166,6 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
         String dateFormatString = getString(com.android.internal.R.string.full_wday_month_day_no_year);
         TextView date = (TextView) findViewById(R.id.date);
         date.setText(DateFormat.format(dateFormatString, new Date()));
-
-        // Disable the status bar
-        StatusBarManager sbm = (StatusBarManager) getSystemService(Context.STATUS_BAR_SERVICE);
-        sbm.disable(StatusBarManager.DISABLE_EXPAND | StatusBarManager.DISABLE_NOTIFICATION_ICONS
-                | StatusBarManager.DISABLE_NOTIFICATION_ALERTS
-                | StatusBarManager.DISABLE_SYSTEM_INFO | StatusBarManager.DISABLE_NAVIGATION);
     }
 
     private IMountService getMountService() {
@@ -193,12 +193,10 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
             try {
                 service.decryptStorage(password);
 
-                // For now the only way to get here is for the password to be
-                // wrong.
+                if (mFailedAttempts == 0) {
+                    // Success. Do something here within 2 seconds
 
-                mFailedAttempts++;
-                
-                if (mFailedAttempts == MAX_FAILED_ATTEMPTS) {
+                } else if (mFailedAttempts == MAX_FAILED_ATTEMPTS) {
                     // Factory reset the device.
                     sendBroadcast(new Intent("android.intent.action.MASTER_CLEAR"));
                 } else if ((mFailedAttempts % COOL_DOWN_ATTEMPTS) == 0) {
diff --git a/src/com/android/settings/CryptKeeperSettings.java b/src/com/android/settings/CryptKeeperSettings.java
index 8b60ca7b21d..26483ec37f4 100644
--- a/src/com/android/settings/CryptKeeperSettings.java
+++ b/src/com/android/settings/CryptKeeperSettings.java
@@ -17,9 +17,14 @@
 package com.android.settings;
 
 import android.app.Activity;
+import android.app.AlertDialog;
 import android.app.Fragment;
+import android.content.BroadcastReceiver;
+import android.content.Context;
 import android.content.Intent;
+import android.content.IntentFilter;
 import android.content.res.Resources;
+import android.os.BatteryManager;
 import android.os.Bundle;
 import android.preference.Preference;
 import android.preference.PreferenceActivity;
@@ -45,6 +50,72 @@ public class CryptKeeperSettings extends Fragment {
 
     private View mContentView;
     private Button mInitiateButton;
+    private IntentFilter mIntentFilter;
+
+    private BroadcastReceiver mIntentReceiver = new BroadcastReceiver() {
+        @Override
+        public void onReceive(Context context, Intent intent) {
+            String action = intent.getAction();
+            if (action.equals(Intent.ACTION_BATTERY_CHANGED)) {
+                int level = intent.getIntExtra("level", 0);
+                int status = intent.getIntExtra("status", BatteryManager.BATTERY_STATUS_UNKNOWN);
+
+                if (status == BatteryManager.BATTERY_STATUS_CHARGING && level >= 80) {
+                    mInitiateButton.setEnabled(true);
+                } else {
+                    mInitiateButton.setEnabled(false);
+                }
+            }
+        }
+    };
+
+    /**
+     * If the user clicks to begin the reset sequence, we next require a
+     * keyguard confirmation if the user has currently enabled one.  If there
+     * is no keyguard available, we prompt the user to set a password.
+     */
+    private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
+
+        public void onClick(View v) {
+            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
+                // TODO remove with proper flow
+                new AlertDialog.Builder(getActivity())
+                    .setTitle("No password set")
+                    .setIcon(android.R.drawable.ic_dialog_alert)
+                    .setMessage("Before you enable encryption you must set a device password.")
+                    .setPositiveButton(android.R.string.ok, null)
+                    .create()
+                    .show();
+            }
+        }
+    };
+
+
+    @Override
+    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
+        mContentView = inflater.inflate(R.layout.crypt_keeper_settings, null);
+
+        mIntentFilter = new IntentFilter();
+        mIntentFilter.addAction(Intent.ACTION_BATTERY_CHANGED);
+
+        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_encrypt);
+        mInitiateButton.setOnClickListener(mInitiateListener);
+        mInitiateButton.setEnabled(false);
+
+        return mContentView;
+    }
+
+    @Override
+    public void onResume() {
+        super.onResume();
+        getActivity().registerReceiver(mIntentReceiver, mIntentFilter);
+    }
+
+    @Override
+    public void onPause() {
+        super.onPause();
+        getActivity().unregisterReceiver(mIntentReceiver);
+    }
 
     /**
      * Keyguard validation is run using the standard {@link ConfirmLockPattern}
@@ -67,14 +138,12 @@ public class CryptKeeperSettings extends Fragment {
         if (requestCode != KEYGUARD_REQUEST) {
             return;
         }
-        
+
         // If the user entered a valid keyguard trace, present the final
         // confirmation prompt; otherwise, go back to the initial state.
         if (resultCode == Activity.RESULT_OK) {
             String password = data.getStringExtra("password");
             showFinalConfirmation(password);
-        } else {
-            establishInitialState();
         }
     }
 
@@ -85,45 +154,5 @@ public class CryptKeeperSettings extends Fragment {
         preference.getExtras().putString("password", password);
         ((PreferenceActivity) getActivity()).onPreferenceStartFragment(null, preference);
     }
-
-    /**
-     * If the user clicks to begin the reset sequence, we next require a
-     * keyguard confirmation if the user has currently enabled one.  If there
-     * is no keyguard available, we simply go to the final confirmation prompt.
-     */
-    private Button.OnClickListener mInitiateListener = new Button.OnClickListener() {
-
-        public void onClick(View v) {
-            if (!runKeyguardConfirmation(KEYGUARD_REQUEST)) {
-                // TODO: Need to request a password
-               // showFinalConfirmation();
-            }
-        }
-    };
-
-    /**
-     * In its initial state, the activity presents a button for the user to
-     * click in order to initiate a confirmation sequence.  This method is
-     * called from various other points in the code to reset the activity to
-     * this base state.
-     *
-     * <p>Reinflating views from resources is expensive and prevents us from
-     * caching widget pointers, so we use a single-inflate pattern:  we lazy-
-     * inflate each view, caching all of the widget pointers we'll need at the
-     * time, then simply reuse the inflated views directly whenever we need
-     * to change contents.
-     */
-    private void establishInitialState() {
-        mInitiateButton = (Button) mContentView.findViewById(R.id.initiate_encrypt);
-        mInitiateButton.setOnClickListener(mInitiateListener);
-    }
-
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedState) {
-        mContentView = inflater.inflate(R.layout.crypt_keeper_settings, null);
-
-        establishInitialState();
-        return mContentView;
-    }
 }
 

From d408d8c740b0c27a4bc4119799843880f31f8264 Mon Sep 17 00:00:00 2001
From: Jason parks <jparks@google.com>
Date: Thu, 20 Jan 2011 18:49:58 -0600
Subject: [PATCH 6/6] Change how we check to see if we should display the
 progress bar.

Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8
---
 src/com/android/settings/CryptKeeper.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 737c92ab1e2..3917b76e6f8 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -121,7 +121,8 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
 
         // Check to see why we were started.
         String progress = SystemProperties.get("vold.encrypt_progress");
-        if ("startup".equals(progress)) {
+
+        if (!"".equals(progress)) {
             setContentView(R.layout.crypt_keeper_progress);
             encryptionProgressInit();
         } else {