From 3ff0ee1a95e1e60bbf3679901d4fcf3202ac3834 Mon Sep 17 00:00:00 2001 From: Steven Ng Date: Thu, 24 Jun 2021 21:12:07 +0100 Subject: [PATCH] Fix rounded corners for shortcut & generated preview shadow box Test: Open the widgets picker and locate shortcuts. Rounded corners are rendered on the rectangular box of a shortcut Fix: 191948061 Change-Id: I24e4dc4c4a9c9c7e875444db5294f6c33f50db85 --- .../launcher3/widget/DatabaseWidgetPreviewLoader.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java index 6de3e11ac8..867c770278 100644 --- a/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java +++ b/src/com/android/launcher3/widget/DatabaseWidgetPreviewLoader.java @@ -98,12 +98,17 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader { private final IconCache mIconCache; private final UserCache mUserCache; private final CacheDb mDb; + private final float mPreviewBoxCornerRadius; public DatabaseWidgetPreviewLoader(Context context, IconCache iconCache) { mContext = context; mIconCache = iconCache; mUserCache = UserCache.INSTANCE.get(context); mDb = new CacheDb(context); + float previewCornerRadius = RoundedCornerEnforcement.computeEnforcedRadius(context); + mPreviewBoxCornerRadius = previewCornerRadius > 0 + ? previewCornerRadius + : mContext.getResources().getDimension(R.dimen.widget_preview_corner_radius); } /** @@ -521,7 +526,7 @@ public class DatabaseWidgetPreviewLoader implements WidgetPreviewLoader { ShadowGenerator.Builder builder = new ShadowGenerator.Builder(Color.WHITE); builder.shadowBlur = res.getDimension(R.dimen.widget_preview_shadow_blur); - builder.radius = res.getDimension(R.dimen.widget_preview_corner_radius); + builder.radius = mPreviewBoxCornerRadius; builder.keyShadowDistance = res.getDimension(R.dimen.widget_preview_key_shadow_distance); builder.bounds.set(builder.shadowBlur, builder.shadowBlur,