Merge "Fixed an issue where the background was visible while pulsing" into qt-dev

am: bd32a804ef

Change-Id: I55c010a463617f1424bef519dc80fecb2416ab0f
This commit is contained in:
Selim Cinek
2019-06-11 16:03:55 -07:00
committed by android-build-merger

View File

@@ -864,8 +864,8 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
int backgroundRectTop = top;
int lastSectionBottom =
mSections[0].getCurrentBounds().bottom + animationYOffset;
int previousLeft = left;
int previousRight = right;
int currentLeft = left;
int currentRight = right;
boolean first = true;
for (NotificationSection section : mSections) {
if (section.getFirstVisibleChild() == null) {
@@ -878,23 +878,23 @@ public class NotificationStackScrollLayout extends ViewGroup implements ScrollAd
// as separate roundrects, as the rounded corners right next to each other look
// bad.
if (sectionTop - lastSectionBottom > DISTANCE_BETWEEN_ADJACENT_SECTIONS_PX
|| (previousLeft != ownLeft && !first)) {
canvas.drawRoundRect(ownLeft,
|| ((currentLeft != ownLeft || currentRight != ownRight) && !first)) {
canvas.drawRoundRect(currentLeft,
backgroundRectTop,
ownRight,
currentRight,
lastSectionBottom,
mCornerRadius, mCornerRadius, mBackgroundPaint);
backgroundRectTop = sectionTop;
}
previousLeft = ownLeft;
previousRight = ownRight;
currentLeft = ownLeft;
currentRight = ownRight;
lastSectionBottom =
section.getCurrentBounds().bottom + animationYOffset;
first = false;
}
canvas.drawRoundRect(previousLeft,
canvas.drawRoundRect(currentLeft,
backgroundRectTop,
previousRight,
currentRight,
lastSectionBottom,
mCornerRadius, mCornerRadius, mBackgroundPaint);
}