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

Commit 1a58903b authored by Wale Ogunwale's avatar Wale Ogunwale Committed by android-build-merger
Browse files

Merge "Exclude IME dialogs from tap outside task bounds funcationality" into... 

Merge "Exclude IME dialogs from tap outside task bounds funcationality" into nyc-dev am: 4d07c889 am: 10138a7c
am: 4b74e487

* commit '4b74e487':
  Exclude IME dialogs from tap outside task bounds funcationality

Change-Id: I534422658d14f79fae54376aec7749dbd3b3d470
parents 422697fb 4b74e487

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

+12 −2
Original line number Diff line number Diff line
@@ -1811,6 +1811,16 @@ public class WindowManagerService extends IWindowManager.Stub 
        return true;

    }



    private static boolean excludeWindowTypeFromTapOutTask(int windowType) {

        switch (windowType) {

            case TYPE_STATUS_BAR:

            case TYPE_NAVIGATION_BAR:

            case TYPE_INPUT_METHOD_DIALOG:

                return true;

        }

        return false;

    }



    public int addWindow(Session session, IWindow client, int seq,

            WindowManager.LayoutParams attrs, int viewVisibility, int displayId,

            Rect outContentInsets, Rect outStableInsets, Rect outOutsets,
@@ -2009,7 +2019,7 @@ public class WindowManagerService extends IWindowManager.Stub 


            res = WindowManagerGlobal.ADD_OKAY;



            if (type == TYPE_STATUS_BAR || type == TYPE_NAVIGATION_BAR) {

            if (excludeWindowTypeFromTapOutTask(type)) {

                displayContent.mTapExcludedWindows.add(win);

            }
@@ -2401,7 +2411,7 @@ public class WindowManagerService extends IWindowManager.Stub 
        }



        final int type = win.mAttrs.type;

        if (type == TYPE_STATUS_BAR || type == TYPE_NAVIGATION_BAR) {

        if (excludeWindowTypeFromTapOutTask(type)) {

            final DisplayContent displaycontent = win.getDisplayContent();

            displaycontent.mTapExcludedWindows.remove(win);

        }