Merge "Fix action buttons visibility in handheld devices with blur enabled(1/n)" into main
This commit is contained in:
committed by
Android (Google) Code Review
commit
f67f97ade2
@@ -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);
|
||||
}
|
||||
|
||||
|
||||
@@ -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" />
|
||||
|
||||
@@ -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>
|
||||
|
||||
Reference in New Issue
Block a user