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

Commit 17a930c8 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... 

Merge "Make TYPE_TRUSTED_APPLICATION_OVERLAY a trusted overlay." into rvc-dev am: 7db72bbb am: 6ed3cc98 am: 62c8fd39 am: 46fa2777

Change-Id: I60e703640758ef1f1925776251e7c868ded6185c
parents 0f67276d 46fa2777

include/input/InputWindow.h

+1 −0
Original line number Diff line number Diff line
@@ -116,6 +116,7 @@ struct InputWindowInfo { 
        TYPE_DOCK_DIVIDER = FIRST_SYSTEM_WINDOW + 34,

        TYPE_ACCESSIBILITY_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW + 39,

        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
@@ -155,6 +155,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_ACCESSIBILITY_MAGNIFICATION_OVERLAY ||

            layoutParamsType == TYPE_INPUT_METHOD || layoutParamsType == TYPE_INPUT_METHOD_DIALOG ||
@@ -165,7 +166,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 {