diff options
| author | Jim Miller <jaggies@google.com> | 2014-02-25 15:36:13 -0800 |
|---|---|---|
| committer | Jim Miller <jaggies@google.com> | 2014-02-25 15:36:13 -0800 |
| commit | cfa68b977c9f9ab74c1eac42dac8be31c3ea84df (patch) | |
| tree | d89aa8b6eed0773495c78c403745c8c838f26c82 /packages/Keyguard | |
| parent | a1f1a3c573acd91024fda0ceb3b921c73b186963 (diff) | |
| download | frameworks_base-cfa68b977c9f9ab74c1eac42dac8be31c3ea84df.zip frameworks_base-cfa68b977c9f9ab74c1eac42dac8be31c3ea84df.tar.gz frameworks_base-cfa68b977c9f9ab74c1eac42dac8be31c3ea84df.tar.bz2 | |
Disable simple keyguard when notifications enabled.
Enabling notifications on keyguard tripped keyguard into simple
mode which isn't ready for prime-time. Disabled with variable.
Fixes bug 13172958
Change-Id: Ia281b06d754cd62455010f9e31c0ee81e4937977
Diffstat (limited to 'packages/Keyguard')
| -rw-r--r-- | packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java b/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java index 43165eb..40087cd 100644 --- a/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java +++ b/packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java @@ -71,6 +71,7 @@ public class KeyguardViewManager { // Timeout used for keypresses static final int DIGIT_PRESS_WAKE_MILLIS = 5000; + private static final boolean ENABLE_SIMPLE_KEYGUARD = false; private final Context mContext; private final ViewManager mViewManager; @@ -312,7 +313,7 @@ public class KeyguardViewManager { if (force || mKeyguardView == null) { mKeyguardHost.setCustomBackground(null); mKeyguardHost.removeAllViews(); - int layout = allowNotificationsOnSecureKeyguard() + int layout = (allowNotificationsOnSecureKeyguard() && ENABLE_SIMPLE_KEYGUARD) ? R.layout.keyguard_simple_host_view : R.layout.keyguard_host_view; if (mCurrentLayout != layout) { |