Merge "Expose the full task info with the remote animation target" into sc-dev

core/java/android/view/RemoteAnimationTarget.java

@@ -34,7 +34,8 @@ import static android.view.RemoteAnimationTargetProto.WINDOW_CONFIGURATION;
 import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE;
 
 import android.annotation.IntDef;
-import android.app.PictureInPictureParams;
+import android.app.ActivityManager;
+import android.app.TaskInfo;
 import android.app.WindowConfiguration;
 import android.compat.annotation.UnsupportedAppUsage;
 import android.graphics.Point;
@@ -189,12 +190,11 @@ public class RemoteAnimationTarget implements Parcelable {
     public boolean isNotInRecents;
 
     /**
-     * {@link PictureInPictureParams} to allow launcher to determine if an app should
+     * {@link TaskInfo} to allow the controller to identify information about the task.
-     * automatically enter PiP on swiping up to home.
      *
      * TODO: add this to proto dump
      */
-    public PictureInPictureParams pictureInPictureParams;
+    public ActivityManager.RunningTaskInfo taskInfo;
 
     /**
      * The {@link android.view.WindowManager.LayoutParams.WindowType} of this window. It's only used
@@ -206,11 +206,10 @@ public class RemoteAnimationTarget implements Parcelable {
             Rect clipRect, Rect contentInsets, int prefixOrderIndex, Point position,
             Rect localBounds, Rect screenSpaceBounds,
             WindowConfiguration windowConfig, boolean isNotInRecents,
-            SurfaceControl startLeash, Rect startBounds,
+            SurfaceControl startLeash, Rect startBounds, ActivityManager.RunningTaskInfo taskInfo) {
-            PictureInPictureParams pictureInPictureParams) {
         this(taskId, mode, leash, isTranslucent, clipRect, contentInsets, prefixOrderIndex,
                 position, localBounds, screenSpaceBounds, windowConfig, isNotInRecents, startLeash,
-                startBounds, pictureInPictureParams, INVALID_WINDOW_TYPE);
+                startBounds, taskInfo, INVALID_WINDOW_TYPE);
     }
 
     public RemoteAnimationTarget(int taskId, int mode, SurfaceControl leash, boolean isTranslucent,
@@ -218,7 +217,7 @@ public class RemoteAnimationTarget implements Parcelable {
             Rect localBounds, Rect screenSpaceBounds,
             WindowConfiguration windowConfig, boolean isNotInRecents,
             SurfaceControl startLeash, Rect startBounds,
-            PictureInPictureParams pictureInPictureParams,
+            ActivityManager.RunningTaskInfo taskInfo,
             @WindowManager.LayoutParams.WindowType int windowType) {
         this.mode = mode;
         this.taskId = taskId;
@@ -235,7 +234,7 @@ public class RemoteAnimationTarget implements Parcelable {
         this.isNotInRecents = isNotInRecents;
         this.startLeash = startLeash;
         this.startBounds = startBounds == null ? null : new Rect(startBounds);
-        this.pictureInPictureParams = pictureInPictureParams;
+        this.taskInfo = taskInfo;
         this.windowType = windowType;
     }
 
@@ -255,7 +254,7 @@ public class RemoteAnimationTarget implements Parcelable {
         isNotInRecents = in.readBoolean();
         startLeash = in.readTypedObject(SurfaceControl.CREATOR);
         startBounds = in.readTypedObject(Rect.CREATOR);
-        pictureInPictureParams = in.readTypedObject(PictureInPictureParams.CREATOR);
+        taskInfo = in.readTypedObject(ActivityManager.RunningTaskInfo.CREATOR);
         windowType = in.readInt();
     }
 
@@ -281,7 +280,7 @@ public class RemoteAnimationTarget implements Parcelable {
         dest.writeBoolean(isNotInRecents);
         dest.writeTypedObject(startLeash, 0 /* flags */);
         dest.writeTypedObject(startBounds, 0 /* flags */);
-        dest.writeTypedObject(pictureInPictureParams, 0 /* flags */);
+        dest.writeTypedObject(taskInfo, 0 /* flags */);
         dest.writeInt(windowType);
     }
 
@@ -299,7 +298,7 @@ public class RemoteAnimationTarget implements Parcelable {
         pw.println();
         pw.print(prefix); pw.print("windowConfiguration="); pw.println(windowConfiguration);
         pw.print(prefix); pw.print("leash="); pw.println(leash);
-        pw.print(prefix); pw.print("pictureInPictureParams="); pw.println(pictureInPictureParams);
+        pw.print(prefix); pw.print("taskInfo="); pw.println(taskInfo);
         pw.print(prefix); pw.print("windowType="); pw.print(windowType);
     }
 

packages/SystemUI/shared/src/com/android/systemui/shared/system/RemoteAnimationTargetCompat.java

@@ -18,7 +18,7 @@ package com.android.systemui.shared.system;
 
 import static android.view.WindowManager.LayoutParams.INVALID_WINDOW_TYPE;
 
-import android.app.PictureInPictureParams;
+import android.app.ActivityManager;
 import android.app.WindowConfiguration;
 import android.graphics.Point;
 import android.graphics.Rect;
@@ -57,7 +57,7 @@ public class RemoteAnimationTargetCompat {
     public final Rect screenSpaceBounds;
     public final boolean isNotInRecents;
     public final Rect contentInsets;
-    public final PictureInPictureParams pictureInPictureParams;
+    public final ActivityManager.RunningTaskInfo taskInfo;
     public final int rotationChange;
     public final int windowType;
 
@@ -77,7 +77,7 @@ public class RemoteAnimationTargetCompat {
         isNotInRecents = app.isNotInRecents;
         contentInsets = app.contentInsets;
         activityType = app.windowConfiguration.getActivityType();
-        pictureInPictureParams = app.pictureInPictureParams;
+        taskInfo = app.taskInfo;
         rotationChange = 0;
 
         mStartLeash = app.startLeash;
@@ -119,7 +119,7 @@ public class RemoteAnimationTargetCompat {
             isNotInRecents = true;
             activityType = ACTIVITY_TYPE_UNDEFINED;
         }
-        pictureInPictureParams = null;
+        taskInfo = change.getTaskInfo();
         mStartLeash = null;
         rotationChange = change.getEndRotation() - change.getStartRotation();
         windowType = INVALID_WINDOW_TYPE;

services/core/java/com/android/server/wm/ActivityRecord.java

@@ -8507,7 +8507,7 @@ final class ActivityRecord extends WindowToken implements WindowManagerService.A
                 record.mAdapter.mRootTaskBounds, task.getWindowConfiguration(),
                 false /*isNotInRecents*/,
                 record.mThumbnailAdapter != null ? record.mThumbnailAdapter.mCapturedLeash : null,
-                record.mStartBounds, task.getPictureInPictureParams());
+                record.mStartBounds, task.getTaskInfo());
     }
 
     @Override

services/core/java/com/android/server/wm/RecentsAnimationController.java

@@ -1126,7 +1126,7 @@ public class RecentsAnimationController implements DeathRecipient {
                     !topApp.fillsParent(), new Rect(),
                     insets, mTask.getPrefixOrderIndex(), new Point(mBounds.left, mBounds.top),
                     mLocalBounds, mBounds, mTask.getWindowConfiguration(),
-                    mIsRecentTaskInvisible, null, null, mTask.getPictureInPictureParams());
+                    mIsRecentTaskInvisible, null, null, mTask.getTaskInfo());
             return mTarget;
         }