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

Commit 3b775cf5 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Not bypassing when the user is expanding quick settings" into qt-r1-dev am: cd29fce3 

am: d65ffe9c

Change-Id: Ie5915412775d0076bdee14e272e2a271cad44daf
parents 7ef9d3e3 d65ffe9c

packages/SystemUI/src/com/android/systemui/statusbar/phone/KeyguardBypassController.kt

+9 −1
Original line number Diff line number Diff line
@@ -49,6 +49,14 @@ class KeyguardBypassController { 
        private set



    var bouncerShowing: Boolean = false

    var qSExpanded = false

        set(value) {

            val changed = field != value

            field = value

            if (changed && !value) {

                maybePerformPendingUnlock()

            }

        }



    @Inject

    constructor(context: Context, tunerService: TunerService,
@@ -98,7 +106,7 @@ class KeyguardBypassController { 
                // to unlock

                return false

            }

            if (isPulseExpanding) {

            if (isPulseExpanding || qSExpanded) {

                pendingUnlockType = biometricSourceType

                return false

            }

packages/SystemUI/src/com/android/systemui/statusbar/phone/NotificationPanelView.java

+1 −0
Original line number Diff line number Diff line
@@ -1387,6 +1387,7 @@ public class NotificationPanelView extends PanelView implements 
            mStatusBar.setQsExpanded(expanded);

            mNotificationContainerParent.setQsExpanded(expanded);

            mPulseExpansionHandler.setQsExpanded(expanded);

            mKeyguardBypassController.setQSExpanded(expanded);

        }

    }