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

Commit 2f4b0ed7 authored by Robin Lee's avatar Robin Lee Committed by Automerger Merge Worker
Browse files

Merge "Revert "Pass keyguard occluded status in onAnimationCancelled."" into... 

Merge "Revert "Pass keyguard occluded status in onAnimationCancelled."" into udc-dev am: 744c5eee am: d3990ac3

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22380525



Change-Id: Id080bc2ae47122eccaf03c61ad8b70b8583fc6c5
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 31275f51 d3990ac3

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(boolean isKeyguardOccluded);

    void onAnimationCancelled();

}

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

+1 −4
Original line number Diff line number Diff line
@@ -83,10 +83,7 @@ class TaskFragmentAnimationRunner extends IRemoteAnimationRunner.Stub { 
    }



    @Override

    public void onAnimationCancelled(boolean isKeyguardOccluded) {

        if (TaskFragmentAnimationController.DEBUG) {

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

        }

    public void onAnimationCancelled() {

        mHandler.post(this::cancelAnimation);

    }

libs/WindowManager/Shell/src/com/android/wm/shell/back/CrossActivityAnimation.java

+1 −1
Original line number Diff line number Diff line
@@ -404,7 +404,7 @@ class CrossActivityAnimation { 
        }



        @Override

        public void onAnimationCancelled(boolean isKeyguardOccluded) {

        public void onAnimationCancelled() {

            finishAnimation();

        }

    }

libs/WindowManager/Shell/src/com/android/wm/shell/back/CustomizeActivityAnimation.java

+1 −1
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ class CustomizeActivityAnimation { 
        }



        @Override

        public void onAnimationCancelled(boolean isKeyguardOccluded) {

        public void onAnimationCancelled() {

            finishAnimation();

        }

    }

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

+1 −1
Original line number Diff line number Diff line
@@ -460,7 +460,7 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, 
                }

            }

            @Override

            public void onAnimationCancelled(boolean isKeyguardOccluded) {

            public void onAnimationCancelled() {

                final WindowContainerTransaction evictWct = new WindowContainerTransaction();

                mStageCoordinator.prepareEvictInvisibleChildTasks(evictWct);

                mSyncQueue.queue(evictWct);