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

Commit 81eba931 authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

Merge "Assist: Only call lockscreenShown when it is actually shown" into oc-dr1-dev am: bc3c1d01 

am: 2674ad2e

Change-Id: I7089df088a5c7f684af50ede67dbd11df984fc5d
parents c38b519f 2674ad2e

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -4224,6 +4224,7 @@ public class StatusBar extends SystemUI implements DemoMode, 
    public void showKeyguard() {

    public void showKeyguard() {

        mKeyguardRequested = true;

        mKeyguardRequested = true;

        updateIsKeyguard();

        updateIsKeyguard();

        mAssistManager.onLockscreenShown();

    }

    }





    public boolean hideKeyguard() {

    public boolean hideKeyguard() {
@@ -4279,7 +4280,6 @@ public class StatusBar extends SystemUI implements DemoMode, 
            mDraggedDownRow = null;

            mDraggedDownRow = null;

        }

        }

        mPendingRemoteInputView = null;

        mPendingRemoteInputView = null;

        mAssistManager.onLockscreenShown();

    }

    }





    private void updatePanelExpansionForKeyguard() {

    private void updatePanelExpansionForKeyguard() {