commit 312fd335c094f1dc95e923ae107cbdb6d613c12b
author Cyrus Boadway <boadway@google.com> Thu Jul 01 13:41:20 2021 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Thu Jul 01 13:41:20 2021 +0000
tree 544f1b16dd5fbce1f565245636dda39672ba8e9b
parent b5c9b67b5ecb85486b77264330b6e1bdc54b99f5
parent f3bd6d81c75b9bd64d0f04b57d1adc5d3ac8a23a

Merge "resolve merge conflicts of 239e0b540880549947326fb656b05721ce18843f to master"

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 3f941e1..1f93730 100644
--- a/src/com/android/launcher3/dragndrop/DragView.java
+++ b/src/com/android/launcher3/dragndrop/DragView.java
@@ -448,12 +448,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);