Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev (d9a569ae) · Commits · e / os / android_frameworks_base

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

+17 −7

Original line number	Diff line number	Diff line
		@@ -1853,13 +1853,26 @@ public class NotificationStackScrollLayout extends ViewGroup
		}
		updateBackgroundBounds();
		if (!mCurrentBounds.equals(mBackgroundBounds)) {
		if (mAnimateNextBackgroundTop \|\| mAnimateNextBackgroundBottom \|\| areBoundsAnimating()) {
		boolean animate = mAnimateNextBackgroundTop \|\| mAnimateNextBackgroundBottom
		\|\| areBoundsAnimating();
		if (!isExpanded()) {
		abortBackgroundAnimators();
		animate = false;
		}
		if (animate) {
		startBackgroundAnimation();
		} else {
		mCurrentBounds.set(mBackgroundBounds);
		applyCurrentBackgroundBounds();
		}
		} else {
		abortBackgroundAnimators();
		}
		mAnimateNextBackgroundBottom = false;
		mAnimateNextBackgroundTop = false;
		}

		private void abortBackgroundAnimators() {
		if (mBottomAnimator != null) {
		mBottomAnimator.cancel();
		}
		@@ -1867,9 +1880,6 @@ public class NotificationStackScrollLayout extends ViewGroup
		mTopAnimator.cancel();
		}
		}
		mAnimateNextBackgroundBottom = false;
		mAnimateNextBackgroundTop = false;
		}

		private boolean areBoundsAnimating() {
		return mBottomAnimator != null \|\| mTopAnimator != null;