commit 322bde8da4231439261dd4bb5cd26e9eff88fe00
author Steven Ng <stevenckng@google.com> Thu Jul 01 10:48:57 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 01 10:48:57 2021 +0000
tree ae8832cf351adbeb3bc99bc0dcdef5c1dd028cd3
parent 90322514fca1b114fd081638c391642c1a9db88d
parent d9128413cc9309a9c91db0b71157ef59452c1c62

Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc

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

Change-Id: I27b79b08006cd2bcf850cb2a7976de914a35d7a5

src/com/android/launcher3/dragndrop/DragView.java

diff --git a/src/com/android/launcher3/dragndrop/DragView.java b/src/com/android/launcher3/dragndrop/DragView.java
index 0acded5..3fdb256 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -472,12 +472,12 @@
             mContent.draw(picture.beginRecording(mWidth, mHeight));
             picture.endRecording();
             View view = new View(mLauncher);
-            view.setClipToOutline(mContent.getClipToOutline());
-            view.setOutlineProvider(mContent.getOutlineProvider());
             view.setBackground(new PictureDrawable(picture));
             view.measure(makeMeasureSpec(mWidth, EXACTLY), makeMeasureSpec(mHeight, EXACTLY));
             view.layout(mContent.getLeft(), mContent.getTop(),
                     mContent.getRight(), mContent.getBottom());
+            setClipToOutline(mContent.getClipToOutline());
+            setOutlineProvider(mContent.getOutlineProvider());
             addViewInLayout(view, indexOfChild(mContent), mContent.getLayoutParams(), true);
 
             removeViewInLayout(mContent);