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

Commit 32c722f9 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Slide custom clock face up when pulling up the bouncer."

parents 3b6f1ed1 1e580729
Loading
Loading
Loading
Loading
+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;
        }