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

Commit 13fd7f18 authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Fix issue with PiP hiding when dragging divider."

parents 79e5cf1c 2af04b31

core/java/android/app/ActivityManager.java

+7 −0
Original line number Diff line number Diff line
@@ -697,6 +697,13 @@ public class ActivityManager { 
                    && stackId != DOCKED_STACK_ID && stackId != PINNED_STACK_ID;

        }



        /**

         * Returns true if the input stack is affected by drag resizing.

         */

        public static boolean isStackAffectedByDragResizing(int stackId) {

            return isStaticStack(stackId) && stackId != PINNED_STACK_ID;

        }



        /**

         * Returns true if the windows of tasks being moved to the target stack from the source

         * stack should be replaced, meaning that window manager will keep the old window around

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

+3 −1
Original line number Diff line number Diff line
@@ -3199,8 +3199,10 @@ class WindowState extends WindowContainer<WindowState> implements WindowManagerP 
        if (task == null) {

            return false;

        }

        if (!StackId.isStackAffectedByDragResizing(getStackId())) {

            return false;

        }

        if (mAttrs.width != MATCH_PARENT || mAttrs.height != MATCH_PARENT) {



            // Floating windows never enter drag resize mode.

            return false;

        }