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

Merge "Fixed a grey flash when swiping away the last notification" into nyc-mr1-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-10-20 02:21:34 +00:00
committed by Android (Google) Code Review
parent 049980c284 54680901ed
commit d9a569ae58
1 changed files with 17 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
packages/SystemUI/src/com/android/systemui/statusbar/stack/NotificationStackScrollLayout.java
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;