Fixed a grey flash when swiping away the last notification

am: 54680901ed

Change-Id: I050754c1f749b7c5fce81359a52b7eba2f7b7d67
This commit is contained in:
Selim Cinek
2016-10-20 02:34:48 +00:00
committed by android-build-merger

View File

@@ -1853,13 +1853,26 @@ public class NotificationStackScrollLayout extends ViewGroup
} }
updateBackgroundBounds(); updateBackgroundBounds();
if (!mCurrentBounds.equals(mBackgroundBounds)) { if (!mCurrentBounds.equals(mBackgroundBounds)) {
if (mAnimateNextBackgroundTop || mAnimateNextBackgroundBottom || areBoundsAnimating()) { boolean animate = mAnimateNextBackgroundTop || mAnimateNextBackgroundBottom
|| areBoundsAnimating();
if (!isExpanded()) {
abortBackgroundAnimators();
animate = false;
}
if (animate) {
startBackgroundAnimation(); startBackgroundAnimation();
} else { } else {
mCurrentBounds.set(mBackgroundBounds); mCurrentBounds.set(mBackgroundBounds);
applyCurrentBackgroundBounds(); applyCurrentBackgroundBounds();
} }
} else { } else {
abortBackgroundAnimators();
}
mAnimateNextBackgroundBottom = false;
mAnimateNextBackgroundTop = false;
}
private void abortBackgroundAnimators() {
if (mBottomAnimator != null) { if (mBottomAnimator != null) {
mBottomAnimator.cancel(); mBottomAnimator.cancel();
} }
@@ -1867,9 +1880,6 @@ public class NotificationStackScrollLayout extends ViewGroup
mTopAnimator.cancel(); mTopAnimator.cancel();
} }
} }
mAnimateNextBackgroundBottom = false;
mAnimateNextBackgroundTop = false;
}
private boolean areBoundsAnimating() { private boolean areBoundsAnimating() {
return mBottomAnimator != null || mTopAnimator != null; return mBottomAnimator != null || mTopAnimator != null;