From 359280ef2cc7895c0a694a169d2ec779a0e7804d Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Wed, 7 May 2025 22:18:34 +0000
Subject: [PATCH] Split BlurStyle and BlurFallbackStyle for All Apps and
 Overview.

Problem: We don't want to apply the blur style to All Apps if the
all_apps_blur flags are disabled. However, we want to still apply
the relevant colors for Overview when the Overview blur is enabled.

Solution: Split the styles into All Apps and Overview variants.
Unfortunately this creates quite a bit of extra code, but such is
the nature of flag permutations.

This is a more comprehensive color fix compared to ag/33356345,
which is reverted as part of this CL.

Note: enable_overview_background_wallpaper_blur is already broken
when disabled without this change (the live tile gets blurred),
presumably because it's already in nextfood and hasn't been tested
disabled. As such, I focused on testing All Apps blur flags both
enabled and both disabled, with the Overview flag always enabled.

Demo with All Apps flags disabled:
 - Blurs enabled (Overview should blur; All Apps unaffected):
   https://drive.google.com/file/d/1eb882JKSMF-Irc7Ls-iAClYfJIASzzXs/view?usp=drive_link&resourcekey=0-j5EafBfVHIh5oOSFzsYE4g
 - Blurs disabled (Overview should not blur; All Apps unaffected):
   https://drive.google.com/file/d/1toVHYUTj9FjpXCD7m8waeuFIwBbdy_Am/view?usp=drive_link&resourcekey=0-drqPVsELmgJVxhpgxLc-aQ

Demo with All Apps flags enabled:
 - Blurs enabled (Overview and All Apps should blur):
   https://drive.google.com/file/d/1se5yaPDYdDKcoBjZSjDSlqCiSfX0bmHv/view?usp=drive_link&resourcekey=0-U9fBJSVYY9na9r8J5xHXMw
 - Blurs disabled (Overview and All Apps should not blur):
   https://drive.google.com/file/d/1YmqlCdSJDZXGSgpeO5hk16V8Y-6tVpeW/view?usp=drive_link&resourcekey=0-rK4Zy7D8fFyPMA_1XXxwCQ
   (Note: All Apps fallback colors will change with ag/33405653)

Test: Above videos
Fix: 416248709
Flag: com.android.launcher3.all_apps_blur
Flag: com.android.launcher3.all_apps_sheet_for_handheld
Flag: com.android.launcher3.enable_overview_background_wallpaper_blur
Change-Id: I9b5cf6b0dce4014053b27ea95a91d047262427b2
---
 quickstep/res/values/styles.xml               |  4 +--
 .../allapps/TaskbarAllAppsSlideInView.java    |  7 +++---
 .../uioverrides/QuickstepLauncher.java        |  9 +++----
 .../uioverrides/states/AllAppsState.java      |  7 +++---
 .../com/android/quickstep/views/BlurUtils.kt  | 25 +++++++++----------
 res/values/styles.xml                         |  8 +++---
 .../launcher3/views/ActivityContext.java      | 11 ++++++--
 7 files changed, 38 insertions(+), 33 deletions(-)

diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 26a96284f6..04b8879f2f 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -380,7 +380,7 @@
         <item name="android:minHeight">36dp</item>
     </style>
 
-    <style name="BlurStyle">
+    <style name="AllAppsBlurStyle">
         <item name="allAppsScrimColor">@androidprv:color/shade_panel_scrim_color</item>
         <item name="groupHighlight">@androidprv:color/surface_effect_1</item>
         <item name="focusHighlight">@androidprv:color/surface_effect_2</item>
@@ -393,7 +393,7 @@
         <item name="bottomSheetDragHandleColor">@androidprv:color/surface_effect_1</item>
     </style>
 
-    <style name="BlurFallbackStyle">
+    <style name="AllAppsBlurFallbackStyle">
         <item name="allAppsScrimColor">@color/widgets_picker_scrim</item>
         <item name="groupHighlight">@color/materialColorSurfaceContainerHigh</item>
         <item name="focusHighlight">@color/materialColorSurfaceBright</item>
diff --git a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
index 578e646607..9e2399e609 100644
--- a/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
+++ b/quickstep/src/com/android/launcher3/taskbar/allapps/TaskbarAllAppsSlideInView.java
@@ -276,10 +276,11 @@ public class TaskbarAllAppsSlideInView extends AbstractSlideInView<TaskbarOverla
         if (!mActivityContext.getDeviceProfile().shouldShowAllAppsOnSheet()) {
             // Always use an opaque scrim if there's no sheet.
             return context.getResources().getColor(R.color.materialColorSurfaceDim);
+        } else if (!Flags.allAppsBlur()) {
+            // If there's a sheet but no blur, use the old scrim color.
+            return context.getResources().getColor(R.color.widgets_picker_scrim);
         }
-
-        return Flags.allAppsBlur() ? Themes.getAttrColor(context, R.attr.allAppsScrimColor)
-                : context.getResources().getColor(R.color.widgets_picker_scrim);
+        return Themes.getAttrColor(context, R.attr.allAppsScrimColor);
     }
 
     @Override
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 7fb1a80734..c6f1d77a44 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -470,14 +470,11 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
 
     @Override
     public void updateBlurStyle() {
-        if (!Flags.allAppsBlur() && !enableOverviewBackgroundWallpaperBlur()) {
-            return;
-        }
         if (Flags.allAppsBlur()) {
-            int blurStyleResId = getAllAppsBlurStyleResId();
-            getTheme().applyStyle(blurStyleResId, true);
+            int allAppsBlurStyleResId = getAllAppsBlurStyleResId();
+            getTheme().applyStyle(allAppsBlurStyleResId, true);
             getAppsView().onThemeChanged(
-                    new ContextThemeWrapper(getApplicationContext(), blurStyleResId));
+                    new ContextThemeWrapper(getApplicationContext(), allAppsBlurStyleResId));
         }
         if (enableOverviewBackgroundWallpaperBlur()) {
             getTheme().applyStyle(getOverviewBlurStyleResId(), true);
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
index b501f74881..19e98fafea 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/AllAppsState.java
@@ -207,9 +207,10 @@ public class AllAppsState extends LauncherState {
         if (!launcher.getDeviceProfile().shouldShowAllAppsOnSheet()) {
             // Always use an opaque scrim if there's no sheet.
             return launcher.getResources().getColor(R.color.materialColorSurfaceDim);
+        } else if (!Flags.allAppsBlur()) {
+            // If there's a sheet but no blur, use the old scrim color.
+            return launcher.getResources().getColor(R.color.widgets_picker_scrim);
         }
-
-        return Flags.allAppsBlur() ? Themes.getAttrColor(launcher, R.attr.allAppsScrimColor)
-                : launcher.getResources().getColor(R.color.widgets_picker_scrim);
+        return Themes.getAttrColor(launcher, R.attr.allAppsScrimColor);
     }
 }
diff --git a/quickstep/src/com/android/quickstep/views/BlurUtils.kt b/quickstep/src/com/android/quickstep/views/BlurUtils.kt
index dedc665bf8..50587bf75d 100644
--- a/quickstep/src/com/android/quickstep/views/BlurUtils.kt
+++ b/quickstep/src/com/android/quickstep/views/BlurUtils.kt
@@ -53,18 +53,17 @@ class BlurUtils(private val recentsView: RecentsView<*, *>) {
     }
 
     private fun updateBlurLayer() {
-        if (enableOverviewBackgroundWallpaperBlur()) {
-            recentsView.depthController?.setBaseSurfaceOverride(
-                // Blurs behind lowest live tile surface that's below recents or Launcher if there
-                // are none.
-                getLiveTileRemoteTargetHandles()
-                    ?.filter { it.taskViewSimulator.drawsBelowRecents }
-                    ?.maxByOrNull { it.transformParams.targetSet.firstAppTarget.leash.layerId }
-                    ?.transformParams
-                    ?.targetSet
-                    ?.firstAppTarget
-                    ?.leash
-            )
-        }
+        if (!enableOverviewBackgroundWallpaperBlur()) return
+        recentsView.depthController?.setBaseSurfaceOverride(
+            // Blurs behind lowest live tile surface that's below recents or Launcher if there
+            // are none.
+            getLiveTileRemoteTargetHandles()
+                ?.filter { it.taskViewSimulator.drawsBelowRecents }
+                ?.maxByOrNull { it.transformParams.targetSet.firstAppTarget.leash.layerId }
+                ?.transformParams
+                ?.targetSet
+                ?.firstAppTarget
+                ?.leash
+        )
     }
 }
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 9bfd605d50..2fe5440d5b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -178,10 +178,10 @@
     <style name="AppTheme.Dark.DarkMainColor" parent="@style/LauncherTheme.Dark.DarkMainColor" />
     <style name="AppTheme.Dark.DarkText" parent="@style/LauncherTheme.Dark.DarkText" />
 
-    <!-- Theme overrides when blur is enabled. -->
-    <style name="BlurStyle" />
-    <!-- Theme overrides when blur is available but currently disabled. -->
-    <style name="BlurFallbackStyle" />
+    <!-- Theme overrides in All Apps when blur is enabled. -->
+    <style name="AllAppsBlurStyle" />
+    <!-- Theme overrides in All Apps when blur is available but currently disabled. -->
+    <style name="AllAppsBlurFallbackStyle" />
 
     <style name="HomeSettings.Theme" parent="@android:style/Theme.DeviceDefault.Settings">
         <item name="android:navigationBarColor">?android:colorPrimaryDark</item>
diff --git a/src/com/android/launcher3/views/ActivityContext.java b/src/com/android/launcher3/views/ActivityContext.java
index dbcb466598..3c563d935e 100644
--- a/src/com/android/launcher3/views/ActivityContext.java
+++ b/src/com/android/launcher3/views/ActivityContext.java
@@ -63,6 +63,7 @@ import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.DeviceProfile;
 import com.android.launcher3.DeviceProfile.OnDeviceProfileChangeListener;
 import com.android.launcher3.DropTargetHandler;
+import com.android.launcher3.Flags;
 import com.android.launcher3.LauncherAppState;
 import com.android.launcher3.LauncherSettings;
 import com.android.launcher3.R;
@@ -219,11 +220,17 @@ public interface ActivityContext extends SavedStateRegistryOwner {
         return false;
     }
 
-    /** @return the resource id of the style to apply for the current blur state. */
+    /** @return the resource id of the style to apply for the current blur state in All Apps. */
     default int getAllAppsBlurStyleResId() {
-        return isAllAppsBackgroundBlurEnabled() ? R.style.BlurStyle : R.style.BlurFallbackStyle;
+        if (!Flags.allAppsBlur()) {
+            // Don't alter the colors provided in the default Launcher themes.
+            return View.NO_ID;
+        }
+        return isAllAppsBackgroundBlurEnabled() ? R.style.AllAppsBlurStyle
+                : R.style.AllAppsBlurFallbackStyle;
     }
 
+    /** @return the resource id of the style to apply for the current blur state in Overview. */
     default int getOverviewBlurStyleResId() {
         return View.NO_ID;
     }