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

Commit e7f6bd09 authored by Selim Cinek's avatar Selim Cinek Committed by Android Git Automerger
Browse files

am 6bd2eb9b: am b4d9e24f: am 89285039: Merge "Fixed a bug where the statusbar... 

am 6bd2eb9b: am b4d9e24f: am 89285039: Merge "Fixed a bug where the statusbar was still visible while dozing" into mnc-dev

* commit '6bd2eb9b':
  Fixed a bug where the statusbar was still visible while dozing
parents 2cba7ae3 6bd2eb9b

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

+5 −2
Original line number Diff line number Diff line
@@ -1180,7 +1180,9 @@ public class NotificationPanelView extends PanelView implements 
        } else if (statusBarState == StatusBarState.KEYGUARD

                || statusBarState == StatusBarState.SHADE_LOCKED) {

            mKeyguardBottomArea.animate().cancel();

            if (!mDozing) {

                mKeyguardBottomArea.setVisibility(View.VISIBLE);

            }

            mKeyguardBottomArea.setAlpha(1f);

        } else {

            mKeyguardBottomArea.animate().cancel();
@@ -1717,7 +1719,8 @@ public class NotificationPanelView extends PanelView implements 
        float alphaQsExpansion = 1 - Math.min(1, getQsExpansionFraction() * 2);

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

                * mKeyguardStatusBarAnimateAlpha);

        mKeyguardStatusBar.setVisibility(mKeyguardStatusBar.getAlpha() != 0f ? VISIBLE : INVISIBLE);

        mKeyguardStatusBar.setVisibility(mKeyguardStatusBar.getAlpha() != 0f

                && !mDozing ? VISIBLE : INVISIBLE);

        setQsTranslation(mQsExpansionHeight);

    }