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

Commit 3859e5c4 authored by Robin Lee's avatar Robin Lee Committed by Cherrypicker Worker
Browse files

Revert "Pass keyguard occluded status in onAnimationCancelled." 

This reverts commit 9f4545bd.

Reason for revert: b/276433230

Test: atest CtsWindowManagerDeviceTestCases:KeyguardTests
Test: atest PowerKeyGestureTests
Bug: 276433230
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:56b8d382defad34d4289f122b76c43a5c32d99f7)
Merged-In: I972d5b80f202b9b6a645fc70b992f6b2141cbc20
Change-Id: I972d5b80f202b9b6a645fc70b992f6b2141cbc20
parent f23859d7

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
@@ -457,7 +457,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);