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

Commit 4327e2fb authored by Jorim Jaggi's avatar Jorim Jaggi Committed by Android (Google) Code Review
Browse files

Merge "Fix fake status bar not visible in SHADE_LOCKED state." into lmp-preview-dev

parents 40646c5c a1b1c7a4

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

+17 −7
Original line number Original line Diff line number Diff line
@@ -243,8 +243,8 @@ public class NotificationPanelView extends PanelView implements 
                    mClockAnimator.removeAllListeners();

                    mClockAnimator.removeAllListeners();

                    mClockAnimator.cancel();

                    mClockAnimator.cancel();

                }

                }

                mClockAnimator =

                mClockAnimator = ObjectAnimator

                        ObjectAnimator.ofFloat(mKeyguardStatusView, View.Y, mClockAnimationTarget);

                        .ofFloat(mKeyguardStatusView, View.Y, mClockAnimationTarget);

                mClockAnimator.setInterpolator(mFastOutSlowInInterpolator);

                mClockAnimator.setInterpolator(mFastOutSlowInInterpolator);

                mClockAnimator.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);

                mClockAnimator.setDuration(StackStateAnimator.ANIMATION_DURATION_STANDARD);

                mClockAnimator.addListener(new AnimatorListenerAdapter() {

                mClockAnimator.addListener(new AnimatorListenerAdapter() {
@@ -551,9 +551,7 @@ public class NotificationPanelView extends PanelView implements 
        mHeader.setExpanded(expandVisually, mStackScrollerOverscrolling);

        mHeader.setExpanded(expandVisually, mStackScrollerOverscrolling);

        mNotificationStackScroller.setEnabled(!mQsExpanded);

        mNotificationStackScroller.setEnabled(!mQsExpanded);

        mQsPanel.setVisibility(expandVisually ? View.VISIBLE : View.INVISIBLE);

        mQsPanel.setVisibility(expandVisually ? View.VISIBLE : View.INVISIBLE);

        mQsContainer.setVisibility(mKeyguardShowing && !mQsExpanded

        mQsContainer.setVisibility(mKeyguardShowing && !mQsExpanded ? View.INVISIBLE : View.VISIBLE);

                ? View.INVISIBLE

                : View.VISIBLE);

        mScrollView.setTouchEnabled(mQsExpanded);

        mScrollView.setTouchEnabled(mQsExpanded);

    }

    }
@@ -731,8 +729,20 @@ public class NotificationPanelView extends PanelView implements 
    private void updateKeyguardHeaderVisibility() {

    private void updateKeyguardHeaderVisibility() {

        if (mStatusBar.getBarState() == StatusBarState.KEYGUARD

        if (mStatusBar.getBarState() == StatusBarState.KEYGUARD

                || mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED) {

                || mStatusBar.getBarState() == StatusBarState.SHADE_LOCKED) {

            boolean hidden = mNotificationStackScroller.getNotificationsTopY()

            boolean hidden;

            if (mStatusBar.getBarState() == StatusBarState.KEYGUARD) {

                

                // When on Keyguard, we hide the header as soon as the top card of the notification

                // stack scroller is close enough (collision distance) to the bottom of the header.

                hidden = mNotificationStackScroller.getNotificationsTopY()

                        <= mHeader.getBottom() + mNotificationsHeaderCollideDistance;

                        <= mHeader.getBottom() + mNotificationsHeaderCollideDistance;

            } else {



                // In SHADE_LOCKED, the top card is already really close to the header. Hide it as

                // soon as we start translating the stack.

                hidden = mNotificationStackScroller.getTranslationY() < 0;

            }



            if (hidden && !mHeaderHidden) {

            if (hidden && !mHeaderHidden) {

                mHeader.animate()

                mHeader.animate()

                        .alpha(0f)

                        .alpha(0f)