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

Merge "No input for windows in minimized docked stack" into nyc-dev

Browse Source
This commit is contained in:
Jorim Jaggi
2016-04-13 02:31:47 +00:00
committed by Android (Google) Code Review
parent 3395ed1421 b72c9ad721
commit f0ad384e9e
3 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -290,7 +290,7 @@ class DisplayContent {
for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {
TaskStack stack = mStacks.get(stackNdx);
stack.getBounds(mTmpRect);
if (!mTmpRect.contains(x, y)) {
if (!mTmpRect.contains(x, y) || stack.isAdjustedForMinimizedDockedStack()) {
continue;
}
final ArrayList<Task> tasks = stack.getTasks();

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

@@ -294,7 +294,8 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks {
final WindowState child = windows.get(winNdx);
final InputChannel inputChannel = child.mInputChannel;
final InputWindowHandle inputWindowHandle = child.mInputWindowHandle;
if (inputChannel == null || inputWindowHandle == null || child.mRemoved) {
if (inputChannel == null || inputWindowHandle == null || child.mRemoved
|| child.isAdjustedForMinimizedDock()) {
// Skip this window because it cannot possibly receive input.
continue;
}

8
services/core/java/com/android/server/wm/WindowState.java
View File

@@ -1390,6 +1390,11 @@ final class WindowState implements WindowManagerPolicy.WindowState {
return configChanged;
}
boolean isAdjustedForMinimizedDock() {
return mAppToken != null && mAppToken.mTask != null
&& mAppToken.mTask.mStack.isAdjustedForMinimizedDock();
}
void removeLocked() {
disposeInputChannel();
@@ -1776,7 +1781,8 @@ final class WindowState implements WindowManagerPolicy.WindowState {
return isVisibleOrAdding()
&& (mViewVisibility == View.VISIBLE)
&& ((mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0)
&& (mAppToken == null || mAppToken.windowsAreFocusable());
&& (mAppToken == null || mAppToken.windowsAreFocusable())
&& !isAdjustedForMinimizedDock();
}
@Override