commit fef058d7d04be1a14007e9d8568c093769c45a97
author Winson Chung <winsonc@google.com> Tue Apr 25 14:43:10 2017 -0700
committer Winson Chung <winsonc@google.com> Wed Apr 26 17:20:14 2017 -0700
tree 309f234cdac6a4eb81ae9ede49dd3b209cbd2fbf
parent 709904f8003a7122e185cfd32d1209e0e6975b77

Prevent IME adjustment for stacks not affected by docked stack resizing

Bug: 37358175
Test: Resize docked stack while PIP is up
Change-Id: I4f057f6671e8c164624359bf3532f9a22fdf768e

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

diff --git a/services/core/java/com/android/server/wm/DisplayContent.java b/services/core/java/com/android/server/wm/DisplayContent.java
index b7a268c..d85552a 100644
--- a/services/core/java/com/android/server/wm/DisplayContent.java
+++ b/services/core/java/com/android/server/wm/DisplayContent.java
@@ -1954,7 +1954,8 @@
             for (int i = mTaskStackContainers.size() - 1; i >= 0; --i) {
                 final TaskStack stack = mTaskStackContainers.get(i);
                 final boolean isDockedOnBottom = stack.getDockSide() == DOCKED_BOTTOM;
-                if (stack.isVisible() && (imeOnBottom || isDockedOnBottom)) {
+                if (stack.isVisible() && (imeOnBottom || isDockedOnBottom) &&
+                        StackId.isStackAffectedByDragResizing(stack.mStackId)) {
                     stack.setAdjustedForIme(imeWin, imeOnBottom && imeHeightChanged);
                 } else {
                     stack.resetAdjustedForIme(false);