summaryrefslogtreecommitdiff
path: root/libs/ui/InputDispatcher.cpp
diff options
context:
space:
mode:
author Jeff Brown <jeffbrown@google.com> 2010-10-15 16:52:02 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 2010-10-15 16:52:02 -0700
commitc1a564b108c511c0bdd699567c245b031930e718 (patch)
tree234baf2d627156a3c93eab172fb7038a7cea4988 /libs/ui/InputDispatcher.cpp
parentb3c2d4807f6bc631e2d1091ca4ebb8df39195bca (diff)
parent2d3f159aa9622e05a18e7f93cecd57ad673955ae (diff)
Merge "Add support for secure system overlays. (DO NOT MERGE)" into gingerbread
Diffstat (limited to 'libs/ui/InputDispatcher.cpp')
-rw-r--r--libs/ui/InputDispatcher.cpp5
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp
index 6ba19d79f929..41123284f977 100644
--- a/libs/ui/InputDispatcher.cpp
+++ b/libs/ui/InputDispatcher.cpp
@@ -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;
}
}