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

Merge "AOD padding animation should match slice" into pi-dev

Browse Source 
am: 1b5e2d8b3e

Change-Id: I9795fc0a2e780c6b8075ea5f4c5a4d514b1a61b0
This commit is contained in:
android-build-team Robot
2018-05-07 23:03:51 -07:00
committed by android-build-merger
parent 44e953f177 1b5e2d8b3e
commit 299eba7cef
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
View File

@@ -3331,8 +3331,16 @@ public class NotificationStackScrollLayout extends ViewGroup
private void generateTopPaddingEvent() { private void generateTopPaddingEvent() {
if (mTopPaddingNeedsAnimation) { if (mTopPaddingNeedsAnimation) {
mAnimationEvents.add( AnimationEvent event;
new AnimationEvent(null, AnimationEvent.ANIMATION_TYPE_TOP_PADDING_CHANGED)); 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; mTopPaddingNeedsAnimation = false;
} }