diff options
| author | Jeff Brown <jeffbrown@google.com> | 2010-10-15 18:40:39 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-10-15 18:40:39 -0700 |
| commit | 6ba052b4847d85831c38c9b8e2942cef4987e55b (patch) | |
| tree | aa693582c047451f74ad1e45943684cde1f314ed /libs | |
| parent | bce520e6460e712c0985f12cf212e2d72fd1b9e4 (diff) | |
| parent | c1a564b108c511c0bdd699567c245b031930e718 (diff) | |
| download | frameworks_base-6ba052b4847d85831c38c9b8e2942cef4987e55b.zip frameworks_base-6ba052b4847d85831c38c9b8e2942cef4987e55b.tar.gz frameworks_base-6ba052b4847d85831c38c9b8e2942cef4987e55b.tar.bz2 | |
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)
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/ui/InputDispatcher.cpp | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/libs/ui/InputDispatcher.cpp b/libs/ui/InputDispatcher.cpp index 6ba19d7..41123284 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; } } |