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

Merge "Show toast if split enter failed" into udc-dev am: 9cbda8fe8f am: 7f37864730

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

Change-Id: I4f590334d8d09f69df4fcc7e8738daa4dea12f06
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-06-01 11:19:22 +00:00
committed by Automerger Merge Worker
parent 8911c37ae2 7f37864730
commit f9fd48c35a
1 changed files with 2 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -2622,6 +2622,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
Log.w(TAG, "Launched a task in split, but didn't receive any task in transition.");
mSplitTransitions.mPendingEnter.cancel((cancelWct, cancelT)
-> prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, cancelWct));
mSplitUnsupportedToast.show();
return true;
}
} else {
@@ -2632,6 +2633,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
(sideChild != null ? STAGE_TYPE_SIDE : STAGE_TYPE_UNDEFINED);
mSplitTransitions.mPendingEnter.cancel(
(cancelWct, cancelT) -> prepareExitSplitScreen(dismissTop, cancelWct));
mSplitUnsupportedToast.show();
return true;
}
}