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

Commit 708b4613 authored by Issei Suzuki's avatar Issei Suzuki Committed by Android (Google) Code Review
Browse files

Merge "Pass keyguard occluded status in onAnimationCancelled."

parents c6d82a8c 9f4545bd

core/java/android/view/IRemoteAnimationRunner.aidl

+1 −1
Original line number Diff line number Diff line
@@ -46,5 +46,5 @@ oneway interface IRemoteAnimationRunner { 
     * won't have any effect anymore.

     */

    @UnsupportedAppUsage(maxTargetSdk = 30, trackingBug = 170729553)

    void onAnimationCancelled();

    void onAnimationCancelled(boolean isKeyguardOccluded);

}

libs/WindowManager/Jetpack/src/androidx/window/extensions/embedding/TaskFragmentAnimationRunner.java

+2 −2
Original line number Diff line number Diff line
@@ -83,9 +83,9 @@ class TaskFragmentAnimationRunner extends IRemoteAnimationRunner.Stub { 
    }



    @Override

    public void onAnimationCancelled() {

    public void onAnimationCancelled(boolean isKeyguardOccluded) {

        if (TaskFragmentAnimationController.DEBUG) {

            Log.v(TAG, "onAnimationCancelled");

            Log.v(TAG, "onAnimationCancelled: isKeyguardOccluded=" + isKeyguardOccluded);

        }

        mHandler.post(this::cancelAnimation);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java

+2 −2
Original line number Diff line number Diff line
@@ -457,10 +457,10 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler, 
            }



            @Override

            public void onAnimationCancelled() {

            public void onAnimationCancelled(boolean isKeyguardOccluded) {

                onRemoteAnimationFinishedOrCancelled(evictWct);

                try {

                    adapter.getRunner().onAnimationCancelled();

                    adapter.getRunner().onAnimationCancelled(isKeyguardOccluded);

                } catch (RemoteException e) {

                    Slog.e(TAG, "Error starting remote animation", e);

                }

libs/WindowManager/Shell/src/com/android/wm/shell/transition/LegacyTransitions.java

+1 −1
Original line number Diff line number Diff line
@@ -107,7 +107,7 @@ public class LegacyTransitions { 
            }



            @Override

            public void onAnimationCancelled() throws RemoteException {

            public void onAnimationCancelled(boolean isKeyguardOccluded) throws RemoteException {

                mCancelled = true;

                mApps = mWallpapers = mNonApps = null;

                checkApply();

packages/SystemUI/animation/src/com/android/systemui/animation/ActivityLaunchAnimator.kt

+1 −1
Original line number Diff line number Diff line
@@ -656,7 +656,7 @@ class ActivityLaunchAnimator( 
            controller.onLaunchAnimationCancelled()

        }



        override fun onAnimationCancelled() {

        override fun onAnimationCancelled(isKeyguardOccluded: Boolean) {

            if (timedOut) {

                return

            }