commit | dbf4322ab1cf39d123334a7778c7ccc8942ada74 | [log] [tgz] |
---|---|---|
author | Jason parks <jparks@google.com> | Thu Jan 20 18:49:58 2011 -0600 |
committer | Jason parks <jparks@google.com> | Fri Jan 21 13:52:18 2011 -0600 |
tree | c61c7a6cfc5fa8cbc9be571d7f02b82f16bfd860 | |
parent | 5dc460e407b782fc8f2cbc5167bfe40eff50a74c [diff] [blame] |
Change how we check to see if we should display the progress bar. Change-Id: I779e229f82a11d570e832f3e8cc5b275939249e8
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 @@ // 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 {