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

Commit 9f2ab1c0 authored by Andrii Kulian's avatar Andrii Kulian Committed by android-build-merger
Browse files

Merge "Update ime touch exclude region for hosting display" into oc-dev

am: 40d0f867

Change-Id: I20f2cbc97202417d57cd36aa37ebd85e4ec27bd6
parents 8efaefb5 40d0f867
Loading
Loading
Loading
Loading
+7 −1
Original line number Diff line number Diff line
@@ -1793,7 +1793,13 @@ class DisplayContent extends WindowContainer<DisplayContent.DisplayChildWindowCo
            // events to be intercepted and used to change focus. This would likely cause a
            // disappearance of the input method.
            inputMethod.getTouchableRegion(mTmpRegion);
            mTouchExcludeRegion.op(mTmpRegion, Region.Op.UNION);
            if (inputMethod.getDisplayId() == mDisplayId) {
                mTouchExcludeRegion.op(mTmpRegion, Op.UNION);
            } else {
                // IME is on a different display, so we need to update its tap detector.
                // TODO(multidisplay): Remove when IME will always appear on same display.
                inputMethod.getDisplayContent().setTouchExcludeRegion(null /* focusedTask */);
            }
        }
        for (int i = mTapExcludedWindows.size() - 1; i >= 0; i--) {
            WindowState win = mTapExcludedWindows.get(i);