Merge "AOD padding animation should match slice" into pi-dev
diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
index 7370c4c..5deebff 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
@@ -3331,8 +3331,16 @@
private void generateTopPaddingEvent() {
if (mTopPaddingNeedsAnimation) {
- mAnimationEvents.add(
- new AnimationEvent(null, AnimationEvent.ANIMATION_TYPE_TOP_PADDING_CHANGED));
+ AnimationEvent event;
+ if (mAmbientState.isDark()) {
+ event = new AnimationEvent(null /* view */,
+ AnimationEvent.ANIMATION_TYPE_TOP_PADDING_CHANGED,
+ KeyguardSliceView.DEFAULT_ANIM_DURATION);
+ } else {
+ event = new AnimationEvent(null /* view */,
+ AnimationEvent.ANIMATION_TYPE_TOP_PADDING_CHANGED);
+ }
+ mAnimationEvents.add(event);
}
mTopPaddingNeedsAnimation = false;
}