From feea9ca7d0300b487264fa637736d2a0c41e7678 Mon Sep 17 00:00:00 2001 From: Chong Zhang Date: Wed, 3 Feb 2016 14:07:08 -0800 Subject: [PATCH] Do not adjust for IME window if docked stack is not visible getDockSide() will tell us the stack is docked on bottom even when we're not in docked mode. So we have to check if docked stack is visible first. bug: 26940656 Change-Id: I8729b2502e2fa78ae51e97f5599c23f3d3ea62fc --- services/core/java/com/android/server/wm/WindowManagerService.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowManagerService.java b/services/core/java/com/android/server/wm/WindowManagerService.java index 9f833d12abe6..273d0209a5f4 100644 --- a/services/core/java/com/android/server/wm/WindowManagerService.java +++ b/services/core/java/com/android/server/wm/WindowManagerService.java @@ -8106,7 +8106,9 @@ public class WindowManagerService extends IWindowManager.Stub final WindowState imeWin = mInputMethodWindow; final TaskStack focusedStack = mCurrentFocus != null ? mCurrentFocus.getStack() : null; - if (imeWin != null && focusedStack != null && imeWin.isVisibleNow() + if (imeWin != null && imeWin.isVisibleNow() + && isStackVisibleLocked(DOCKED_STACK_ID) + && focusedStack != null && focusedStack.getDockSide() == DOCKED_BOTTOM){ final ArrayList stacks = displayContent.getStacks(); for (int i = stacks.size() - 1; i >= 0; --i) { -- 2.11.0