From d450aa9ac5b30897abf14f76a9ae2a5d76bc5331 Mon Sep 17 00:00:00 2001 From: Jorim Jaggi Date: Fri, 15 Apr 2016 22:52:00 -0700 Subject: [PATCH] Fix IME layout When introducing the fitToDisplay variable, it should have been fitToDisplay = task != null -> (implies) !task.isFloating(); but was written as task != null && !task.isFloating. Bug: 28182018 Change-Id: If0be86f1ed8bb88914ce167e9f5273b6b3dc2571 --- services/core/java/com/android/server/wm/WindowState.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java index bf697172f609..5077f3293808 100644 --- a/services/core/java/com/android/server/wm/WindowState.java +++ b/services/core/java/com/android/server/wm/WindowState.java @@ -2608,7 +2608,7 @@ final class WindowState implements WindowManagerPolicy.WindowState { final int ph = containingFrame.height(); final Task task = getTask(); final boolean nonFullscreenTask = isInMultiWindowMode(); - final boolean fitToDisplay = task != null && !nonFullscreenTask && !layoutInParentFrame(); + final boolean fitToDisplay = (task == null || !nonFullscreenTask) && !layoutInParentFrame(); float x, y; int w,h; -- 2.11.0