Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
TreeHugger Robot
2016-08-23 18:55:45 +00:00
committed by Android (Google) Code Review
parent c55457b146 9bfba9c157
commit c6c45d225c
1 changed files with 4 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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();
}
applyCurrentBackgroundBounds();
updateSrcDrawing();
}