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

Commit 95112612 authored by Winson Chung's avatar Winson Chung Committed by Android (Google) Code Review
Browse files

Merge "Add wallpaper leash for remote and recents animations"

parents 5d76d441 d5852195

apct-tests/perftests/core/src/android/wm/RecentsAnimationPerfTest.java

+2 −2
Original line number Diff line number Diff line
@@ -188,8 +188,8 @@ public class RecentsAnimationPerfTest extends WindowManagerPerfTestBase { 


            @Override

            public void onAnimationStart(IRecentsAnimationController controller,

                    RemoteAnimationTarget[] apps, Rect homeContentInsets,

                    Rect minimizedHomeBounds) throws RemoteException {

                    RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,

                    Rect homeContentInsets, Rect minimizedHomeBounds) throws RemoteException {

                final Pair<String, Boolean> finishCase = finishCases.get(mIteration++ % 2);

                final boolean moveRecentsToTop = finishCase.second;

                makeInterval();

core/java/android/view/IRecentsAnimationRunner.aidl

+2 −2
Original line number Diff line number Diff line
@@ -54,6 +54,6 @@ oneway interface IRecentsAnimationRunner { 
     */

    @UnsupportedAppUsage

    void onAnimationStart(in IRecentsAnimationController controller,

            in RemoteAnimationTarget[] apps, in Rect homeContentInsets,

            in Rect minimizedHomeBounds) = 2;

            in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers,

            in Rect homeContentInsets, in Rect minimizedHomeBounds) = 2;

}

core/java/android/view/IRemoteAnimationRunner.aidl

+1 −1
Original line number Diff line number Diff line
@@ -34,7 +34,7 @@ oneway interface IRemoteAnimationRunner { 
     * @param finishedCallback The callback to invoke when the animation is finished.

     */

    @UnsupportedAppUsage

    void onAnimationStart(in RemoteAnimationTarget[] apps,

    void onAnimationStart(in RemoteAnimationTarget[] apps, in RemoteAnimationTarget[] wallpapers,

            in IRemoteAnimationFinishedCallback finishedCallback);



    /**

core/java/android/view/SyncRtSurfaceTransactionApplier.java

+1 −1
Original line number Diff line number Diff line
@@ -255,7 +255,7 @@ public class SyncRtSurfaceTransactionApplier { 
            this.surface = surface;

            this.alpha = alpha;

            this.matrix = new Matrix(matrix);

            this.windowCrop = new Rect(windowCrop);

            this.windowCrop = windowCrop != null ? new Rect(windowCrop) : null;

            this.layer = layer;

            this.cornerRadius = cornerRadius;

            this.visible = visible;

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

+5 −3
Original line number Diff line number Diff line
@@ -225,14 +225,16 @@ public class ActivityManagerWrapper { 
                runner = new IRecentsAnimationRunner.Stub() {

                    @Override

                    public void onAnimationStart(IRecentsAnimationController controller,

                            RemoteAnimationTarget[] apps, Rect homeContentInsets,

                            Rect minimizedHomeBounds) {

                            RemoteAnimationTarget[] apps, RemoteAnimationTarget[] wallpapers,

                            Rect homeContentInsets, Rect minimizedHomeBounds) {

                        final RecentsAnimationControllerCompat controllerCompat =

                                new RecentsAnimationControllerCompat(controller);

                        final RemoteAnimationTargetCompat[] appsCompat =

                                RemoteAnimationTargetCompat.wrap(apps);

                        final RemoteAnimationTargetCompat[] wallpapersCompat =

                                RemoteAnimationTargetCompat.wrap(wallpapers);

                        animationHandler.onAnimationStart(controllerCompat, appsCompat,

                                homeContentInsets, minimizedHomeBounds);

                                wallpapersCompat, homeContentInsets, minimizedHomeBounds);

                    }



                    @Override