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

Commit 8c08a357 authored by Lucas Dupin's avatar Lucas Dupin
Browse files

Fade clock when pulling QS down 

Bug: 37013527
Test: visual - pull QS on lock screen
Change-Id: I23fa477675ef15ac0fd190973ac885de7b2e0117
parent 072661f5

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

+11 −1
Original line number Diff line number Diff line
@@ -185,6 +185,7 @@ public class NotificationPanelView extends PanelView implements 
    private int mQsFalsingThreshold;



    private float mKeyguardStatusBarAnimateAlpha = 1f;

    private float mQsClockAlphaOverride = 1f;

    private int mOldLayoutDirection;

    private HeadsUpTouchHelper mHeadsUpTouchHelper;

    private boolean mIsExpansionFromHeadsUp;
@@ -500,7 +501,7 @@ public class NotificationPanelView extends PanelView implements 


    private void updateClock(float alpha, float scale) {

        if (!mKeyguardStatusViewAnimating) {

            mKeyguardStatusView.setAlpha(alpha);

            mKeyguardStatusView.setAlpha(alpha * mQsClockAlphaOverride);

        }

        mKeyguardStatusView.setScaleX(scale);

        mKeyguardStatusView.setScaleY(scale);
@@ -1250,6 +1251,15 @@ public class NotificationPanelView extends PanelView implements 
            mQsNavbarScrim.setAlpha(getQsExpansionFraction());

        }



        // Fade clock when QS is on top of it

        float newClockAlpha = (height - mKeyguardStatusView.getY()) /

                mKeyguardStatusView.getHeight();

        newClockAlpha = 1 - MathUtils.constrain(newClockAlpha, 0, 1);

        if (newClockAlpha != mQsClockAlphaOverride) {

            mQsClockAlphaOverride = Interpolators.ALPHA_OUT.getInterpolation(newClockAlpha);

            updateClock(mClockPositionResult.clockAlpha, mClockPositionResult.clockScale);

        }



        // Upon initialisation when we are not layouted yet we don't want to announce that we are

        // fully expanded, hence the != 0.0f check.

        if (height != 0.0f && mQsFullyExpanded && !mLastAnnouncementWasQuickSettings) {