SystemUI: Fix notification flicker with transluency enabled

Test: Screen record notification will flicker on expansion.

Reason: Override tint color was reset on expansion.

Signed-off-by: Pranav Vashi <neobuddy89@gmail.com>

Author: neobuddy89

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/ActivatableNotificationView.java

@@ -166,10 +166,6 @@ protected void updateColors() {
                 R.color.notification_ripple_tinted_color);
         mNormalRippleColor = mContext.getColor(
                 R.color.notification_ripple_untinted_color);
-        // Reset background color tint and override tint, as they are from an old theme
-        mBgTint = NO_COLOR;
-        mOverrideTint = NO_COLOR;
-        mOverrideAmount = 0.0f;
     }
 
     /**
@@ -306,8 +302,7 @@ void setTintColor(int color, boolean animated) {
     public void setOverrideTintColor(int color, float overrideAmount) {
         mOverrideTint = color;
         mOverrideAmount = overrideAmount;
-        int newColor = calculateBgColor();
-        setBackgroundTintColor(newColor);
+        updateBackgroundTint(false /* animated */);
     }
 
     protected void updateBackgroundTint() {
@@ -773,11 +768,11 @@ private int calculateBgColor(boolean withTint, boolean withOverride) {
     }
 
     private int getRippleColor() {
-        if (mBgTint != 0) {
-            return mTintedRippleColor;
-        } else {
-            return mNormalRippleColor;
-        }
+        final boolean hasExplicitTint =
+                mBgTint != NO_COLOR
+                || (mOverrideTint != NO_COLOR && mOverrideAmount > 0f);
+
+        return hasExplicitTint ? mTintedRippleColor : mNormalRippleColor;
     }
 
     /**

packages/SystemUI/src/com/android/systemui/statusbar/notification/row/NotificationBackgroundView.java

@@ -100,10 +100,10 @@ public NotificationBackgroundView(Context context, AttributeSet attrs) {
 
     /** Sets whether blur/translucency is supported for notification rows. */
     public void setIsBlurSupported(boolean isBlurSupported) {
-        mIsBlurSupported = isBlurSupported;
-        // Re-apply PorterDuff on blur changes.
-        if (mBackground != null) {
-            setTint(mTintColor);
+        if (mIsBlurSupported != isBlurSupported) {
+            mIsBlurSupported = isBlurSupported;
+            setStatefulColors();
+            invalidate();
         }
     }