summaryrefslogtreecommitdiffstats
path: root/src/com/android/settings/CryptKeeper.java
diff options
context:
space:
mode:
authorJason parks <jparks@google.com>2011-01-20 18:49:58 -0600
committerJason parks <jparks@google.com>2011-01-21 13:52:18 -0600
commitdbf4322ab1cf39d123334a7778c7ccc8942ada74 (patch)
treec61c7a6cfc5fa8cbc9be571d7f02b82f16bfd860 /src/com/android/settings/CryptKeeper.java
parent5dc460e407b782fc8f2cbc5167bfe40eff50a74c (diff)
downloadpackages_apps_settings-dbf4322ab1cf39d123334a7778c7ccc8942ada74.zip
packages_apps_settings-dbf4322ab1cf39d123334a7778c7ccc8942ada74.tar.gz
packages_apps_settings-dbf4322ab1cf39d123334a7778c7ccc8942ada74.tar.bz2
Change how we check to see if we should display the progress bar.
Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8
Diffstat (limited to 'src/com/android/settings/CryptKeeper.java')
-rw-r--r--src/com/android/settings/CryptKeeper.java3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeper.java b/src/com/android/settings/CryptKeeper.java
index 88b344e..25bb242 100644
--- a/src/com/android/settings/CryptKeeper.java
+++ b/src/com/android/settings/CryptKeeper.java
@@ -120,7 +120,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 {