summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Treehugger Robot <android-test-infra-autosubmit@system.gserviceaccount.com> 2025-03-24 08:05:04 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2025-03-24 08:05:04 -0700
commitf67f97ade2f1345a05e5940b78188dc7d07bec2e (patch)
tree25f252ef1337339677478707faa851525dad2f30
parent2d70081aa5cf087e1e91d26e51000f7705e8993e (diff)
parent7d27140a5969b0cb1de4915f7a397a61e231d9d7 (diff)
Merge "Fix action buttons visibility in handheld devices with blur enabled(1/n)" into main
-rw-r--r--quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java3
-rw-r--r--res/values/attrs.xml1
-rw-r--r--res/values/styles.xml2
3 files changed, 4 insertions, 2 deletions
diff --git a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
index 3170df9571..c774143328 100644
--- a/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
+++ b/quickstep/src/com/android/launcher3/uioverrides/states/OverviewState.java
@@ -22,7 +22,6 @@ import static com.android.launcher3.Flags.enableScalingRevealHomeAnimation;
import static com.android.launcher3.logging.StatsLogManager.LAUNCHER_STATE_OVERVIEW;
import android.content.Context;
-import android.graphics.Color;
import android.graphics.Rect;
import android.os.SystemProperties;
@@ -162,7 +161,7 @@ public class OverviewState extends LauncherState {
@Override
public int getWorkspaceScrimColor(Launcher launcher) {
return enableOverviewBackgroundWallpaperBlur() && BlurUtils.supportsBlursOnWindows()
- ? Color.TRANSPARENT
+ ? Themes.getAttrColor(launcher, R.attr.overviewScrimColorOverBlur)
: Themes.getAttrColor(launcher, R.attr.overviewScrimColor);
}
diff --git a/res/values/attrs.xml b/res/values/attrs.xml
index 1ecac338a4..b0e9cd07c4 100644
--- a/res/values/attrs.xml
+++ b/res/values/attrs.xml
@@ -40,6 +40,7 @@
<attr name="iconOnlyShortcutColor" format="color" />
<attr name="eduHalfSheetBGColor" format="color" />
<attr name="overviewScrimColor" format="color" />
+ <attr name="overviewScrimColorOverBlur" format="color" />
<attr name="popupNotificationDotColor" format="color" />
<attr name="notificationDotColor" format="color" />
<attr name="focusOutlineColor" format="color" />
diff --git a/res/values/styles.xml b/res/values/styles.xml
index 3b21a42be0..7d5b57587b 100644
--- a/res/values/styles.xml
+++ b/res/values/styles.xml
@@ -77,6 +77,7 @@
<item name="dropTargetHoverTextColor">@color/drop_target_hover_text_color_light</item>
<item name="dropTargetHoverButtonColor">@color/drop_target_hover_button_color_light</item>
<item name="overviewScrimColor">@color/overview_scrim</item>
+ <item name="overviewScrimColorOverBlur">#33000000</item>
<item name="preloadIconAccentColor">@color/preload_icon_accent_color_light</item>
<item name="preloadIconBackgroundColor">@color/preload_icon_background_color_light</item>
<item name="android:windowTranslucentStatus">false</item>
@@ -141,6 +142,7 @@
<item name="iconOnlyShortcutColor">#B3FFFFFF</item>
<item name="eduHalfSheetBGColor">#DD000000</item>
<item name="overviewScrimColor">@color/overview_scrim_dark</item>
+ <item name="overviewScrimColorOverBlur">#52000000</item>
<item name="preloadIconAccentColor">@color/preload_icon_accent_color_dark</item>
<item name="preloadIconBackgroundColor">@color/preload_icon_background_color_dark</item>
</style>