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 am: fb2c5d5eea

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

Change-Id: I1f2eddcf6eb5ebcf21cfe5684c9f03ee855de174
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-07-10 07:12:45 +00:00
committed by Automerger Merge Worker
parent a4968d6ef8 fb2c5d5eea
commit e1e65a0ed9
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

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