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

Commit 515df8f1 authored by Jorim Jaggi's avatar Jorim Jaggi Committed by android-build-merger
Browse files

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

am: aef17660

* commit 'aef17660':
  No input for windows in minimized docked stack

Change-Id: I3616fdfe101572e83fa1fc32fbbcc88d41e3be17
parents 84c3b96d aef17660

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -290,7 +290,7 @@ class DisplayContent { 
        for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {

        for (int stackNdx = mStacks.size() - 1; stackNdx >= 0; --stackNdx) {

            TaskStack stack = mStacks.get(stackNdx);

            TaskStack stack = mStacks.get(stackNdx);

            stack.getBounds(mTmpRect);

            stack.getBounds(mTmpRect);

            if (!mTmpRect.contains(x, y)) {

            if (!mTmpRect.contains(x, y) || stack.isAdjustedForMinimizedDockedStack()) {

                continue;

                continue;

            }

            }

            final ArrayList<Task> tasks = stack.getTasks();

            final ArrayList<Task> tasks = stack.getTasks();

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

+2 −1
Original line number Original line Diff line number Diff line
@@ -294,7 +294,8 @@ final class InputMonitor implements InputManagerService.WindowManagerCallbacks { 
                final WindowState child = windows.get(winNdx);

                final WindowState child = windows.get(winNdx);

                final InputChannel inputChannel = child.mInputChannel;

                final InputChannel inputChannel = child.mInputChannel;

                final InputWindowHandle inputWindowHandle = child.mInputWindowHandle;

                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.

                    // Skip this window because it cannot possibly receive input.

                    continue;

                    continue;

                }

                }

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

+7 −1
Original line number Original line Diff line number Diff line
@@ -1390,6 +1390,11 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        return configChanged;

        return configChanged;

    }

    }





    boolean isAdjustedForMinimizedDock() {

        return mAppToken != null && mAppToken.mTask != null

                && mAppToken.mTask.mStack.isAdjustedForMinimizedDock();

    }



    void removeLocked() {

    void removeLocked() {

        disposeInputChannel();

        disposeInputChannel();
@@ -1776,7 +1781,8 @@ final class WindowState implements WindowManagerPolicy.WindowState { 
        return isVisibleOrAdding()

        return isVisibleOrAdding()

                && (mViewVisibility == View.VISIBLE)

                && (mViewVisibility == View.VISIBLE)

                && ((mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0)

                && ((mAttrs.flags & WindowManager.LayoutParams.FLAG_NOT_FOCUSABLE) == 0)

                && (mAppToken == null || mAppToken.windowsAreFocusable());

                && (mAppToken == null || mAppToken.windowsAreFocusable())

                && !isAdjustedForMinimizedDock();

    }

    }





    @Override

    @Override