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

Commit 7729a153 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... 

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

Change-Id: Ia932db1b7a924c954e38890fe36da66071f72c10
parents 8fe91591 e4f542fa

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

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

        mKeyguardRequested = true;

        updateIsKeyguard();

        mAssistManager.onLockscreenShown();

    }



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

        }

        mPendingRemoteInputView = null;

        mAssistManager.onLockscreenShown();

    }



    private void updatePanelExpansionForKeyguard() {