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

Browse Source 
am: b8b748b7e6

Change-Id: I3026455c7460c24433d905fce63a4018a0c14271
This commit is contained in:
Adrian Roos
2017-05-26 14:57:30 +00:00
committed by android-build-merger
parent a98bdea2c5 b8b748b7e6
commit 89255babb6
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

@@ -120,7 +120,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;
@@ -451,7 +451,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);
}
@@ -3688,11 +3689,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) {