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

Merge "Don't even try adjusting when dock is minimized" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-05-10 19:47:40 +00:00
committed by Android (Google) Code Review
parent 6e2b3d158a 1ae68bfd59
commit 4b8ab89eca
2 changed files with 6 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
services/core/java/com/android/server/wm/DockedStackDividerController.java
View File

@@ -377,6 +377,10 @@ public class DockedStackDividerController implements DimLayerUser {
checkMinimizeChanged(true /* animate */); checkMinimizeChanged(true /* animate */);
} }
boolean isMinimizedDock() {
return mMinimizedDock;
}
private void checkMinimizeChanged(boolean animate) { private void checkMinimizeChanged(boolean animate) {
if (mDisplayContent.getDockedStackVisibleForUserLocked() == null) { if (mDisplayContent.getDockedStackVisibleForUserLocked() == null) {
return; return;

3
services/core/java/com/android/server/wm/WindowManagerService.java
View File

@@ -7534,6 +7534,7 @@ public class WindowManagerService extends IWindowManager.Stub
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 = displayContent.mDividerControllerLocked.isMinimizedDock();
// 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:
@@ -7541,7 +7542,7 @@ public class WindowManagerService extends IWindowManager.Stub
// - If IME is visible, and focus is on bottom, divider is moved for IME and thinner. // - If IME is visible, and focus is on bottom, divider is moved for IME and thinner.
// - If IME is not visible, divider is not moved and is normal width. // - If IME is not visible, divider is not moved and is normal width.
if (imeVisible && dockVisible && (imeOnTop || imeOnBottom)) { if (imeVisible && dockVisible && (imeOnTop || imeOnBottom) && !dockMinimized) {
final ArrayList<TaskStack> stacks = displayContent.getStacks(); final ArrayList<TaskStack> stacks = displayContent.getStacks();
for (int i = stacks.size() - 1; i >= 0; --i) { for (int i = stacks.size() - 1; i >= 0; --i) {
final TaskStack stack = stacks.get(i); final TaskStack stack = stacks.get(i);