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

Commit f86f5cbf authored by Wei Sheng Shih's avatar Wei Sheng Shih Committed by Automerger Merge Worker
Browse files

Merge "Makes TYPE_NOTIFICATION_SHADE as trusted overlay" into rvc-dev am: 7fb7a6a1 

Change-Id: I2a786f427fddcffd9a9055cb1a9582c418005b02
parents 45502b80 7fb7a6a1

include/input/InputWindow.h

+39 −38
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_NOTIFICATION_SHADE = FIRST_SYSTEM_WINDOW + 40,

        LAST_SYSTEM_WINDOW = 2999,

        LAST_SYSTEM_WINDOW = 2999,

    };

    };

libs/input/InputWindow.cpp

+9 −10
Original line number Original line Diff line number Diff line
@@ -43,16 +43,15 @@ 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_INPUT_METHOD || layoutParamsType == TYPE_INPUT_METHOD_DIALOG ||

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG

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

            || layoutParamsType == TYPE_MAGNIFICATION_OVERLAY

            layoutParamsType == TYPE_NOTIFICATION_SHADE ||

            || layoutParamsType == TYPE_STATUS_BAR

            layoutParamsType == TYPE_NAVIGATION_BAR ||

            || layoutParamsType == TYPE_NAVIGATION_BAR

            layoutParamsType == TYPE_NAVIGATION_BAR_PANEL ||

            || layoutParamsType == TYPE_NAVIGATION_BAR_PANEL

            layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY ||

            || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY

            layoutParamsType == TYPE_DOCK_DIVIDER ||

            || layoutParamsType == TYPE_DOCK_DIVIDER

            layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY ||

            || layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY

            layoutParamsType == TYPE_INPUT_CONSUMER;

            || layoutParamsType == TYPE_INPUT_CONSUMER;

}

}





bool InputWindowInfo::supportsSplitTouch() const {

bool InputWindowInfo::supportsSplitTouch() const {