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

Merge "AOD: Fix AOD background bug" into oc-dev am: b8b748b7e6

Browse Source 
am: 89255babb6

Change-Id: I80780c2145646db9ff2ce53c7a9126dcb570c9fb
This commit is contained in:
Adrian Roos
2017-05-26 15:11:02 +00:00
committed by android-build-merger
parent 17a136f69c 89255babb6
commit 98c1691c9a
1 changed files with 5 additions and 7 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

@@ -124,7 +124,7 @@ public class NotificationStackScrollLayout extends ViewGroup
private boolean mSwipingInProgress;
private int mCurrentStackHeight = Integer.MAX_VALUE;
private final Paint mBackgroundPaint = new Paint();
private boolean mShouldDrawNotificationBackground;
private final boolean mShouldDrawNotificationBackground;
private float mExpandedHeight;
private int mOwnScrollY;
@@ -459,7 +459,8 @@ public class NotificationStackScrollLayout extends ViewGroup
}
protected void onDraw(Canvas canvas) {
if (mShouldDrawNotificationBackground && mCurrentBounds.top < mCurrentBounds.bottom) {
if (mShouldDrawNotificationBackground && !mAmbientState.isDark()
&& mCurrentBounds.top < mCurrentBounds.bottom) {
canvas.drawRect(0, mCurrentBounds.top, getWidth(), mCurrentBounds.bottom,
mBackgroundPaint);
}
@@ -3695,11 +3696,8 @@ public class NotificationStackScrollLayout extends ViewGroup
* {@link #mAmbientState}'s dark mode is toggled.
*/
private void updateWillNotDraw() {
if (mAmbientState.isDark()) {
setWillNotDraw(!DEBUG);
} else {
setWillNotDraw(!mShouldDrawNotificationBackground && !DEBUG);
}
boolean willDraw = !mAmbientState.isDark() && mShouldDrawNotificationBackground || DEBUG;
setWillNotDraw(!willDraw);
}
private void setBackgroundFadeAmount(float fadeAmount) {