Merge "Made background updater more robust to state changes" into nyc-mr1-dev

This commit is contained in:
TreeHugger Robot
2016-08-23 18:55:45 +00:00
committed by Android (Google) Code Review

View File

@@ -1961,9 +1961,9 @@ public class NotificationStackScrollLayout extends ViewGroup
} }
private void applyCurrentBackgroundBounds() { private void applyCurrentBackgroundBounds() {
if (!mFadingOut) { mScrimController.setExcludedBackgroundArea(
mScrimController.setExcludedBackgroundArea(mCurrentBounds); mFadingOut || mParentFadingOut || mAmbientState.isDark() ? null
} : mCurrentBounds);
invalidate(); invalidate();
} }
@@ -3839,11 +3839,7 @@ public class NotificationStackScrollLayout extends ViewGroup
} }
private void updateFadingState() { private void updateFadingState() {
if (mFadingOut || mParentFadingOut || mAmbientState.isDark()) { applyCurrentBackgroundBounds();
mScrimController.setExcludedBackgroundArea(null);
} else {
applyCurrentBackgroundBounds();
}
updateSrcDrawing(); updateSrcDrawing();
} }