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

Merge "Revert "Do not set docked divider as IME target."" into nyc-dev

Browse Source
This commit is contained in:
Yohei Yukawa
2016-04-05 18:53:02 +00:00
committed by Android (Google) Code Review
parent cd6ea77d07 f98b1d4dba
commit 0c9d1b06c3
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/core/java/com/android/server/wm/WindowLayersController.java
View File

@@ -199,12 +199,6 @@ public class WindowLayersController {
}
layer = assignAndIncreaseLayerIfNeeded(mDockDivider, layer);
// If we have a dock divider ensure the Input Method is above it.
if (mDockDivider != null && 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.

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

@@ -1373,7 +1373,7 @@ public class WindowManagerService extends IWindowManager.Stub
// 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_APPLICATION_STARTING || type == TYPE_DOCK_DIVIDER) {
if (DEBUG_INPUT_METHOD) {
Slog.i(TAG_WM, "isVisibleOrAdding " + w + ": " + w.isVisibleOrAdding());
if (!w.isVisibleOrAdding()) {