Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Don't adjust task bounds for IME during unminimizing docked stack" into qt-dev

Browse Source 
am: 93009b7743

Change-Id: I70811fe5d043e6011f87b2bfe99e8c33526c7060
This commit is contained in:
Riddle Hsu
2019-05-22 05:38:21 -07:00
committed by android-build-merger
parent fea3232c8e 93009b7743
commit 279f9865a8
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
services/core/java/com/android/server/wm/DisplayContent.java
View File

@@ -2637,17 +2637,25 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
final WindowState imeWin = mInputMethodWindow; final WindowState imeWin = mInputMethodWindow;
final boolean imeVisible = imeWin != null && imeWin.isVisibleLw() && imeWin.isDisplayedLw() final boolean imeVisible = imeWin != null && imeWin.isVisibleLw() && imeWin.isDisplayedLw()
&& !mDividerControllerLocked.isImeHideRequested(); && !mDividerControllerLocked.isImeHideRequested();
final boolean dockVisible = isStackVisible(WINDOWING_MODE_SPLIT_SCREEN_PRIMARY); final TaskStack dockedStack = getSplitScreenPrimaryStack();
final boolean dockVisible = dockedStack != null;
final Task topDockedTask = dockVisible ? dockedStack.getTopChild() : null;
final TaskStack imeTargetStack = mWmService.getImeFocusStackLocked(); final TaskStack imeTargetStack = mWmService.getImeFocusStackLocked();
final int imeDockSide = (dockVisible && imeTargetStack != null) ? final int imeDockSide = (dockVisible && imeTargetStack != null) ?
imeTargetStack.getDockSide() : DOCKED_INVALID; imeTargetStack.getDockSide() : DOCKED_INVALID;
final boolean imeOnTop = (imeDockSide == DOCKED_TOP); final boolean imeOnTop = (imeDockSide == DOCKED_TOP);
final boolean imeOnBottom = (imeDockSide == DOCKED_BOTTOM); final boolean imeOnBottom = (imeDockSide == DOCKED_BOTTOM);
final boolean dockMinimized = mDividerControllerLocked.isMinimizedDock();
final int imeHeight = mDisplayFrames.getInputMethodWindowVisibleHeight(); final int imeHeight = mDisplayFrames.getInputMethodWindowVisibleHeight();
final boolean imeHeightChanged = imeVisible && final boolean imeHeightChanged = imeVisible &&
imeHeight != mDividerControllerLocked.getImeHeightAdjustedFor(); imeHeight != mDividerControllerLocked.getImeHeightAdjustedFor();
// This includes a case where the docked stack is unminimizing and IME is visible for the
// bottom side stack. The condition prevents adjusting the override task bounds for IME to
// the minimized docked stack bounds.
final boolean dockMinimized = mDividerControllerLocked.isMinimizedDock()
|| (topDockedTask != null && imeOnBottom && !dockedStack.isAdjustedForIme()
&& dockedStack.getBounds().height() < topDockedTask.getBounds().height());
// The divider could be adjusted for IME position, or be thinner than usual, // The divider could be adjusted for IME position, or be thinner than usual,
// or both. There are three possible cases: // or both. There are three possible cases:
// - If IME is visible, and focus is on top, divider is not moved for IME but thinner. // - If IME is visible, and focus is on top, divider is not moved for IME but thinner.