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

Commit 2674ad2e 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

Change-Id: Id87a35597db82345e564fd4d92500b8dacdc0c23
parents a3c00447 bc3c1d01

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

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

        mKeyguardRequested = true;

        updateIsKeyguard();

        mAssistManager.onLockscreenShown();

    }



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

        }

        mPendingRemoteInputView = null;

        mAssistManager.onLockscreenShown();

    }



    private void updatePanelExpansionForKeyguard() {