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

Commit d29f327a authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Android (Google) Code Review
Browse files

Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay"

parents 1920c1b1 599042ff

include/input/InputWindow.h

+40 −39
Original line number Diff line number Diff line
@@ -115,6 +115,7 @@ struct InputWindowInfo { 
        TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW + 32,

        TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW + 34,

        TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 39,

        TYPE_NOTIFICATION_SHADE = FIRST_SYSTEM_WINDOW + 40,

        LAST_SYSTEM_WINDOW = 2999,

    };

libs/input/InputWindow.cpp

+10 −11
Original line number Diff line number Diff line
@@ -156,17 +156,16 @@ bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const { 
}



bool InputWindowInfo::isTrustedOverlay() const {

    return layoutParamsType == TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY

            || layoutParamsType == TYPE_INPUT_METHOD

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG

            || layoutParamsType == TYPE_MAGNIFICATION_OVERLAY

            || layoutParamsType == TYPE_STATUS_BAR

            || layoutParamsType == TYPE_NAVIGATION_BAR

            || layoutParamsType == TYPE_NAVIGATION_BAR_PANEL

            || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY

            || layoutParamsType == TYPE_DOCK_DIVIDER

            || layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY

            || layoutParamsType == TYPE_INPUT_CONSUMER;

    return layoutParamsType == TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY ||

            layoutParamsType == TYPE_INPUT_METHOD || layoutParamsType == TYPE_INPUT_METHOD_DIALOG ||

            layoutParamsType == TYPE_MAGNIFICATION_OVERLAY || layoutParamsType == TYPE_STATUS_BAR ||

            layoutParamsType == TYPE_NOTIFICATION_SHADE ||

            layoutParamsType == TYPE_NAVIGATION_BAR ||

            layoutParamsType == TYPE_NAVIGATION_BAR_PANEL ||

            layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY ||

            layoutParamsType == TYPE_DOCK_DIVIDER ||

            layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY ||

            layoutParamsType == TYPE_INPUT_CONSUMER;

}



bool InputWindowInfo::supportsSplitTouch() const {