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

Fixed an issue where the background could show in a wrong way am: d381bc3133 am: 3ff0c5b3ce

Browse Source 
am: d59911c6a2

Change-Id: I0652e069ccd63a1ba47152a09ba7fec990b788aa
This commit is contained in:
Selim Cinek
2016-08-15 22:37:37 +00:00
committed by android-build-merger
parent a14ba3eb79 d59911c6a2
commit bc2fe94fe5
1 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -413,7 +413,10 @@ public class NotificationStackScrollLayout extends ViewGroup
@Override
protected void onDraw(Canvas canvas) {
canvas.drawRect(0, mCurrentBounds.top, getWidth(), mCurrentBounds.bottom, mBackgroundPaint);
if (mCurrentBounds.top < mCurrentBounds.bottom) {
canvas.drawRect(0, mCurrentBounds.top, getWidth(), mCurrentBounds.bottom,
mBackgroundPaint);
}
if (DEBUG) {
int y = mTopPadding;
canvas.drawLine(0, y, getWidth(), y, mDebugPaint);
@@ -2049,11 +2052,12 @@ public class NotificationStackScrollLayout extends ViewGroup
bottom = top;
}
if (mPhoneStatusBar.getBarState() != StatusBarState.KEYGUARD) {
mBackgroundBounds.top = (int) Math.max(mTopPadding + mStackTranslation, top);
top = (int) Math.max(mTopPadding + mStackTranslation, top);
} else {
// otherwise the animation from the shade to the keyguard will jump as it's maxed
mBackgroundBounds.top = Math.max(0, top);
top = Math.max(0, top);
}
mBackgroundBounds.top = top;
mBackgroundBounds.bottom = Math.min(getHeight(), Math.max(bottom, top));
}