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

Merge "Restore window to undefined instead of freeform windowing mode" into qt-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2019-04-23 09:15:26 +00:00
committed by Android (Google) Code Review
parent 27ad19ee9e e9c1c319c7
commit 7c3708170c
1 changed files with 5 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
services/core/java/com/android/server/wm/ActivityTaskManagerService.java
View File

@@ -3372,6 +3372,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub {
if (stack.inFreeformWindowingMode()) { if (stack.inFreeformWindowingMode()) {
stack.setWindowingMode(WINDOWING_MODE_FULLSCREEN); stack.setWindowingMode(WINDOWING_MODE_FULLSCREEN);
} else if (stack.getParent().inFreeformWindowingMode()) {
// If the window is on a freeform display, set it to undefined. It will be
// resolved to freeform and it can adjust windowing mode when the display mode
// changes in runtime.
stack.setWindowingMode(WINDOWING_MODE_UNDEFINED);
} else { } else {
stack.setWindowingMode(WINDOWING_MODE_FREEFORM); stack.setWindowingMode(WINDOWING_MODE_FREEFORM);
} }