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

Commit 6802e2a5 authored by Winson Chung's avatar Winson Chung
Browse files

Clean up Recents animation api 

Bug: 73714156
Test: Ensure you can still swipe up

Change-Id: Ie70ed0edb05f54d17d3989895b86e07851c44c06
parent 173020c2

config/hiddenapi-vendor-list.txt

+1 −2
Original line number Diff line number Diff line
@@ -534,8 +534,7 @@ Landroid/view/IRecentsAnimationController;->screenshotTask(I)Landroid/app/Activi 
Landroid/view/IRecentsAnimationController;->setInputConsumerEnabled(Z)V

Landroid/view/IRecentsAnimationRunner$Stub;-><init>()V

Landroid/view/IRecentsAnimationRunner;->onAnimationCanceled()V

Landroid/view/IRecentsAnimationRunner;->onAnimationStart(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;)V

Landroid/view/IRecentsAnimationRunner;->onAnimationStart_New(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;Landroid/graphics/Rect;Landroid/graphics/Rect;)V

Landroid/view/IRecentsAnimationRunner;->onAnimationStart(Landroid/view/IRecentsAnimationController;[Landroid/view/RemoteAnimationTarget;Landroid/graphics/Rect;Landroid/graphics/Rect;)V

Landroid/view/IRemoteAnimationFinishedCallback;->onAnimationFinished()V

Landroid/view/IRemoteAnimationRunner$Stub;-><init>()V

Landroid/view/IRemoteAnimationRunner;->onAnimationCancelled()V

core/java/android/view/IRecentsAnimationRunner.aidl

+1 −7
Original line number Diff line number Diff line
@@ -28,12 +28,6 @@ import android.view.IRecentsAnimationController; 
 */

oneway interface IRecentsAnimationRunner {



    /**

     * Deprecated, to be removed once Launcher updates

     */

    void onAnimationStart(in IRecentsAnimationController controller,

            in RemoteAnimationTarget[] apps) = 0;



    /**

     * 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
@@ -48,7 +42,7 @@ oneway interface IRecentsAnimationRunner { 
     * @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,

    void onAnimationStart(in IRecentsAnimationController controller,

            in RemoteAnimationTarget[] apps, in Rect homeContentInsets,

            in Rect minimizedHomeBounds) = 2;

}

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

+0 −7
Original line number Diff line number Diff line
@@ -219,13 +219,6 @@ public class ActivityManagerWrapper { 
            if (animationHandler != null) {

                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 =

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

+1 −1
Original line number Diff line number Diff line
@@ -366,7 +366,7 @@ public class RecentsAnimationController implements DeathRecipient { 
                    && mTargetAppToken.findMainWindow() != null

                            ? mTargetAppToken.findMainWindow().mContentInsets

                            : null;

            mRunner.onAnimationStart_New(mController, appTargets, contentInsets,

            mRunner.onAnimationStart(mController, appTargets, contentInsets,

                    minimizedHomeBounds);

            if (DEBUG_RECENTS_ANIMATIONS) {

                Slog.d(TAG, "startAnimation(): Notify animation start:");