diff options
| author | 2023-06-01 03:34:53 +0000 | |
|---|---|---|
| committer | 2023-06-01 03:34:53 +0000 | |
| commit | 7dd70a58255b65eee23da11c8d71d762cdd9750a (patch) | |
| tree | 771b83b8fedac9996071bcdb609ef393b33b3ea1 | |
| parent | 53120f84fbce8679f5c2b7082e8077c0ef4a8bdf (diff) | |
| parent | 9cbda8fe8fec69d549f9e1d182a0429ea6a6ac3f (diff) | |
Merge "Show toast if split enter failed" into udc-dev am: 9cbda8fe8f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23443364
Change-Id: I72a81daf0d9e7166a9a11a92f14badda9a02cfef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java index b2526ee97a21..b4020a068325 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/StageCoordinator.java @@ -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; } } |