diff options
| author | Andy Stadler <stadler@google.com> | 2011-01-31 19:21:37 -0800 |
|---|---|---|
| committer | Andy Stadler <stadler@google.com> | 2011-01-31 19:21:37 -0800 |
| commit | 13d62049f7c96c47356f23eaee7f0997612fdf9f (patch) | |
| tree | 4c5b1d4b8245a95544097b99895a89d5d287be3d /src/com/android/settings/CryptKeeperConfirm.java | |
| parent | ba681faf73906dcc9c372008855667437b034cc4 (diff) | |
| download | packages_apps_Settings-13d62049f7c96c47356f23eaee7f0997612fdf9f.tar.gz packages_apps_Settings-13d62049f7c96c47356f23eaee7f0997612fdf9f.tar.bz2 packages_apps_Settings-13d62049f7c96c47356f23eaee7f0997612fdf9f.zip | |
More CryptKeeper UI work.
* Implemented failure case.
* More pixel perfect
* Remove the animation
* Display the encroid on the blank screen
* Remove the back button.
* Fix portrait mode screens
Bug: 3384231
Bug: 3394103
Bug: 3388721
Bug: 3381450
Bug: 3406278
Bug: 3351832
Change-Id: Ib763c8b577198deb45255acc767bc6d5409efc0c
Diffstat (limited to 'src/com/android/settings/CryptKeeperConfirm.java')
| -rw-r--r-- | src/com/android/settings/CryptKeeperConfirm.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/settings/CryptKeeperConfirm.java b/src/com/android/settings/CryptKeeperConfirm.java index 0269c2b57d..53688f4415 100644 --- a/src/com/android/settings/CryptKeeperConfirm.java +++ b/src/com/android/settings/CryptKeeperConfirm.java @@ -41,6 +41,8 @@ public class CryptKeeperConfirm extends Fragment { public void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setContentView(R.layout.crypt_keeper_blank); + if (Utils.isMonkeyRunning()) { finish(); } @@ -50,7 +52,8 @@ public class CryptKeeperConfirm extends Fragment { | StatusBarManager.DISABLE_NOTIFICATION_ICONS | StatusBarManager.DISABLE_NOTIFICATION_ALERTS | StatusBarManager.DISABLE_SYSTEM_INFO - | StatusBarManager.DISABLE_NAVIGATION); + | StatusBarManager.DISABLE_NAVIGATION + | StatusBarManager.DISABLE_BACK); // Post a delayed message in 700 milliseconds to enable encryption. // NOTE: The animation on this activity is set for 500 milliseconds |