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

Merge "Use focused app\'s stack for IME adjustment" into nyc-dev

Browse Source 
am: 65ee55457d

* commit '65ee55457dc39c3e30c677d9126565799b50a8dc':
  Use focused app's stack for IME adjustment

Change-Id: Idd34a63f377f43cb79c397eac8adccef3f791429
This commit is contained in:
Chong Zhang
2016-05-17 23:34:18 +00:00
committed by android-build-merger
parent b1e5b7419b 65ee55457d
commit da107902d9
2 changed files with 9 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1089,7 +1089,7 @@ public class TaskStack implements DimLayer.DimLayerUser,
}
setAdjustedBounds(mTmpAdjustedBounds);
final boolean isImeTarget = (mService.getImeTargetStackLocked() == this);
final boolean isImeTarget = (mService.getImeFocusStackLocked() == this);
if (mAdjustedForIme && adjust && !isImeTarget) {
final float alpha = Math.max(mAdjustImeAmount, mAdjustDividerAmount)
* IME_ADJUST_DIM_AMOUNT;

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

@@ -7581,7 +7581,7 @@ public class WindowManagerService extends IWindowManager.Stub
final WindowState imeWin = mInputMethodWindow;
final boolean imeVisible = imeWin != null && imeWin.isVisibleLw() && imeWin.isDisplayedLw();
final boolean dockVisible = isStackVisibleLocked(DOCKED_STACK_ID);
final TaskStack imeTargetStack = getImeTargetStackLocked();
final TaskStack imeTargetStack = getImeFocusStackLocked();
final int imeDockSide = (dockVisible && imeTargetStack != null) ?
imeTargetStack.getDockSide() : DOCKED_INVALID;
final boolean imeOnTop = (imeDockSide == DOCKED_TOP);
@@ -7750,10 +7750,13 @@ public class WindowManagerService extends IWindowManager.Stub
return mCurrentFocus;
}
TaskStack getImeTargetStackLocked() {
// Don't use WindowState.getStack() because it returns home stack for system windows.
Task imeTask = mInputMethodTarget != null ? mInputMethodTarget.getTask() : null;
return imeTask != null ? imeTask.mStack : null;
TaskStack getImeFocusStackLocked() {
// Don't use mCurrentFocus.getStack() because it returns home stack for system windows.
// Also don't use mInputMethodTarget's stack, because some window with FLAG_NOT_FOCUSABLE
// and FLAG_ALT_FOCUSABLE_IM flags both set might be set to IME target so they're moved
// to make room for IME, but the window is not the focused window that's taking input.
return (mFocusedApp != null && mFocusedApp.mTask != null) ?
mFocusedApp.mTask.mStack : null;
}
private void showAuditSafeModeNotification() {