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

Commit 1e580729 authored by Robert Snoeberger's avatar Robert Snoeberger
Browse files

Slide custom clock face up when pulling up the bouncer. 

Bug: 123023280
Test: Pulled up the bouncer.
Change-Id: Ic2a22f35cc278342d1806faba8ff96e4d4d456c2
parent 7a529440

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

+8 −2
Original line number Diff line number Diff line
@@ -141,6 +141,7 @@ public class NotificationPanelView extends PanelView implements 
    private KeyguardAffordanceHelper mAffordanceHelper;

    private KeyguardUserSwitcher mKeyguardUserSwitcher;

    private KeyguardStatusBarView mKeyguardStatusBar;

    private ViewGroup mBigClockContainer;

    private QS mQs;

    private FrameLayout mQsFrame;

    @VisibleForTesting
@@ -348,8 +349,8 @@ public class NotificationPanelView extends PanelView implements 
        mKeyguardStatusView = findViewById(R.id.keyguard_status_view);



        KeyguardClockSwitch keyguardClockSwitch = findViewById(R.id.keyguard_clock_container);

        ViewGroup bigClockContainer = findViewById(R.id.big_clock_container);

        keyguardClockSwitch.setBigClockContainer(bigClockContainer);

        mBigClockContainer = findViewById(R.id.big_clock_container);

        keyguardClockSwitch.setBigClockContainer(mBigClockContainer);



        mNotificationContainerParent = findViewById(R.id.notification_container_parent);

        mNotificationStackScroller = findViewById(R.id.notification_stack_scroller);
@@ -585,6 +586,11 @@ public class NotificationPanelView extends PanelView implements 
                    mClockPositionResult.clockX, CLOCK_ANIMATION_PROPERTIES, animateClock);

            PropertyAnimator.setProperty(mKeyguardStatusView, AnimatableProperty.Y,

                    mClockPositionResult.clockY, CLOCK_ANIMATION_PROPERTIES, animateClock);

            // Move big clock up while pulling up the bouncer

            PropertyAnimator.setProperty(mBigClockContainer, AnimatableProperty.Y,

                    MathUtils.lerp(-mBigClockContainer.getHeight(), 0,

                          Interpolators.FAST_OUT_LINEAR_IN.getInterpolation(getExpandedFraction())),

                    CLOCK_ANIMATION_PROPERTIES, animateClock);

            updateClock();

            stackScrollerPadding = mClockPositionResult.stackScrollerPadding;

        }