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

Commit 6ed3cc98 authored by Josh Tsuji's avatar Josh Tsuji Committed by Automerger Merge Worker
Browse files

Merge "Make TYPE_TRUSTED_APPLICATION_OVERLAY a trusted overlay." into rvc-dev am: 7db72bbb 

Change-Id: I8915feda1bbd27603e9ae90a5e8f9683f36c3899
parents b8df24ac 7db72bbb

include/input/InputWindow.h

+1 −0
Original line number Diff line number Diff line
@@ -108,6 +108,7 @@ struct InputWindowInfo { 
        TYPE_ACCESSIBILITY_OVERLAY = FIRST_SYSTEM_WINDOW + 32,

        TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW + 34,

        TYPE_NOTIFICATION_SHADE = FIRST_SYSTEM_WINDOW + 40,

        TYPE_TRUSTED_APPLICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 42,

        LAST_SYSTEM_WINDOW = 2999,

    };

libs/input/InputWindow.cpp

+3 −1
Original line number Diff line number Diff line
@@ -42,6 +42,7 @@ bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const { 
            && y >= frameTop && y < frameBottom;

}



// TODO(b/155781676): Remove and replace call points with trustedOverlay when that is ready.

bool InputWindowInfo::isTrustedOverlay() const {

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

            layoutParamsType == TYPE_MAGNIFICATION_OVERLAY || layoutParamsType == TYPE_STATUS_BAR ||
@@ -51,7 +52,8 @@ bool InputWindowInfo::isTrustedOverlay() const { 
            layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY ||

            layoutParamsType == TYPE_DOCK_DIVIDER ||

            layoutParamsType == TYPE_ACCESSIBILITY_OVERLAY ||

            layoutParamsType == TYPE_INPUT_CONSUMER;

            layoutParamsType == TYPE_INPUT_CONSUMER ||

            layoutParamsType == TYPE_TRUSTED_APPLICATION_OVERLAY;

}



bool InputWindowInfo::supportsSplitTouch() const {