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

Commit cea2ff78 authored May 10, 2016 by Android Build Merger (Role) Committed by Android (Google) Code Review May 10, 2016

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

Merge "Merge "Don\'t even try adjusting when dock is minimized" into nyc-dev am: 4b8ab89e" into nyc-mr1-dev

parents b8eb2c56 2b4ba62e

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -377,6 +377,10 @@ public class DockedStackDividerController implements DimLayerUser {
		checkMinimizeChanged(true /* animate */);
		}

		boolean isMinimizedDock() {
		return mMinimizedDock;
		}

		private void checkMinimizeChanged(boolean animate) {
		if (mDisplayContent.getDockedStackVisibleForUserLocked() == null) {
		return;

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

+2 −1

Original line number	Diff line number	Diff line
		@@ -7534,6 +7534,7 @@ public class WindowManagerService extends IWindowManager.Stub
		imeTargetStack.getDockSide() : DOCKED_INVALID;
		final boolean imeOnTop = (imeDockSide == DOCKED_TOP);
		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,
		// 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 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();
		for (int i = stacks.size() - 1; i >= 0; --i) {
		final TaskStack stack = stacks.get(i);