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

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

Change-Id: I87a7ef96ccb7918b0062cc09ad9ab45e52995939
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
This commit is contained in:
Tony Huang
2023-06-01 10:35:04 +00:00
committed by Automerger Merge Worker
parent ce828a3cee 9cbda8fe8f
commit 7f37864730
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."); Log.w(TAG, "Launched a task in split, but didn't receive any task in transition.");
mSplitTransitions.mPendingEnter.cancel((cancelWct, cancelT) mSplitTransitions.mPendingEnter.cancel((cancelWct, cancelT)
-> prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, cancelWct)); -> prepareExitSplitScreen(STAGE_TYPE_UNDEFINED, cancelWct));
mSplitUnsupportedToast.show();
return true; return true;
} }
} else { } else {
@@ -2632,6 +2633,7 @@ public class StageCoordinator implements SplitLayout.SplitLayoutHandler,
(sideChild != null ? STAGE_TYPE_SIDE : STAGE_TYPE_UNDEFINED); (sideChild != null ? STAGE_TYPE_SIDE : STAGE_TYPE_UNDEFINED);
mSplitTransitions.mPendingEnter.cancel( mSplitTransitions.mPendingEnter.cancel(
(cancelWct, cancelT) -> prepareExitSplitScreen(dismissTop, cancelWct)); (cancelWct, cancelT) -> prepareExitSplitScreen(dismissTop, cancelWct));
mSplitUnsupportedToast.show();
return true; return true;
} }
} }