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

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

Merge "Merge "Not bypassing while the camera is being launched" into qt-r1-dev... 

Merge "Merge "Not bypassing while the camera is being launched" into qt-r1-dev am: a19fbdf5" into qt-r1-dev-plus-aosp
am: d16afdfd

Change-Id: If76497558066e9da7b45337e1d9c55566b1ab78d
parents f178783e d16afdfd

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

+4 −0
Original line number Diff line number Diff line
@@ -49,6 +49,7 @@ class KeyguardBypassController { 
        private set



    var bouncerShowing: Boolean = false

    var launchingAffordance: Boolean = false

    var qSExpanded = false

        set(value) {

            val changed = field != value
@@ -106,6 +107,9 @@ class KeyguardBypassController { 
                // to unlock

                return false

            }

            if (launchingAffordance) {

                return false

            }

            if (isPulseExpanding || qSExpanded) {

                pendingUnlockType = biometricSourceType

                return false

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

+2 −2
Original line number Diff line number Diff line
@@ -2913,7 +2913,6 @@ public class NotificationPanelView extends PanelView implements 
        // nor setting these flags, since the occluded state doesn't change anymore, hence it's

        // never reset.

        if (!isFullyCollapsed()) {

            mLaunchingAffordance = true;

            setLaunchingAffordance(true);

        } else {

            animate = false;
@@ -2923,7 +2922,6 @@ public class NotificationPanelView extends PanelView implements 
    }



    public void onAffordanceLaunchEnded() {

        mLaunchingAffordance = false;

        setLaunchingAffordance(false);

    }
@@ -2932,8 +2930,10 @@ public class NotificationPanelView extends PanelView implements 
     * launched via a camera gesture.

     */

    private void setLaunchingAffordance(boolean launchingAffordance) {

        mLaunchingAffordance = launchingAffordance;

        getLeftIcon().setLaunchingAffordance(launchingAffordance);

        getRightIcon().setLaunchingAffordance(launchingAffordance);

        mKeyguardBypassController.setLaunchingAffordance(launchingAffordance);

        if (mAffordanceLaunchListener != null) {

            mAffordanceLaunchListener.accept(launchingAffordance);

        }