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

Commit d7b885d8 authored by Yunfan Chen's avatar Yunfan Chen Committed by android-build-merger
Browse files

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

am: 7c370817

Change-Id: I7c728394b290c0a965022cfc1e9f73728af3afd3
parents 9f7760dd 7c370817

services/core/java/com/android/server/wm/ActivityTaskManagerService.java

+5 −0
Original line number Diff line number Diff line
@@ -3372,6 +3372,11 @@ public class ActivityTaskManagerService extends IActivityTaskManager.Stub { 


                if (stack.inFreeformWindowingMode()) {

                    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 {

                    stack.setWindowingMode(WINDOWING_MODE_FREEFORM);

                }