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

Commit ae2702d1 authored by Selim Cinek's avatar Selim Cinek
Browse files

Not bypassing when the user is expanding quick settings 

Previously we would also bypass when the user would
look at QS.

Fixes: 134094877
Test: pull down QS, wait on bypass, nothing happens!
Change-Id: I0b2ec98f3c361307845c16cc27866c6f3b3d4136
parent 5dc581ae

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
@@ -1384,6 +1384,7 @@ public class NotificationPanelView extends PanelView implements 
            mStatusBar.setQsExpanded(expanded);

            mNotificationContainerParent.setQsExpanded(expanded);

            mPulseExpansionHandler.setQsExpanded(expanded);

            mKeyguardBypassController.setQSExpanded(expanded);

        }

    }