Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bb5d97f0 authored by Winson Chung's avatar Winson Chung
Browse files

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

This reverts commit 67f31199.

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

Change-Id: I039cd3092d786c62a88f599eb79c0704c6257981
parent 67f31199

core/java/android/view/IRecentsAnimationRunner.aidl

+3 −15
Original line number Diff line number Diff line
@@ -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();

}

core/java/android/view/RemoteAnimationTarget.java

+2 −10
Original line number Diff line number Diff line
@@ -78,11 +78,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
@@ -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 */);

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

+1 −12
Original line number Diff line number Diff line
@@ -43,7 +43,6 @@ import android.content.pm.UserInfo; 
import android.content.res.Resources;

import android.content.res.Resources.NotFoundException;

import android.graphics.Bitmap;

import android.graphics.Rect;

import android.graphics.drawable.BitmapDrawable;

import android.graphics.drawable.Drawable;

import android.os.Bundle;
@@ -58,7 +57,6 @@ import android.view.IRecentsAnimationController; 
import android.view.IRecentsAnimationRunner;



import android.view.RemoteAnimationTarget;

import android.view.WindowManagerGlobal;

import com.android.systemui.shared.recents.model.Task;

import com.android.systemui.shared.recents.model.Task.TaskKey;

import com.android.systemui.shared.recents.model.ThumbnailData;
@@ -273,20 +271,11 @@ public class ActivityManagerWrapper { 
                runner = new IRecentsAnimationRunner.Stub() {

                    public void onAnimationStart(IRecentsAnimationController controller,

                            RemoteAnimationTarget[] apps) {

                        final Rect stableInsets = new Rect();

                        WindowManagerWrapper.getInstance().getStableInsets(stableInsets);

                        onAnimationStart_New(controller, apps, stableInsets, null);

                    }



                    public void onAnimationStart_New(IRecentsAnimationController controller,

                            RemoteAnimationTarget[] apps, Rect homeContentInsets,

                            Rect minimizedHomeBounds) {

                        final RecentsAnimationControllerCompat controllerCompat =

                                new RecentsAnimationControllerCompat(controller);

                        final RemoteAnimationTargetCompat[] appsCompat =

                                RemoteAnimationTargetCompat.wrap(apps);

                        animationHandler.onAnimationStart(controllerCompat, appsCompat,

                                homeContentInsets, minimizedHomeBounds);

                        animationHandler.onAnimationStart(controllerCompat, appsCompat);

                    }



                    public void onAnimationCanceled() {

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

+1 −3
Original line number Diff line number Diff line
@@ -16,15 +16,13 @@ 


package com.android.systemui.shared.system;



import android.graphics.Rect;



public interface RecentsAnimationListener {



    /**

     * Called when the animation into Recents can start. This call is made on the binder thread.

     */

    void onAnimationStart(RecentsAnimationControllerCompat controller,

            RemoteAnimationTargetCompat[] apps, Rect homeContentInsets, Rect minimizedHomeBounds);

            RemoteAnimationTargetCompat[] apps);



    /**

     * Called when the animation into Recents was canceled. This call is made on the binder thread.

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

+0 −20
Original line number Diff line number Diff line
@@ -16,9 +16,6 @@ 


package com.android.systemui.shared.system;



import static android.app.WindowConfiguration.ACTIVITY_TYPE_ASSISTANT;



import android.app.WindowConfiguration;

import android.graphics.Point;

import android.graphics.Rect;

import android.view.RemoteAnimationTarget;
@@ -40,10 +37,7 @@ public class RemoteAnimationTargetCompat { 
    public final Point position;

    public final Rect sourceContainerBounds;



    private final RemoteAnimationTarget mTarget;



    public RemoteAnimationTargetCompat(RemoteAnimationTarget app) {

        mTarget = app;

        taskId = app.taskId;

        mode = app.mode;

        leash = new SurfaceControlCompat(app.leash);
@@ -62,18 +56,4 @@ public class RemoteAnimationTargetCompat { 
        }

        return appsCompat;

    }



    /**

     * TODO: Get as a method for compatibility (will move into ctor once Launcher updates)

     */

    public Rect getContentInsets() {

        return mTarget.contentInsets;

    }



    /**

     * TODO: Get as a method for compatibility (will move into ctor once Launcher updates)

     */

    public boolean isAssistantActivityType() {

        return mTarget.windowConfiguration.getActivityType() == ACTIVITY_TYPE_ASSISTANT;

    }

}
 
 No newline at end of file