commit 2606f8d54ad01e00a9cf83b7dae70dabe624e11f
author Jim Miller <jaggies@google.com> Tue Feb 25 23:39:40 2014 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Feb 25 23:39:40 2014 +0000
tree 334de8bdc3e661c52d951fd6ec6bf157ffa25429
parent 8198c3a8f525c07e2b848852f6ad3e351e3b5461
parent cfa68b977c9f9ab74c1eac42dac8be31c3ea84df

Merge "Disable simple keyguard when notifications enabled."

packages/Keyguard/src/com/android/keyguard/KeyguardViewManager.java

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 @@
 
     // 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 @@
         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) {