From ce4ad8fb4f07270c9f6b91585b3fcc1b08262cda Mon Sep 17 00:00:00 2001 From: Jerry Chang Date: Tue, 15 Nov 2022 15:46:13 +0000 Subject: Show a toast message for apps not supporting multiple instances split Show a toast message to hint users when the dropping app not supporting multiple instances split. Bug: 258822425 Test: drag and drop the same app to enter split screen shows a proper toast message. Change-Id: I9a5adb3db65a78db5fff30c206cd0bb42fdfeec6 --- libs/WindowManager/Shell/res/values/strings.xml | 4 +++- .../src/com/android/wm/shell/splitscreen/SplitScreenController.java | 5 +++++ 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/libs/WindowManager/Shell/res/values/strings.xml b/libs/WindowManager/Shell/res/values/strings.xml index 9fab3a1eb4b9..25eddf834f3d 100644 --- a/libs/WindowManager/Shell/res/values/strings.xml +++ b/libs/WindowManager/Shell/res/values/strings.xml @@ -66,8 +66,10 @@ App may not work with split-screen. - + App does not support split-screen. + + This app can only be opened in 1 window. App may not work on a secondary display. diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java index cdc8cdd2c28d..bffe93c3061e 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenController.java @@ -58,6 +58,7 @@ import android.view.RemoteAnimationTarget; import android.view.SurfaceControl; import android.view.SurfaceSession; import android.view.WindowManager; +import android.widget.Toast; import android.window.RemoteTransition; import android.window.WindowContainerTransaction; @@ -579,6 +580,10 @@ public class SplitScreenController implements DragAndDropPolicy.Starter, } else if (isSplitScreenVisible()) { mStageCoordinator.switchSplitPosition("startIntent"); return; + } else { + Toast.makeText(mContext, R.string.dock_multi_instances_not_supported_text, + Toast.LENGTH_SHORT).show(); + return; } } -- cgit v1.2.3-59-g8ed1b