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

Merge "Do not add divider to dismiss transition" into udc-dev am: eee7c25194

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

Change-Id: I1c8c5949eb6ed2d01a46cda9c2a2a614629504eb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-07-10 06:25:36 +00:00
committed by Automerger Merge Worker
parent cd37187d23 eee7c25194
commit fb2c5d5eea
1 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2543,8 +2543,11 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
// handling to the mixed-handler to deal with splitting it up. // handling to the mixed-handler to deal with splitting it up.
if (mMixedHandler.animatePendingSplitWithDisplayChange(transition, info, if (mMixedHandler.animatePendingSplitWithDisplayChange(transition, info,
startTransaction, finishTransaction, finishCallback)) { startTransaction, finishTransaction, finishCallback)) {
mSplitLayout.update(startTransaction); if (mSplitTransitions.isPendingResize(transition)) {
startTransaction.apply(); // Only need to update in resize because divider exist before transition.
mSplitLayout.update(startTransaction);
startTransaction.apply();
}
return true; return true;
} }
} }
@@ -2913,8 +2916,6 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
mSideStage.getSplitDecorManager().release(callbackT); mSideStage.getSplitDecorManager().release(callbackT);
callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false); callbackWct.setReparentLeafTaskIfRelaunch(mRootTaskInfo.token, false);
}); });
addDividerBarToTransition(info, false /* show */);
return true; return true;
} }