From b3d739dfa9401dba7bad5d6a1d8bc1143c23c814 Mon Sep 17 00:00:00 2001 From: Hyunyoung Song Date: Thu, 11 Feb 2021 10:52:06 -0800 Subject: [PATCH] Apply Silk/ colorBackground(Floating) to AllApps Bug: 180020638 Test: adb shell setprop persist.sysui.monet 1 && adb shell am crash com.android.systemui Change-Id: Ied508f3452a3e640495fff4d1567c3b094f54432 --- .../android/launcher3/allapps/AllAppsSectionDecorator.java | 5 ++--- src/com/android/launcher3/util/Themes.java | 5 +++++ src/com/android/launcher3/views/ScrimView.java | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java index 1d31975114..6c95992397 100644 --- a/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java +++ b/src/com/android/launcher3/allapps/AllAppsSectionDecorator.java @@ -110,7 +110,6 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration { */ public static class SectionDecorationHandler { private static final int FILL_ALPHA = 0; - private static final int FOCUS_ALPHA = (int) (.9f * 255); protected RectF mBounds = new RectF(); private final boolean mIsFullWidth; @@ -123,9 +122,9 @@ public class AllAppsSectionDecorator extends RecyclerView.ItemDecoration { public SectionDecorationHandler(Context context, boolean isFullWidth) { mIsFullWidth = isFullWidth; - int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor); + int endScrim = Themes.getColorBackground(context); mFillcolor = ColorUtils.setAlphaComponent(endScrim, FILL_ALPHA); - mFocusColor = ColorUtils.setAlphaComponent(endScrim, FOCUS_ALPHA); + mFocusColor = endScrim; mRadius = Themes.getDialogCornerRadius(context); } diff --git a/src/com/android/launcher3/util/Themes.java b/src/com/android/launcher3/util/Themes.java index 55d17fc9c0..512a286288 100644 --- a/src/com/android/launcher3/util/Themes.java +++ b/src/com/android/launcher3/util/Themes.java @@ -81,6 +81,11 @@ public class Themes { return getAttrColor(context, android.R.attr.colorAccent); } + /** Returns the floating background color attribute. */ + public static int getColorBackground(Context context) { + return getAttrColor(context, android.R.attr.colorBackground); + } + /** Returns the floating background color attribute. */ public static int getColorBackgroundFloating(Context context) { return getAttrColor(context, android.R.attr.colorBackgroundFloating); diff --git a/src/com/android/launcher3/views/ScrimView.java b/src/com/android/launcher3/views/ScrimView.java index 77cec80fd7..c9bd2840d8 100644 --- a/src/com/android/launcher3/views/ScrimView.java +++ b/src/com/android/launcher3/views/ScrimView.java @@ -42,7 +42,7 @@ import com.android.launcher3.util.Themes; */ public class ScrimView extends View implements Insettable, OnChangeListener { - private static final float SCRIM_ALPHA = .75f; + private static final float SCRIM_ALPHA = .95f; protected final T mLauncher; private final WallpaperColorInfo mWallpaperColorInfo; protected final int mEndScrim; @@ -63,6 +63,7 @@ public class ScrimView extends View implements Insettable, O mWallpaperColorInfo = WallpaperColorInfo.INSTANCE.get(context); int endScrim = Themes.getAttrColor(context, R.attr.allAppsScrimColor); if (FeatureFlags.ENABLE_DEVICE_SEARCH.get()) { + endScrim = Themes.getColorBackgroundFloating(context); endScrim = ColorUtils.setAlphaComponent(endScrim, (int) (255 * SCRIM_ALPHA)); } mEndScrim = endScrim;