commit d106cf19d27aa2752a7b928a961322f4cd2127ed
author Jonathan Miranda <jonmiranda@google.com> Fri Mar 12 15:36:19 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Fri Mar 12 15:36:19 2021 +0000
tree 0732be9edeaeb7fb128ec7b377c34a72a9f51a16
parent 4fa38ada45b2ff1b0bbd2bd7f4291f2069d936ce
parent e76e1e564a14ca14e093c8431ff4a61a73a6046a

Merge "Fix folder outline not matching the v28 radius." into sc-dev am: e76e1e564a

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/13844440

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifcfe2ed611409ec9ac95bba567afe494de0941d4

src/com/android/launcher3/folder/FolderAnimationManager.java

diff --git a/src/com/android/launcher3/folder/FolderAnimationManager.java b/src/com/android/launcher3/folder/FolderAnimationManager.java
index feb528c..ee6ea99 100644
--- a/src/com/android/launcher3/folder/FolderAnimationManager.java
+++ b/src/com/android/launcher3/folder/FolderAnimationManager.java
@@ -40,7 +40,6 @@
 import com.android.launcher3.BubbleTextView;
 import com.android.launcher3.CellLayout;
 import com.android.launcher3.R;
-import com.android.launcher3.ResourceUtils;
 import com.android.launcher3.ShortcutAndWidgetContainer;
 import com.android.launcher3.Utilities;
 import com.android.launcher3.anim.PropertyResetListener;
@@ -177,7 +176,7 @@
                 Math.round((totalOffsetX + initialSize)),
                 Math.round((paddingOffsetY + initialSize)));
         Rect endRect = new Rect(0, 0, lp.width, lp.height);
-        float finalRadius = ResourceUtils.pxFromDp(2, mContext.getResources().getDisplayMetrics());
+        float finalRadius = mFolderBackground.getCornerRadius();
 
         // Create the animators.
         AnimatorSet a = new AnimatorSet();