Merge "Fixes background animation on dismiss."

This commit is contained in:
TreeHugger Robot
2018-11-20 23:57:43 +00:00
committed by Android (Google) Code Review

View File

@@ -2768,6 +2768,10 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
private void updateFirstAndLastBackgroundViews() {
NotificationSection firstSection = getFirstVisibleSection();
NotificationSection lastSection = getLastVisibleSection();
ActivatableNotificationView previousFirstChild =
firstSection == null ? null : firstSection.getFirstVisibleChild();
ActivatableNotificationView previousLastChild =
lastSection == null ? null : lastSection.getLastVisibleChild();
ActivatableNotificationView firstChild = getFirstChildWithBackground();
ActivatableNotificationView lastChild = getLastChildWithBackground();
@@ -2775,10 +2779,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
mSections[0], mSections[1], firstChild, lastChild);
if (mAnimationsEnabled && mIsExpanded) {
mAnimateNextBackgroundTop =
firstSection == null || firstChild != firstSection.getFirstVisibleChild();
mAnimateNextBackgroundBottom =
lastSection == null || lastChild != lastSection.getLastVisibleChild();
mAnimateNextBackgroundTop = firstChild != previousFirstChild;
mAnimateNextBackgroundBottom = lastChild != previousLastChild;
mAnimateNextSectionBoundsChange = sectionViewsChanged;
} else {
mAnimateNextBackgroundTop = false;