Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit f9fd48c3 authored by Tony Huang's avatar Tony Huang Committed by Automerger Merge Worker
Browse files

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

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



Change-Id: I4f590334d8d09f69df4fcc7e8738daa4dea12f06
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 8911c37a 7f378647

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

+2 −0
Original line number Diff line number Diff line
@@ -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;

            }

        }