Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jerry Chang
2022-07-15 05:55:28 +00:00
committed by Android (Google) Code Review
parent cce53f3c16 8093651a4f
commit 9efd719085
6 changed files with 25 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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(),

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

@@ -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) {

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

@@ -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

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

@@ -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);
}
}
}

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

@@ -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);
}

20
libs/WindowManager/Shell/src/com/android/wm/shell/transition/Transitions.java
View File

@@ -516,15 +516,20 @@ public class Transitions implements RemoteCallable<Transitions> {
active.mMerged = true;
active.mAborted = abort;
if (active.mHandler != null) {
active.mHandler.onTransitionMerged(active.mToken);
active.mHandler.onTransitionConsumed(active.mToken, abort);
}
return;
}
mActiveTransitions.get(activeIdx).mAborted = abort;
final ActiveTransition active = mActiveTransitions.get(activeIdx);
active.mAborted = abort;
if (active.mAborted && active.mHandler != null) {
// Notifies to clean-up the aborted transition.
active.mHandler.onTransitionConsumed(transition, true /* aborted */);
}
ProtoLog.v(ShellProtoLogGroup.WM_SHELL_TRANSITIONS,
"Transition animation finished (abort=%b), notifying core %s", abort, transition);
// Merge all relevant transactions together
SurfaceControl.Transaction fullFinish = mActiveTransitions.get(activeIdx).mFinishT;
SurfaceControl.Transaction fullFinish = active.mFinishT;
for (int iA = activeIdx + 1; iA < mActiveTransitions.size(); ++iA) {
final ActiveTransition toMerge = mActiveTransitions.get(iA);
if (!toMerge.mMerged) break;
@@ -553,6 +558,10 @@ public class Transitions implements RemoteCallable<Transitions> {
while (mActiveTransitions.size() > activeIdx
&& mActiveTransitions.get(activeIdx).mAborted) {
ActiveTransition aborted = mActiveTransitions.remove(activeIdx);
// Notifies to clean-up the aborted transition.
if (aborted.mHandler != null) {
aborted.mHandler.onTransitionConsumed(transition, true /* aborted */);
}
mOrganizer.finishTransition(aborted.mToken, null /* wct */, null /* wctCB */);
}
if (mActiveTransitions.size() <= activeIdx) {
@@ -735,9 +744,10 @@ public class Transitions implements RemoteCallable<Transitions> {
/**
* Called when a transition which was already "claimed" by this handler has been merged
* into another animation. Gives this handler a chance to clean-up any expectations.
* into another animation or has been aborted. Gives this handler a chance to clean-up any
* expectations.
*/
default void onTransitionMerged(@NonNull IBinder transition) { }
default void onTransitionConsumed(@NonNull IBinder transition, boolean aborted) { }
/**
* Sets transition animation scale settings value to handler.