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

Commit 2f533caa authored by Minche Li's avatar Minche Li Committed by Android (Google) Code Review
Browse files

Merge "Makes TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY as trusted overlay"

parents 5bb2287a 9be5b33a

include/input/InputWindow.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -107,6 +107,7 @@ struct InputWindowInfo { 
        TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+27,

        TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+27,

        TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW+32,

        TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW+32,

        TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW+34,

        TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW+34,

        TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+39,

        LAST_SYSTEM_WINDOW      = 2999,

        LAST_SYSTEM_WINDOW      = 2999,

    };

    };

libs/input/InputWindow.cpp

+2 −1
Original line number Original line Diff line number Diff line
@@ -43,7 +43,8 @@ bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const { 
}

}





bool InputWindowInfo::isTrustedOverlay() const {

bool InputWindowInfo::isTrustedOverlay() const {

    return layoutParamsType == TYPE_INPUT_METHOD

    return layoutParamsType == TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY

            || layoutParamsType == TYPE_INPUT_METHOD

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG

            || layoutParamsType == TYPE_MAGNIFICATION_OVERLAY

            || layoutParamsType == TYPE_MAGNIFICATION_OVERLAY

            || layoutParamsType == TYPE_STATUS_BAR

            || layoutParamsType == TYPE_STATUS_BAR