Merge "Reset tint and override tint when the shelf expansion is collapsed" into main (2890ca86) · Commits · e / os / android_frameworks_base

packages/SystemUI/src/com/android/systemui/statusbar/NotificationShelf.java

+8 −0

Original line number	Diff line number	Diff line
		@@ -475,6 +475,8 @@ public class NotificationShelf extends ActivatableNotificationView {
		int baseZHeight = mAmbientState.getBaseZHeight();
		int clipTopAmount = 0;

		boolean needsToResetOverrideTint = true;

		for (int i = 0; i < getHostLayoutChildCount(); i++) {
		ExpandableView child = getHostLayoutChildAt(i);
		if (!child.needsClippingToShelf() \|\| child.getVisibility() == GONE) {
		@@ -507,6 +509,7 @@ public class NotificationShelf extends ActivatableNotificationView {
		mNotGoneIndex = notGoneIndex;
		setTintColor(previousColor);
		setOverrideTintColor(colorTwoBefore, transitionAmount);
		needsToResetOverrideTint = false;

		} else if (mNotGoneIndex == -1) {
		colorTwoBefore = previousColor;
		@@ -535,6 +538,11 @@ public class NotificationShelf extends ActivatableNotificationView {
		}
		}

		if (notificationRowTransparency() && needsToResetOverrideTint) {
		setTintColor(NO_COLOR);
		setOverrideTintColor(NO_COLOR, 0 /* overrideAmount */);
		}

		clipTransientViews();

		setClipTopAmount(clipTopAmount);