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

Commit 0bf39049 authored by Treehugger Robot's avatar Treehugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Pass extras Bundle in onRecentsAnimationStart" into main

parents eabb5bbe b23cdf1f

quickstep/src/com/android/quickstep/RecentsAnimationCallbacks.java

+4 −3
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent 
import static com.android.quickstep.util.ActiveGestureErrorDetector.GestureEvent.START_RECENTS_ANIMATION;



import android.graphics.Rect;

import android.os.Bundle;

import android.util.ArraySet;

import android.view.RemoteAnimationTarget;
@@ -92,9 +93,9 @@ public class RecentsAnimationCallbacks implements 
    @Deprecated

    public final void onAnimationStart(RecentsAnimationControllerCompat controller,

            RemoteAnimationTarget[] appTargets, Rect homeContentInsets,

            Rect minimizedHomeBounds) {

            Rect minimizedHomeBounds, Bundle extras) {

        onAnimationStart(controller, appTargets, new RemoteAnimationTarget[0],

                homeContentInsets, minimizedHomeBounds);

                homeContentInsets, minimizedHomeBounds, extras);

    }



    // Called only in R+ platform
@@ -102,7 +103,7 @@ public class RecentsAnimationCallbacks implements 
    public final void onAnimationStart(RecentsAnimationControllerCompat animationController,

            RemoteAnimationTarget[] appTargets,

            RemoteAnimationTarget[] wallpaperTargets,

            Rect homeContentInsets, Rect minimizedHomeBounds) {

            Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras) {

        long appCount = Arrays.stream(appTargets)

                .filter(app -> app.mode == MODE_CLOSING)

                .count();

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

+7 −2
Original line number Diff line number Diff line
@@ -1351,9 +1351,14 @@ public class SystemUiProxy implements ISystemUiProxy { 
            @Override

            public void onAnimationStart(IRecentsAnimationController controller,

                    RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,

                    Rect homeContentInsets, Rect minimizedHomeBounds) {

                    Rect homeContentInsets, Rect minimizedHomeBounds, Bundle extras) {

                // Aidl bundles need to explicitly set class loader

                // https://developer.android.com/guide/components/aidl#Bundles

                if (extras != null) {

                    extras.setClassLoader(getClass().getClassLoader());

                }

                listener.onAnimationStart(new RecentsAnimationControllerCompat(controller), apps,

                        wallpapers, homeContentInsets, minimizedHomeBounds);

                        wallpapers, homeContentInsets, minimizedHomeBounds, extras);

            }



            @Override