Merge "Made background updater more robust to state changes" into nyc-mr1-dev (c6c45d22) · Commits · e / os / android_frameworks_base

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

+4 −8

Original line number	Diff line number	Diff line
		@@ -1961,9 +1961,9 @@ public class NotificationStackScrollLayout extends ViewGroup
		}

		private void applyCurrentBackgroundBounds() {
		if (!mFadingOut) {
		mScrimController.setExcludedBackgroundArea(mCurrentBounds);
		}
		mScrimController.setExcludedBackgroundArea(
		mFadingOut \|\| mParentFadingOut \|\| mAmbientState.isDark() ? null
		: mCurrentBounds);
		invalidate();
		}

		@@ -3839,11 +3839,7 @@ public class NotificationStackScrollLayout extends ViewGroup
		}

		private void updateFadingState() {
		if (mFadingOut \|\| mParentFadingOut \|\| mAmbientState.isDark()) {
		mScrimController.setExcludedBackgroundArea(null);
		} else {
		applyCurrentBackgroundBounds();
		}
		updateSrcDrawing();
		}