Revert "Exposing content insets and minimized home bounds for recents transition"

This reverts commit 67f31199fb65c4bd89838f826afc00205d2241e2.

Reason for revert: Need to wait for the Launcher drop at EOD today

Change-Id: I039cd3092d786c62a88f599eb79c0704c6257981

2 files changed, 5 insertions, 25 deletions

diff --git a/core/java/android/view/IRecentsAnimationRunner.aidl b/core/java/android/view/IRecentsAnimationRunner.aidl
index 69973e6d367a..ea6226b3ea69 100644
--- a/core/java/android/view/IRecentsAnimationRunner.aidl
+++ b/core/java/android/view/IRecentsAnimationRunner.aidl
@@ -16,7 +16,6 @@
 
 package android.view;
 
-import android.graphics.Rect;
 import android.view.RemoteAnimationTarget;
 import android.view.IRecentsAnimationController;
 
@@ -29,26 +28,15 @@ import android.view.IRecentsAnimationController;
 oneway interface IRecentsAnimationRunner {
 
     /**
-     * Deprecated, to be removed once Launcher updates
+     * Called when the system is ready for the handler to start animating all the visible tasks.
      */
     void onAnimationStart(in IRecentsAnimationController controller,
-            in RemoteAnimationTarget[] apps) = 0;
+            in RemoteAnimationTarget[] apps);
 
     /**
      * Called when the system needs to cancel the current animation. This can be due to the
      * wallpaper not drawing in time, or the handler not finishing the animation within a predefined
      * amount of time.
      */
-    void onAnimationCanceled() = 1;
-
-    /**
-     * Called when the system is ready for the handler to start animating all the visible tasks.
-     *
-     * @param homeContentInsets The current home app content insets
-     * @param minimizedHomeBounds Specifies the bounds of the minimized home app, will be
-     *                            {@code null} if the device is not currently in split screen
-     */
-    void onAnimationStart_New(in IRecentsAnimationController controller,
-            in RemoteAnimationTarget[] apps, in Rect homeContentInsets,
-            in Rect minimizedHomeBounds) = 2;
+    void onAnimationCanceled();
 }
diff --git a/core/java/android/view/RemoteAnimationTarget.java b/core/java/android/view/RemoteAnimationTarget.java
index facf575872ed..c28c3894482d 100644
--- a/core/java/android/view/RemoteAnimationTarget.java
+++ b/core/java/android/view/RemoteAnimationTarget.java
@@ -79,11 +79,6 @@ public class RemoteAnimationTarget implements Parcelable {
     public final Rect clipRect;
 
     /**
-     * The insets of the main app window.
-     */
-    public final Rect contentInsets;
-
-    /**
      * The index of the element in the tree in prefix order. This should be used for z-layering
      * to preserve original z-layer order in the hierarchy tree assuming no "boosting" needs to
      * happen.
@@ -110,14 +105,13 @@ public class RemoteAnimationTarget implements Parcelable {
     public final WindowConfiguration windowConfiguration;
 
     public RemoteAnimationTarget(int taskId, int mode, SurfaceControl leash, boolean isTranslucent,
-            Rect clipRect, Rect contentInsets, int prefixOrderIndex, Point position,
-            Rect sourceContainerBounds, WindowConfiguration windowConfig) {
+            Rect clipRect, int prefixOrderIndex, Point position, Rect sourceContainerBounds,
+            WindowConfiguration windowConfig) {
         this.mode = mode;
         this.taskId = taskId;
         this.leash = leash;
         this.isTranslucent = isTranslucent;
         this.clipRect = new Rect(clipRect);
-        this.contentInsets = new Rect(contentInsets);
         this.prefixOrderIndex = prefixOrderIndex;
         this.position = new Point(position);
         this.sourceContainerBounds = new Rect(sourceContainerBounds);
@@ -130,7 +124,6 @@ public class RemoteAnimationTarget implements Parcelable {
         leash = in.readParcelable(null);
         isTranslucent = in.readBoolean();
         clipRect = in.readParcelable(null);
-        contentInsets = in.readParcelable(null);
         prefixOrderIndex = in.readInt();
         position = in.readParcelable(null);
         sourceContainerBounds = in.readParcelable(null);
@@ -149,7 +142,6 @@ public class RemoteAnimationTarget implements Parcelable {
         dest.writeParcelable(leash, 0 /* flags */);
         dest.writeBoolean(isTranslucent);
         dest.writeParcelable(clipRect, 0 /* flags */);
-        dest.writeParcelable(contentInsets, 0 /* flags */);
         dest.writeInt(prefixOrderIndex);
         dest.writeParcelable(position, 0 /* flags */);
         dest.writeParcelable(sourceContainerBounds, 0 /* flags */);