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

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

Merge "Fixed an issue where the keyguard statusbar could be showing" into pi-dev am: 693a915d 

am: 69903749

Change-Id: If26b9b52011d8130a79bf97cf6d69e62f90f254e
parents 156b7884 69903749

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

+4 −3
Original line number Diff line number Diff line
@@ -1360,9 +1360,7 @@ public class NotificationPanelView extends PanelView implements 
        mQsExpansionHeight = height;

        updateQsExpansion();

        requestScrollerTopPaddingUpdate(false /* animate */);

        if (mKeyguardShowing) {

        updateHeaderKeyguardAlpha();

        }

        if (mStatusBarState == StatusBarState.SHADE_LOCKED

                || mStatusBarState == StatusBarState.KEYGUARD) {

            updateKeyguardBottomAreaAlpha();
@@ -1765,6 +1763,9 @@ public class NotificationPanelView extends PanelView implements 
    }



    private void updateHeaderKeyguardAlpha() {

        if (!mKeyguardShowing) {

            return;

        }

        float alphaQsExpansion = 1 - Math.min(1, getQsExpansionFraction() * 2);

        mKeyguardStatusBar.setAlpha(Math.min(getKeyguardContentsAlpha(), alphaQsExpansion)

                * mKeyguardStatusBarAnimateAlpha);