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

Commit e6ba89b3 authored by Jeff Brown's avatar Jeff Brown Committed by Android Git Automerger
Browse files

am c1a564b1: Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread 

Merge commit 'c1a564b108c511c0bdd699567c245b031930e718' into gingerbread-plus-aosp

* commit 'c1a564b108c511c0bdd699567c245b031930e718':
  Add support for secure system overlays.  (DO NOT MERGE)
parents f5bc4094 9b39c7a7

include/ui/InputDispatcher.h

+1 −0
Original line number Diff line number Diff line
@@ -183,6 +183,7 @@ struct InputWindow { 
        TYPE_INPUT_METHOD_DIALOG= FIRST_SYSTEM_WINDOW+12,

        TYPE_WALLPAPER          = FIRST_SYSTEM_WINDOW+13,

        TYPE_STATUS_BAR_PANEL   = FIRST_SYSTEM_WINDOW+14,

        TYPE_SECURE_SYSTEM_OVERLAY = FIRST_SYSTEM_WINDOW+15,

        LAST_SYSTEM_WINDOW      = 2999,

    };

libs/ui/InputDispatcher.cpp

+3 −2
Original line number Diff line number Diff line
@@ -149,7 +149,8 @@ bool InputWindow::frameContainsPoint(int32_t x, int32_t y) const { 


bool InputWindow::isTrustedOverlay() const {

    return layoutParamsType == TYPE_INPUT_METHOD

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG;

            || layoutParamsType == TYPE_INPUT_METHOD_DIALOG

            || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY;

}
@@ -1350,7 +1351,7 @@ void InputDispatcher::addMonitoringTargetsLocked() { 
        target.flags = 0;

        target.xOffset = 0;

        target.yOffset = 0;

        target.windowType = InputWindow::TYPE_SYSTEM_OVERLAY;

        target.windowType = -1;

    }

}