commit c3a5df61882a29466f05e672cee354a864a96637
author Steven Ng <stevenckng@google.com> Thu Jul 01 10:49:23 2021 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> Thu Jul 01 10:49:23 2021 +0000
tree b872c40b70d79910027039729d5041568faf8504
parent 89f8d0763d60843aca316d7158c8f6624cfbec4d
parent 39a87fda17c707fc211d2b65e49f8cdeacb6f345

Fix widget animation truncated at drop if a widget is resized am: 39a87fda17

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

Change-Id: I22e0c4df8d7633d54c94ae46efa64d5e7309550a

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 fb1a6be..aa2dee07 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -447,12 +447,12 @@
             mContent.draw(picture.beginRecording(mWidth, mHeight));
             picture.endRecording();
             View view = new View(mActivity);
-            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);