android11实现代码进入分屏、代码退出分屏功能

引言

自android7开始，分屏功能官方就已经实现了。Android11的操作方式是点击rescent键，选择一个应用进入分屏，然后系统会主动在下半屏表现另一个应用。
然后客户是客制化的系统，没有任务栏和状态栏。以是需要开发通过代码进入分屏的方式，而且客户盼望可以自由开启一个应用进入上分屏或下分屏，自由退出上分屏或下分屏。这些原生Android11都是没有的，只能新开发。
新开发功能

• 从taskId进入分屏
  
• 启动intent进入分屏
  
• 从taskId退出分屏
  
• 自由退出分屏
  
  
  
  

分屏原理分析

首先看一个未分屏状态下的activity栈状态，执行命令

1. adb shell dumpsys activity activities

复制代码

1.   Task display areas in top down Z order:
2.     TaskDisplayArea DefaultTaskDisplayArea
3.       mLastOrientationSource=Task{5ebffec #12 visible=true type=standard mode=fullscreen translucent=false A=10099:com.android.dialer U=0 StackId=12 sz=1}
4.       mPreferredTopFocusableStack=Task{5ebffec #12 visible=true type=standard mode=fullscreen translucent=false A=10099:com.android.dialer U=0 StackId=12 sz=1}
5.       mLastFocusedStack=Task{5ebffec #12 visible=true type=standard mode=fullscreen translucent=false A=10099:com.android.dialer U=0 StackId=12 sz=1}
6.       Application tokens in top down Z order:
7.       * Task{5ebffec #12 visible=true type=standard mode=fullscreen translucent=false A=10099:com.android.dialer U=0 StackId=12 sz=1}
8.         mLastOrientationSource=ActivityRecord{e499cf9 u0 com.android.dialer/.main.impl.MainActivity t12}
9.         bounds=[0,0][720,1280]
10.         * ActivityRecord{e499cf9 u0 com.android.dialer/.main.impl.MainActivity t12}
11.       * Task{d0d36ff #1 visible=true type=home mode=fullscreen translucent=false I=com.android.launcher3/.uioverrides.QuickstepLauncher U=0 StackId=1 sz=1}
12.         mLastOrientationSource=Task{da384a7 #10 visible=true type=home mode=fullscreen translucent=false I=com.android.launcher3/.uioverrides.QuickstepLauncher U=0 StackId=1 sz=1}
13.         bounds=[0,0][720,1280]
14.         * Task{da384a7 #10 visible=true type=home mode=fullscreen translucent=false I=com.android.launcher3/.uioverrides.QuickstepLauncher U=0 StackId=1 sz=1}
15.           mLastOrientationSource=ActivityRecord{c16f68e u0 com.android.launcher3/.uioverrides.QuickstepLauncher t10}
16.           bounds=[0,0][720,1280]
17.           * ActivityRecord{c16f68e u0 com.android.launcher3/.uioverrides.QuickstepLauncher t10}
18.       * Task{c140c5 #3 visible=false type=undefined mode=split-screen-primary translucent=true ?? U=0 StackId=3 sz=0}
19.         bounds=[0,0][720,606]
20.       * Task{b689f28 #4 visible=false type=undefined mode=split-screen-secondary translucent=true ?? U=0 StackId=4 sz=0}
21.         bounds=[0,626][720,1280]

复制代码

看末了两个task，他们分属于差别的stackId，且都有差别的mode和bounds，mode分别是split-screen-primary和split-screen-secondary。split-screen-primary表示上半屏，且bounds=[0,0][720,606]就是处在上半屏的位置；split-screen-secondary表示下半屏，bounds=[0,626][720,1280]就是处在下半屏的位置。
Android系统其实就是根据stack来实现分屏的，系统启动之初就创建好了几个重要的stack，每个stack规定了本身的bounds和mode，bounds即巨细和表现位置，mode即表现模式。Android系统中的每一个Activity都位于一个Task中，每个task都位于一个ActivityStack中。
全屏模式下大部分activity都处于fullscreen模式下的activityStack，把要分屏表现的activity的task移入分屏ActivityStack即可分屏表现。
从taskId进入分屏

原生android11只支持设置一个taskId表如今上半屏进入分屏状态，我这里实现的可以根据参数设置一个taskId进入上分屏或下分屏。
有四个方法可以实现，分别是：

1. 1 ActivityTaskManager.setTaskWindowingMode(int taskId, int windowingMode, boolean toTop)
2. 2 ActivityTaskManager.setTaskWindowingModeSplitScreenPrimary(int taskId, int createMode, boolean toTop, boolean animate, Rect initialBounds, boolean showRecents)
3. 3
4. //注：原生android11只支持进入上分屏
5. final ActivityOptions options = ActivityOptions.makeBasic();
6. options.setLaunchWindowingMode(true ? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY : WINDOWING_MODE_SPLIT_SCREEN_SECONDARY);
7. options.setSplitScreenCreateMode(true ? SPLIT_SCREEN_CREATE_MODE_TOP_OR_LEFT : SPLIT_SCREEN_CREATE_MODE_BOTTOM_OR_RIGHT);
8. ActivityTaskManager.getService().startActivityFromRecents(getTaskId(), options.toBundle())
9. 4
10. //注：此方法只适合在已经分屏状态下启动activity进入下半屏
11. Intent intent = new Intent("android.settings.SETTINGS");
12. intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
13. startActivity(intent);

复制代码

启动intent进入分屏

原生android11只支持在已经分屏状态下启动activity表如今另半屏，我这里实现的可以根据参数设置启动intent进入上分屏或下分屏。

1. Intent intent = new Intent(this, SubActivity.class);
2. intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT | Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY);
3. intent.putExtra("showOnSpliteScreenPrimary", inflate.cbShowInSplitePrimary.isChecked());
4. startActivity(intent);

复制代码

从taskId退出分屏

1. //第二个参数是WindowConfiguration.WINDOWING_MODE_FULLSCREEN
2. ActivityTaskManager.setTaskWindowingMode(int taskId, int windowingMode, boolean toTop)

复制代码

自由退出分屏

1. //此功能新增的，show_splitScreenPrimary指定全屏显示上半屏幕或下半屏。
2. ActivityTaskManager.getService().exitSpliteScreenMode(show_splitScreenPrimary);

复制代码

功能实现

上面是摆列客户端的使用接口，下面贴出修改点。
关键修改类：

1. frameworks/base/core/java/android/content/Intent.java
2. frameworks/base/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
3. frameworks/base/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
4. frameworks/base/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
5. frameworks/base/packages/SystemUI/plugin/src/com/android/systemui/plugins/ActivityStarter.java
6. frameworks/base/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
7. frameworks/base/services/core/java/com/android/server/wm/RootWindowContainer.java
8. frameworks/base/services/core/java/com/android/server/wm/TaskDisplayArea.java

复制代码

修改如下：

1. diff --git a/core/java/android/content/Intent.java b/core/java/android/content/Intent.java
2. index 24d59a0826c8..8fd92d171cf6 100644
3. --- a/core/java/android/content/Intent.java
4. +++ b/core/java/android/content/Intent.java
5. @@ -6451,7 +6451,8 @@ public class Intent implements Parcelable, Cloneable {
6.       * required if you want a new instance of an existing activity to be created.
7.       */
8.      public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT = 0x00001000;
9. -
10. +    //huanghp add: to enable startActivity into splite-screen-mode
11. +    public static final int FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY = 0x00001001;
13.      /**
14.       * If set in an Intent passed to {@link Context#startActivity Context.startActivity()},
16. diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
17. index 570a4bb3cd12..4ae96665f635 100644
18. --- a/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
19. +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/Divider.java
20. @@ -523,7 +523,8 @@ public class Divider extends SystemUI implements DividerView.DividerCallbacks,
21.          update(mDisplayController.getDisplayContext(
22.                  mContext.getDisplayId()).getResources().getConfiguration());
23.          // Set resizable directly here because applyEnterSplit already resizes home stack.
24. -        mHomeStackResizable = mWindowManagerProxy.applyEnterSplit(mSplits, mSplitLayout);
25. +        //huanghp modify:for apply to different split screen states
26. +        mHomeStackResizable = mWindowManagerProxy.applyEnterSplit2(mSplits, mSplitLayout);
27.      }
29.      void startDismissSplit() {
30. diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
31. index 7a313dc0622b..c8e816f3c02f 100644
32. --- a/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
33. +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/SplitScreenTaskOrganizer.java
34. @@ -214,6 +214,17 @@ class SplitScreenTaskOrganizer extends TaskOrganizer {
35.                      Log.d(TAG, "   was not in split, but primary is populated, so enter it");
36.                  }
37.                  mDivider.startEnterSplit();
38. +                //huanghp add: to enable start splite-screen-mode from secondary splite
39. +            } else if (!secondaryIsEmpty && primaryWasEmpty && secondaryWasEmpty) {
40. +                // Wasn't in split-mode (both were empty), but now that the secondary split is
41. +                // populated, we should fully enter split by moving everything else into primary.
42. +                // This just tells window-manager to reparent things, the UI will respond
43. +                // when it gets new task info for the primary split.
44. +                if (DEBUG) {
45. +                    Log.d(TAG, "   was not in split, but secondary is populated, so enter it");
46. +                }
47. +                mDivider.startEnterSplit();
48. +                //huanghp end
49.              }
50.          } else if (secondaryImpliesMinimize) {
51.              // Both splits are populated but the secondary split has a home/recents stack on top,
52. diff --git a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
53. index 410e3dd39a0b..b13f4195fca7 100644
54. --- a/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
55. +++ b/packages/SystemUI/src/com/android/systemui/stackdivider/WindowManagerProxy.java
56. @@ -18,6 +18,7 @@ package com.android.systemui.stackdivider;
58. import static android.app.WindowConfiguration.ACTIVITY_TYPE_HOME;
59. import static android.app.WindowConfiguration.ACTIVITY_TYPE_RECENTS;
60. +import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
61. import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;
62. import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
63. import static android.content.res.Configuration.ORIENTATION_LANDSCAPE;
64. @@ -229,6 +230,51 @@ public class WindowManagerProxy {
65.          return isHomeResizable;
66.      }
68. +    //huanghp add: to support moveTaskToStack split-screen-secondary by systemui
69. +    boolean applyEnterSplit2(SplitScreenTaskOrganizer tiles, SplitDisplayLayout layout) {
70. +        // Set launchtile first so that any stack created after
71. +        // getAllStackInfos and before reparent (even if unlikely) are placed
72. +        // correctly.
73. +        final boolean primaryIsEmpty = tiles.mPrimary.topActivityType == ACTIVITY_TYPE_UNDEFINED;
74. +        TaskOrganizer.setLaunchRoot(DEFAULT_DISPLAY, primaryIsEmpty ? tiles.mPrimary.token: tiles.mSecondary.token);
75. +        List<ActivityManager.RunningTaskInfo> rootTasks =
76. +                TaskOrganizer.getRootTasks(DEFAULT_DISPLAY, null /* activityTypes */);
77. +        WindowContainerTransaction wct = new WindowContainerTransaction();
78. +        if (rootTasks.isEmpty()) {
79. +            return false;
80. +        }
81. +        ActivityManager.RunningTaskInfo topHomeTask = null;
82. +        for (int i = rootTasks.size() - 1; i >= 0; --i) {
83. +            final ActivityManager.RunningTaskInfo rootTask = rootTasks.get(i);
84. +            // Only move resizeable task to split secondary. However, we have an exception
85. +            // for non-resizable home because we will minimize to show it.
86. +            if (!rootTask.isResizeable && rootTask.topActivityType != ACTIVITY_TYPE_HOME) {
87. +                continue;
88. +            }
89. +            // Only move fullscreen tasks to split secondary.
90. +            if (rootTask.configuration.windowConfiguration.getWindowingMode()
91. +                    != WINDOWING_MODE_FULLSCREEN) {
92. +                continue;
93. +            }
94. +            // Since this iterates from bottom to top, update topHomeTask for every fullscreen task
95. +            // so it will be left with the status of the top one.
96. +            topHomeTask = isHomeOrRecentTask(rootTask) ? rootTask : null;
97. +            wct.reparent(rootTask.token, primaryIsEmpty ? tiles.mPrimary.token: tiles.mSecondary.token, true /* onTop */);
98. +        }
99. +        // Move the secondary split-forward.
100. +        wct.reorder(primaryIsEmpty ? tiles.mPrimary.token: tiles.mSecondary.token, true /* onTop */);
101. +        boolean isHomeResizable = applyHomeTasksMinimized(layout, null /* parent */, wct);
102. +        if (topHomeTask != null) {
103. +            // Translate/update-crop of secondary out-of-band with sync transaction -- Until BALST
104. +            // is enabled, this temporarily syncs the home surface position with offset until
105. +            // sync transaction finishes.
106. +            wct.setBoundsChangeTransaction(topHomeTask.token, tiles.mHomeBounds);
107. +        }
108. +        applySyncTransaction(wct);
109. +        return isHomeResizable;
110. +    }
111. +    //huanghp end
112. +
113.      static boolean isHomeOrRecentTask(ActivityManager.RunningTaskInfo ti) {
114.          final int atype = ti.configuration.windowConfiguration.getActivityType();
115.          return atype == ACTIVITY_TYPE_HOME || atype == ACTIVITY_TYPE_RECENTS;
116. diff --git a/services/core/java/com/android/server/wm/ActivityStarter.java b/services/core/java/com/android/server/wm/ActivityStarter.java
117. index 4c883805ec8e..f96c42c531ef 100644
118. --- a/services/core/java/com/android/server/wm/ActivityStarter.java
119. +++ b/services/core/java/com/android/server/wm/ActivityStarter.java
120. @@ -36,6 +36,7 @@ import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
121. import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TASK;
122. import static android.content.Intent.FLAG_ACTIVITY_CLEAR_TOP;
123. import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT;
124. +import static android.content.Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY;
125. import static android.content.Intent.FLAG_ACTIVITY_MULTIPLE_TASK;
126. import static android.content.Intent.FLAG_ACTIVITY_NEW_DOCUMENT;
127. import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
128. @@ -110,6 +111,7 @@ import android.service.voice.IVoiceInteractionSession;
129. import android.text.TextUtils;
130. import android.util.ArraySet;
131. import android.util.DebugUtils;
132. +import android.util.Log;
133. import android.util.Pools.SynchronizedPool;
134. import android.util.Slog;
136. @@ -1795,6 +1797,18 @@ class ActivityStarter {
137.              }
138.              mOptions.setLaunchWindowingMode(windowingMode);
139.          }
140. +        //huanghp add: for enable to enter splite-screen from startActivity
141. +        else if ((mLaunchFlags & FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY)!=0){
142. +            boolean showOnSpliteScreenPrimary = r.intent.getBooleanExtra("showOnSpliteScreenPrimary", false);
143. +            int windowingMode = showOnSpliteScreenPrimary ? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY : WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
144. +            if (mOptions == null) {
145. +                mOptions = ActivityOptions.makeBasic();
146. +            }
147. +            mOptions.setLaunchWindowingMode(windowingMode);
148. +            Log.w(TAG, "computeLaunchParams() called with: r = [" + r + "], sourceRecord = ["
149. +                    + sourceRecord + "], targetTask = [" + targetTask + "], showOnSpliteScreenPrimary="+ showOnSpliteScreenPrimary + "]");
150. +        }
151. +        //huanghp end
153.          mSupervisor.getLaunchParamsController().calculate(targetTask, r.info.windowLayout, r,
154.                  sourceRecord, mOptions, PHASE_BOUNDS, mLaunchParams);
155. diff --git a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
156. index b664bb7d9d78..f99c753f73a4 100644
157. --- a/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
158. +++ b/services/core/java/com/android/server/wm/ActivityTaskManagerService.java
159. @@ -2389,6 +2389,39 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
160.          return null;
161.      }
163. +    @Override
164. +    public boolean exitSpliteScreenMode(boolean show_splitScreenPrimary){
165. +        Log.d(TAG, "exitSpliteScreenMode() called with: showPrimaryScreen = [" + show_splitScreenPrimary + "]");
166. +        enforceCallerIsRecentsOrHasPermission(MANAGE_ACTIVITY_STACKS, "setTaskWindowingMode()");
167. +        synchronized (mGlobalLock) {
168. +            final long ident = Binder.clearCallingIdentity();
169. +            try {
170. +                TaskDisplayArea defaultTaskDisplayArea = mRootWindowContainer.getDisplayContent(
171. +                        DEFAULT_DISPLAY).getDefaultTaskDisplayArea();
172. +                ActivityStack rootSplitScreenPrimaryTask = defaultTaskDisplayArea.getRootSplitScreenPrimaryTask();
173. +                ActivityStack rootSplitScreenSecondaryTask = defaultTaskDisplayArea.getRootSplitScreenSecondaryTask();
174. +                if (show_splitScreenPrimary){
175. +                    if (rootSplitScreenPrimaryTask!=null){
176. +                        Task topMostTask = rootSplitScreenPrimaryTask.getTopMostTask();
177. +                        if (topMostTask!=null){
178. +                            return setTaskWindowingMode(topMostTask.mTaskId, WINDOWING_MODE_FULLSCREEN, true);
179. +                        }
180. +                    }
181. +                }else if (rootSplitScreenSecondaryTask!=null){
182. +                    Task topMostTask = rootSplitScreenSecondaryTask.getTopMostTask();
183. +                    if (topMostTask!=null){
184. +                        return setTaskWindowingMode(topMostTask.mTaskId, WINDOWING_MODE_FULLSCREEN, true);
185. +                    }
186. +                }
187. +            } catch (Exception e) {
188. +                e.printStackTrace();
189. +            } finally {
190. +                Binder.restoreCallingIdentity(ident);
191. +            }
192. +        }
193. +        return false;
194. +    }
195. +
196.      @Override
197.      public boolean setTaskWindowingMode(int taskId, int windowingMode, boolean toTop) {
198.          if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY) {
199. @@ -2437,6 +2470,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
200.          }
201.      }
203. +    @Override
204. +    public void toggleSplitScreen() throws RemoteException {
205. +
206. +    }
207. +
208.      @Override
209.      public String getCallingPackage(IBinder token) {
210.          synchronized (mGlobalLock) {
211. @@ -2846,8 +2884,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
212.              // The task is already in split-screen and with correct windowing mode.
213.              return true;
214.          }
215. -
216. -        moveTaskToSplitScreenPrimaryTask(task, toTop);
217. +        //huanghp modify
218. +        if (windowingMode== WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY){
219. +            moveTaskToSplitScreenPrimaryTask(task, toTop);
220. +        }else moveTaskToSplitScreenSecondaryTask(task, toTop);
221. +        //huanghp end
222.          return prevMode != task.getWindowingMode();
223.      }
225. @@ -2871,6 +2912,31 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
226.          mWindowOrganizerController.applyTransaction(wct);
227.      }
229. +    //huanghp add
230. +    void moveTaskToSplitScreenSecondaryTask(Task task, boolean toTop) {
231. +        Log.d(TAG,
232. +                "moveTaskToSplitScreenSecondaryTask() called with: task = [" + task + "], toTop = ["
233. +                        + toTop + "]");
234. +        final TaskDisplayArea taskDisplayArea = task.getDisplayArea();
235. +        final ActivityStack secondarySplitTask = taskDisplayArea.getRootSplitScreenSecondaryTask();
236. +        if (secondarySplitTask == null) {
237. +            throw new IllegalStateException("Can't enter split without associated organized task");
238. +        }
239. +
240. +        if (toTop) {
241. +            taskDisplayArea.positionStackAt(POSITION_TOP, secondarySplitTask,
242. +                    false /* includingParents */);
243. +        }
244. +        WindowContainerTransaction wct = new WindowContainerTransaction();
245. +        // Clear out current windowing mode before reparenting to split taks.
246. +        wct.setWindowingMode(
247. +                task.getStack().mRemoteToken.toWindowContainerToken(), WINDOWING_MODE_UNDEFINED);
248. +        wct.reparent(task.getStack().mRemoteToken.toWindowContainerToken(),
249. +                secondarySplitTask.mRemoteToken.toWindowContainerToken(), toTop);
250. +        mWindowOrganizerController.applyTransaction(wct);
251. +    }
252. +    //huanghp end
253. +
254.      /**
255.       * Removes stacks in the input windowing modes from the system if they are of activity type
256.       * ACTIVITY_TYPE_STANDARD or ACTIVITY_TYPE_UNDEFINED
257. diff --git a/services/core/java/com/android/server/wm/RootWindowContainer.java b/services/core/java/com/android/server/wm/RootWindowContainer.java
258. index 5c1b6eefcecc..41cded3f35fc 100644
259. --- a/services/core/java/com/android/server/wm/RootWindowContainer.java
260. +++ b/services/core/java/com/android/server/wm/RootWindowContainer.java
261. @@ -27,6 +27,7 @@ import static android.app.WindowConfiguration.ACTIVITY_TYPE_UNDEFINED;
262. import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN_OR_SPLIT_SCREEN_SECONDARY;
263. import static android.app.WindowConfiguration.WINDOWING_MODE_PINNED;
264. import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_PRIMARY;
265. +import static android.app.WindowConfiguration.WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
266. import static android.app.WindowConfiguration.WINDOWING_MODE_UNDEFINED;
267. import static android.content.Intent.FLAG_ACTIVITY_NEW_TASK;
268. import static android.content.pm.ActivityInfo.LAUNCH_SINGLE_INSTANCE;
269. @@ -133,6 +134,7 @@ import android.service.voice.IVoiceInteractionSession;
270. import android.util.ArraySet;
271. import android.util.DisplayMetrics;
272. import android.util.IntArray;
273. +import android.util.Log;
274. import android.util.Pair;
275. import android.util.Slog;
276. import android.util.SparseArray;
277. @@ -3008,23 +3010,36 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
278.          if (!r.canBeLaunchedOnDisplay(taskDisplayArea.getDisplayId())) {
279.              return null;
280.          }
281. +        //huanghp add: to get the desired splite-window-mode
282. +        int expectWindowMode=-1;
283. +        if ((r.intent.getFlags()&Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY)!=0){
284. +            boolean showOnSpliteScreenPrimary = r.intent.getBooleanExtra("showOnSpliteScreenPrimary", false);
285. +            expectWindowMode= showOnSpliteScreenPrimary? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY:WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
286. +        }
287. +        //huanghp end
289.          // If {@code r} is already in target display area and its task is the same as the candidate
290.          // task, the intention should be getting a launch stack for the reusable activity, so we can
291.          // use the existing stack.
292.          if (candidateTask != null && (r.getTask() == null || r.getTask() == candidateTask)) {
293. -            // TODO(b/153920825): Fix incorrect evaluation of attached state
294. -            final TaskDisplayArea attachedTaskDisplayArea = r.getTask() != null
295. -                    ? r.getTask().getDisplayArea() : r.getDisplayArea();
296. -            if (attachedTaskDisplayArea == null || attachedTaskDisplayArea == taskDisplayArea) {
297. -                return candidateTask.getStack();
298. -            }
299. -            // Or the candidate task is already a root task that can be reused by reparenting
300. -            // it to the target display.
301. -            if (candidateTask.isRootTask()) {
302. -                final ActivityStack stack = candidateTask.getStack();
303. -                stack.reparent(taskDisplayArea, true /* onTop */);
304. -                return stack;
305. +            //huanghp add
306. +            if (expectWindowMode!=-1 && expectWindowMode!=candidateTask.getWindowingMode()){
307. +                Log.w(TAG, "getValidLaunchStackInTaskDisplayArea: with expectWindowMode different");
308. +            }else {
309. +                huanghp end
310. +                // TODO(b/153920825): Fix incorrect evaluation of attached state
311. +                final TaskDisplayArea attachedTaskDisplayArea = r.getTask() != null
312. +                        ? r.getTask().getDisplayArea() : r.getDisplayArea();
313. +                if (attachedTaskDisplayArea == null || attachedTaskDisplayArea == taskDisplayArea) {
314. +                    return candidateTask.getStack();
315. +                }
316. +                // Or the candidate task is already a root task that can be reused by reparenting
317. +                // it to the target display.
318. +                if (candidateTask.isRootTask()) {
319. +                    final ActivityStack stack = candidateTask.getStack();
320. +                    stack.reparent(taskDisplayArea, true /* onTop */);
321. +                    return stack;
322. +                }
323.              }
324.          }
326. @@ -3072,6 +3087,18 @@ class RootWindowContainer extends WindowContainer<DisplayContent>
327.          }
328.          if (stack.mCreatedByOrganizer) {
329.              // Don't launch directly into task created by organizer...but why can't we?
330. +            //huanghp add: to enable launch activity into splite-screen-mode
331. +            if (r.supportsSplitScreenWindowingMode() && (r.intent.getFlags()&Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY)!=0){
332. +                boolean showOnSpliteScreenPrimary = r.intent.getBooleanExtra("showOnSpliteScreenPrimary", false);
333. +                if ((showOnSpliteScreenPrimary && stack.getWindowingMode()==WINDOWING_MODE_SPLIT_SCREEN_PRIMARY && windowingMode==WINDOWING_MODE_SPLIT_SCREEN_PRIMARY)
334. +                || (!showOnSpliteScreenPrimary && stack.getWindowingMode()==WINDOWING_MODE_SPLIT_SCREEN_SECONDARY && windowingMode==WINDOWING_MODE_SPLIT_SCREEN_SECONDARY)){
335. +                    Log.w(TAG, "isValidLaunchStack() called with FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY: stack = [" + stack + "], r = [" + r + "], windowingMode = [" + windowingMode + "]");
336. +                    return true;
337. +                }
338. +            }
339. +            Log.w(TAG, "isValidLaunchStack() called with##stack.mCreatedByOrganizer: stack = [" + stack + "], r = [" + r
340. +                    + "], windowingMode = [" + windowingMode + "]");
341. +            //huanghp end
342.              return false;
343.          }
344.          // There is a 1-to-1 relationship between stack and task when not in
345. diff --git a/services/core/java/com/android/server/wm/TaskDisplayArea.java b/services/core/java/com/android/server/wm/TaskDisplayArea.java
346. index 79f3b8340b21..eccd3594ece6 100644
347. --- a/services/core/java/com/android/server/wm/TaskDisplayArea.java
348. +++ b/services/core/java/com/android/server/wm/TaskDisplayArea.java
349. @@ -1480,6 +1480,13 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
350.              // Switch to the display's windowing mode if we are not in split-screen mode and we are
351.              // trying to launch in split-screen secondary.
352.              windowingMode = WINDOWING_MODE_UNDEFINED;
353. +            //huanghp add: enable to launch in split-screen secondary or primary
354. +            if (r!=null && (r.intent.getFlags()&Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT_ARBITRARY)!=0){
355. +                boolean showOnSpliteScreenPrimary = r.intent.getBooleanExtra(
356. +                        "showOnSpliteScreenPrimary", false);
357. +                windowingMode= showOnSpliteScreenPrimary? WINDOWING_MODE_SPLIT_SCREEN_PRIMARY:WINDOWING_MODE_SPLIT_SCREEN_SECONDARY ;
358. +            }
359. +            //huanghp end
360.          } else if (inSplitScreenMode && windowingMode == WINDOWING_MODE_UNDEFINED) {
361.              windowingMode = WINDOWING_MODE_SPLIT_SCREEN_SECONDARY;
362.          }
363. --
364. 2.34.1

复制代码

end，谢谢！

免责声明：如果侵犯了您的权益，请联系站长，我们会及时删除侵权内容，谢谢合作！更多信息从访问主页：qidao123.com:ToB企服之家，中国第一个企服评测及商务社交产业平台。