Merge "Transfer PipContentOverlay when swipe to home with Shell transition" into tm-dev am: a4babdb6b2

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

Change-Id: I11132bf54d076387a308a292cfd7155979ba0d7a

quickstep/src/com/android/quickstep/AbsSwipeUpHandler.java

@@ -1768,6 +1768,7 @@ public abstract class AbsSwipeUpHandler<T extends StatefulActivity<S>,
     private void maybeFinishSwipeToHome() {
         if (mIsSwipingPipToHome && mSwipePipToHomeAnimators[0] != null) {
             SystemUiProxy.INSTANCE.get(mContext).stopSwipePipToHome(
+                    mSwipePipToHomeAnimator.getTaskId(),
                     mSwipePipToHomeAnimator.getComponentName(),
                     mSwipePipToHomeAnimator.getDestinationBounds(),
                     mSwipePipToHomeAnimator.getContentOverlay());

quickstep/src/com/android/quickstep/SystemUiProxy.java

@@ -541,11 +541,16 @@ public class SystemUiProxy implements ISystemUiProxy,
         return null;
     }
 
-    public void stopSwipePipToHome(ComponentName componentName, Rect destinationBounds,
+    /**
+     * Notifies WM Shell that launcher has finished all the animation for swipe to home. WM Shell
+     * can choose to fade out the overlay when entering PIP is finished, and WM Shell should be
+     * responsible for cleaning up the overlay.
+     */
+    public void stopSwipePipToHome(int taskId, ComponentName componentName, Rect destinationBounds,
             SurfaceControl overlay) {
         if (mPip != null) {
             try {
-                mPip.stopSwipePipToHome(componentName, destinationBounds, overlay);
+                mPip.stopSwipePipToHome(taskId, componentName, destinationBounds, overlay);
             } catch (RemoteException e) {
                 Log.w(TAG, "Failed call stopSwipePipToHome");
             }