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

Commit feea9ca7 authored by Chong Zhang's avatar Chong Zhang
Browse files

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
parent e056b887

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

+3 −1
Original line number Diff line number Diff line
@@ -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<TaskStack> stacks = displayContent.getStacks();

                            for (int i = stacks.size() - 1; i >= 0; --i) {