Merge "Do not set docked divider as IME target." into nyc-dev (5323c58f) · Commits · e / os / android_frameworks_base

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

+7 −1

Original line number	Diff line number	Diff line
		@@ -199,6 +199,12 @@ public class WindowLayersController {
		}

		layer = assignAndIncreaseLayerIfNeeded(mDockDivider, layer);

		if (mDockDivider != null && mDockDivider.isVisibleLw()
		&& mService.mInputMethodWindow != null) {
		layer = assignAndIncreaseLayerIfNeeded(mService.mInputMethodWindow, layer);
		}

		// We know that we will be animating a relaunching window in the near future, which will
		// receive a z-order increase. We want the replaced window to immediately receive the same
		// treatment, e.g. to be above the dock divider.
		@@ -212,7 +218,7 @@ public class WindowLayersController {
		}

		private int assignAndIncreaseLayerIfNeeded(WindowState win, int layer) {
		if (win != null) {
		if (win != null && layer > win.mLayer) {
		assignAnimLayer(win, layer);
		// Make sure we leave space inbetween normal windows for dims and such.
		layer += WINDOW_LAYER_MULTIPLIER;

+1 −4

Original line number	Diff line number	Diff line
		@@ -1369,11 +1369,8 @@ public class WindowManagerService extends IWindowManager.Stub
		final int fl = w.mAttrs.flags
		& (FLAG_NOT_FOCUSABLE\|FLAG_ALT_FOCUSABLE_IM);
		final int type = w.mAttrs.type;
		// The dock divider has to sit above the application windows and so does the IME. IME also
		// needs to sit above the dock divider, so it doesn't get cut in half. We make the dock
		// divider be a target for IME, so this relationship can occur naturally.
		if (fl == 0 \|\| fl == (FLAG_NOT_FOCUSABLE\|FLAG_ALT_FOCUSABLE_IM)
		\|\| type == TYPE_APPLICATION_STARTING \|\| type == TYPE_DOCK_DIVIDER) {
		\|\| type == TYPE_APPLICATION_STARTING) {
		if (DEBUG_INPUT_METHOD) {
		Slog.i(TAG_WM, "isVisibleOrAdding " + w + ": " + w.isVisibleOrAdding());
		if (!w.isVisibleOrAdding()) {