Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Support split-screen modes on freeform displays" into rvc-dev

Browse Source
This commit is contained in:
Evan Rosky
2020-05-21 17:18:43 +00:00
committed by Android (Google) Code Review
parent ad13440a6f 07acd07061
commit cc9410f341
1 changed files with 1 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/TaskDisplayArea.java
View File

@@ -1275,14 +1275,10 @@ final class TaskDisplayArea extends DisplayArea<ActivityStack> {
return true;
}
final int displayWindowingMode = getWindowingMode();
if (windowingMode == WINDOWING_MODE_SPLIT_SCREEN_PRIMARY
|| windowingMode == WINDOWING_MODE_SPLIT_SCREEN_SECONDARY) {
return supportsSplitScreen
&& WindowConfiguration.supportSplitScreenWindowingMode(activityType)
// Freeform windows and split-screen windows don't mix well, so prevent
// split windowing modes on freeform displays.
&& displayWindowingMode != WINDOWING_MODE_FREEFORM;
&& WindowConfiguration.supportSplitScreenWindowingMode(activityType);
}
if (!supportsFreeform && windowingMode == WINDOWING_MODE_FREEFORM) {