Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 2606f8d5 authored by Jim Miller's avatar Jim Miller Committed by Android (Google) Code Review
Browse files

Merge "Disable simple keyguard when notifications enabled."

parents 8198c3a8 cfa68b97

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

+2 −1
Original line number Diff line number Diff line
@@ -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) {