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

Commit 69903749 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

Change-Id: I6bba16509dac42ac372d28da546de36eb24969cf
parents 3a75c9ec 693a915d

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

+4 −3
Original line number Diff line number Diff line
@@ -1358,9 +1358,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();
@@ -1763,6 +1761,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);