From 6610425a1d5112e2a6a708872573a75200df2ee5 Mon Sep 17 00:00:00 2001
From: Andy Wickham <awickham@google.com>
Date: Sat, 26 Apr 2025 01:19:42 +0000
Subject: [PATCH] Update blur style for more things.

 - Quick Launch highlight (focusHighlight)
 - Drag bar at top of All Apps
 - Divider inside Private Space

Demo (enabling blur via adb in the middle):
https://drive.google.com/file/d/1MjYn1c1mz3m1llmJ-J6kLHUa1j3biv_H/view?usp=drive_link&resourcekey=0-6d1yf_4zDL0W9nTYe6HLNQ

Fix: 413143411
Test: Manual
Flag: com.android.launcher3.all_apps_blur
Change-Id: I37340759867aba1460fb038269d21c86e8b3c4f6
---
 quickstep/res/values/styles.xml                             | 6 ++++++
 .../android/launcher3/uioverrides/QuickstepLauncher.java    | 1 +
 res/drawable/bg_rounded_corner_bottom_sheet_handle.xml      | 2 +-
 res/drawable/private_space_app_divider.xml                  | 2 +-
 res/values/attrs.xml                                        | 2 ++
 res/values/styles.xml                                       | 2 ++
 .../launcher3/allapps/ActivityAllAppsContainerView.java     | 4 ++++
 7 files changed, 17 insertions(+), 2 deletions(-)

diff --git a/quickstep/res/values/styles.xml b/quickstep/res/values/styles.xml
index 0a6e764b8a..3ca030df3e 100644
--- a/quickstep/res/values/styles.xml
+++ b/quickstep/res/values/styles.xml
@@ -383,20 +383,26 @@
     <style name="BlurStyle">
         <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>
         <item name="allAppsSurfaceLow">@androidprv:color/surface_effect_0</item>
         <item name="allAppsSurfaceHighest">@androidprv:color/surface_effect_2</item>
         <item name="allAppsUnselectedTab">@androidprv:color/surface_effect_1</item>
         <item name="allappsHeaderProtectionColor">@androidprv:color/surface_effect_0</item>
         <item name="privateSpaceSettingsColor">@androidprv:color/surface_effect_2</item>
+        <item name="privateSpaceDividerColor">@androidprv:color/surface_effect_3</item>
+        <item name="bottomSheetDragHandleColor">@androidprv:color/surface_effect_1</item>
     </style>
 
     <style name="BlurFallbackStyle">
         <item name="allAppsScrimColor">@color/widgets_picker_scrim</item>
         <item name="groupHighlight">@color/materialColorSurfaceContainerHigh</item>
+        <item name="focusHighlight">@color/materialColorSurfaceBright</item>
         <item name="allAppsSurfaceLow">@color/materialColorSurfaceContainerLow</item>
         <item name="allAppsSurfaceHighest">@color/materialColorSurfaceContainerHighest</item>
         <item name="allAppsUnselectedTab">@color/materialColorSurfaceBright</item>
         <item name="allappsHeaderProtectionColor">@color/materialColorPrimaryContainer</item>
         <item name="privateSpaceSettingsColor">@color/materialColorSurfaceBright</item>
+        <item name="privateSpaceDividerColor">@color/materialColorOutlineVariant</item>
+        <item name="bottomSheetDragHandleColor">@color/materialColorOutlineVariant</item>
     </style>
 </resources>
diff --git a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
index 1fbbb2757e..8adeec0dca 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/QuickstepLauncher.java
@@ -474,6 +474,7 @@ public class QuickstepLauncher extends Launcher implements RecentsViewContainer,
             return;
         }
         getTheme().applyStyle(getBlurStyleResId(), true);
+        getAppsView().getContext().getTheme().applyStyle(getBlurStyleResId(), true);
         getAppsView().onThemeChanged();
     }
 
diff --git a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
index b0bd33bb51..bf5d842577 100644
--- a/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
+++ b/res/drawable/bg_rounded_corner_bottom_sheet_handle.xml
@@ -16,6 +16,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle" >
-    <solid android:color="@color/materialColorOutlineVariant"/>
+    <solid android:color="?attr/bottomSheetDragHandleColor"/>
     <corners android:radius="@dimen/bottom_sheet_handle_corner_radius" />
 </shape>
diff --git a/res/drawable/private_space_app_divider.xml b/res/drawable/private_space_app_divider.xml
index f92dca73d5..81cb4017b0 100644
--- a/res/drawable/private_space_app_divider.xml
+++ b/res/drawable/private_space_app_divider.xml
@@ -16,6 +16,6 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
-    <solid android:color="@color/materialColorOutlineVariant"/>
+    <solid android:color="?attr/privateSpaceDividerColor"/>
     <size android:height="@dimen/all_apps_divider_height" />
 </shape>
\ No newline at end of file
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 581be98f9e..38445c9af4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -26,6 +26,8 @@
     <attr name="allAppsUnselectedTab" format="color" />
     <attr name="allAppsSearchIconBackground" format="color" />
     <attr name="privateSpaceSettingsColor" format="color" />
+    <attr name="privateSpaceDividerColor" format="color" />
+    <attr name="bottomSheetDragHandleColor" format="color" />
     <attr name="allAppsTheme" format="reference" />
     <attr name="popupColorPrimary" format="color" />
     <attr name="popupColorSecondary" format="color" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 6ed5a77a92..f287273830 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -47,6 +47,8 @@
         <item name="allAppsSurfaceHighest">@color/materialColorSurfaceContainerHighest</item>
         <item name="allAppsUnselectedTab">@color/materialColorSurfaceBright</item>
         <item name="privateSpaceSettingsColor">@color/materialColorSurfaceBright</item>
+        <item name="privateSpaceDividerColor">@color/materialColorOutlineVariant</item>
+        <item name="bottomSheetDragHandleColor">@color/materialColorOutlineVariant</item>
         <item name="popupColorPrimary">@color/popup_color_primary_light</item>
         <item name="popupColorSecondary">@color/popup_color_secondary_light</item>
         <item name="popupColorTertiary">@color/popup_color_tertiary_light</item>
diff --git a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
index e87b42a627..c408a3021f 100644
--- a/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
+++ b/src/com/android/launcher3/allapps/ActivityAllAppsContainerView.java
@@ -176,6 +176,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
     private SearchRecyclerView mSearchRecyclerView;
     protected SearchAdapterProvider<?> mMainAdapterProvider;
     private View mBottomSheetHandleArea;
+    private View mBottomSheetHandle;
     private boolean mHasWorkApps;
     private boolean mHasPrivateApps;
     private float[] mBottomSheetCornerRadii;
@@ -273,6 +274,7 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         mAdditionalHeaderRows.addAll(getAdditionalHeaderRows());
         mBottomSheetBackground = findViewById(R.id.bottom_sheet_background);
         mBottomSheetHandleArea = findViewById(R.id.bottom_sheet_handle_area);
+        mBottomSheetHandle = findViewById(R.id.bottom_sheet_handle);
         mSearchRecyclerView = findViewById(R.id.search_results_list_view);
         mFastScroller = findViewById(R.id.fast_scroller);
         mFastScroller.setPopupView(findViewById(R.id.fast_scroller_popup));
@@ -861,6 +863,8 @@ public class ActivityAllAppsContainerView<T extends Context & ActivityContext>
         forAllRecyclerViews(RecyclerView::invalidateItemDecorations);
         getSearchUiManager().onThemeChanged();
         getFloatingHeaderView().getTabLayout().updateTheme();
+        mBottomSheetHandle.setBackground(getContext().getDrawable(
+                R.drawable.bg_rounded_corner_bottom_sheet_handle));
     }
 
     /**