From a1993b325bd12d23ee07fb9ad75ee7c7c3f358b4 Mon Sep 17 00:00:00 2001
From: Chandru S <chandruis@google.com>
Date: Wed, 15 Jan 2025 07:38:56 -0800
Subject: Revert scrimView and scrimDrawable changes for notification blur

This affect alternate bouncer scrim as well, These changes should be part of ScrimController

Bug: 381263600
Test: NA
Flag: com.android.systemui.notification_shade_blur

Change-Id: I364349178c4720e29616c5c7c1b15150862554b7
---
 .../SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java   | 5 -----
 packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java  | 9 ---------
 2 files changed, 14 deletions(-)

diff --git a/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java b/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java
index 6f932dff47ea..9a1ffcbab8d1 100644
--- a/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java
+++ b/packages/SystemUI/src/com/android/systemui/scrim/ScrimDrawable.java
@@ -34,7 +34,6 @@ import android.view.animation.DecelerateInterpolator;
 
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.graphics.ColorUtils;
-import com.android.systemui.Flags;
 import com.android.systemui.statusbar.notification.stack.StackStateAnimator;
 
 /**
@@ -214,10 +213,6 @@ public class ScrimDrawable extends Drawable {
     public void draw(@NonNull Canvas canvas) {
         mPaint.setColor(mMainColor);
         mPaint.setAlpha(mAlpha);
-        if (Flags.notificationShadeBlur()) {
-            // TODO (b/381263600), wire this at ScrimController, move it to PrimaryBouncerTransition
-            mPaint.setAlpha((int) (0.5f * mAlpha));
-        }
         if (mConcaveInfo != null) {
             drawConcave(canvas);
         } else if (mCornerRadiusEnabled && mCornerRadius > 0) {
diff --git a/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java b/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java
index fdc0ddf2f24c..49f3cfc4ceaf 100644
--- a/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java
+++ b/packages/SystemUI/src/com/android/systemui/scrim/ScrimView.java
@@ -39,8 +39,6 @@ import androidx.core.graphics.ColorUtils;
 import com.android.internal.annotations.GuardedBy;
 import com.android.internal.annotations.VisibleForTesting;
 import com.android.internal.colorextraction.ColorExtractor;
-import com.android.systemui.Flags;
-import com.android.systemui.res.R;
 import com.android.systemui.shade.TouchLogger;
 import com.android.systemui.util.LargeScreenUtils;
 
@@ -252,13 +250,6 @@ public class ScrimView extends View {
             if (mBlendWithMainColor) {
                 mainTinted = ColorUtils.blendARGB(mColors.getMainColor(), mTintColor, tintAmount);
             }
-            if (Flags.notificationShadeBlur()) {
-                int layerAbove = ColorUtils.setAlphaComponent(
-                        getResources().getColor(R.color.shade_panel, null),
-                        (int) (0.4f * 255));
-                int layerBelow = ColorUtils.setAlphaComponent(Color.WHITE, (int) (0.1f * 255));
-                mainTinted = ColorUtils.compositeColors(layerAbove, layerBelow);
-            }
             drawable.setColor(mainTinted, animated);
         } else {
             boolean hasAlpha = Color.alpha(mTintColor) != 0;
-- 
cgit v1.2.3-59-g8ed1b