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

Commit 39d0b53b authored by Jerry Chang's avatar Jerry Chang Committed by Automerger Merge Worker
Browse files

Merge "Update handler callback to support clean-up aborted transitions" into... 

Merge "Update handler callback to support clean-up aborted transitions" into tm-qpr-dev am: 9efd7190

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



Change-Id: Iea19dfd329f9db3fd6fcf55c4cd4819dc5050c80
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 11692ac2 9efd7190

libs/WindowManager/Shell/src/com/android/wm/shell/pip/PipTransition.java

+2 −2
Original line number Diff line number Diff line
@@ -315,7 +315,7 @@ public class PipTransition extends PipTransitionController { 
    }



    @Override

    public void onTransitionMerged(@NonNull IBinder transition) {

    public void onTransitionConsumed(@NonNull IBinder transition, boolean aborted) {

        if (transition != mExitTransition) {

            return;

        }
@@ -328,7 +328,7 @@ public class PipTransition extends PipTransitionController { 
        }

        // Unset exitTransition AFTER cancel so that finishResize knows we are merging.

        mExitTransition = null;

        if (!cancelled) return;

        if (!cancelled || aborted) return;

        final ActivityManager.RunningTaskInfo taskInfo = mPipOrganizer.getTaskInfo();

        if (taskInfo != null) {

            startExpandAnimation(taskInfo, mPipOrganizer.getSurfaceControl(),

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

+3 −1
Original line number Diff line number Diff line
@@ -246,7 +246,9 @@ class SplitScreenTransitions { 
        return true;

    }



    void onTransitionMerged(@NonNull IBinder transition) {

    void onTransitionConsumed(@NonNull IBinder transition, boolean aborted) {

        if (aborted) return;



        // Once a pending enter transition got merged, make sure to append the reset of finishing

        // operations to the finish transition.

        if (transition == mPendingEnter) {

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

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



    @Override

    public void onTransitionMerged(@NonNull IBinder transition) {

        mSplitTransitions.onTransitionMerged(transition);

    public void onTransitionConsumed(@NonNull IBinder transition, boolean aborted) {

        mSplitTransitions.onTransitionConsumed(transition, aborted);

    }



    @Override

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

+2 −2
Original line number Diff line number Diff line
@@ -274,7 +274,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler { 
    }



    @Override

    public void onTransitionMerged(@NonNull IBinder transition) {

    public void onTransitionConsumed(@NonNull IBinder transition, boolean aborted) {

        MixedTransition mixed = null;

        for (int i = mActiveTransitions.size() - 1; i >= 0; --i) {

            if (mActiveTransitions.get(i).mTransition != transition) continue;
@@ -283,7 +283,7 @@ public class DefaultMixedHandler implements Transitions.TransitionHandler { 
        }

        if (mixed == null) return;

        if (mixed.mType == MixedTransition.TYPE_ENTER_PIP_FROM_SPLIT) {

            mPipHandler.onTransitionMerged(transition);

            mPipHandler.onTransitionConsumed(transition, aborted);

        }

    }

}

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

+1 −1
Original line number Diff line number Diff line
@@ -83,7 +83,7 @@ public class RemoteTransitionHandler implements Transitions.TransitionHandler { 
    }



    @Override

    public void onTransitionMerged(@NonNull IBinder transition) {

    public void onTransitionConsumed(@NonNull IBinder transition, boolean aborted) {

        mRequestedRemotes.remove(transition);

    }