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

Merge "Fix dragging the same app over a split app dismisses the split"

Browse Source
This commit is contained in:
Jerry Chang
2022-02-16 01:02:35 +00:00
committed by Android (Google) Code Review
parent 5e84beeb25 a19699eaa1
commit 48045245e9
1 changed files with 11 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java
View File

@@ -349,17 +349,20 @@ public class SplitScreenController implements DragAndDropPolicy.Starter,
RemoteAnimationTarget[] wallpapers, RemoteAnimationTarget[] nonApps,
IRemoteAnimationFinishedCallback finishedCallback,
SurfaceControl.Transaction t) {
mStageCoordinator.updateSurfaceBounds(null /* layout */, t);
if (apps != null) {
for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) {
t.show(apps[i].leash);
}
}
if (apps == null || apps.length == 0) {
// Do nothing when the animation was cancelled.
t.apply();
return;
}
mStageCoordinator.updateSurfaceBounds(null /* layout */, t);
for (int i = 0; i < apps.length; ++i) {
if (apps[i].mode == MODE_OPENING) {
t.show(apps[i].leash);
}
}
t.apply();
if (finishedCallback != null) {
try {
finishedCallback.onAnimationFinished();