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

Commit 2af04b31 authored Jan 24, 2017 by Winson Chung

Fix issue with PiP hiding when dragging divider.

- Prevent the PiP windows from being set to drag resizing and getting
  clipped.

Test: Open PiP, dock a window, and start interacting with the divider.
Change-Id: I6a28a139261f1c3c09ec2b027e438df0411987c1

parent 6d2fe9e9

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
		@@ -3198,8 +3198,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;
		}