Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2019-01-17 22:29:20 +00:00
committed by Android (Google) Code Review
parent 3b6f1ed1a9 1e58072990
commit 32c722f9b6
1 changed files with 8 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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;
}