diff options
| author | Michael Wright <michaelwr@android.com> | 2014-04-30 01:19:52 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-04-30 01:19:52 +0000 |
| commit | 3e320a0cac461859582d6b0a57f1d87182b996b9 (patch) | |
| tree | e9439f77ad81841dcf778d1f5e8899442af51aec /libs | |
| parent | ad85d5422b46a44e9a2166436c34c11e59d30e0c (diff) | |
| parent | 9feab5f278d8c9e030e72989a7f6f3d2f376748d (diff) | |
| download | frameworks_base-3e320a0cac461859582d6b0a57f1d87182b996b9.zip frameworks_base-3e320a0cac461859582d6b0a57f1d87182b996b9.tar.gz frameworks_base-3e320a0cac461859582d6b0a57f1d87182b996b9.tar.bz2 | |
am 9feab5f2: am 8a02b20f: Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
* commit '9feab5f278d8c9e030e72989a7f6f3d2f376748d':
Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()
Diffstat (limited to 'libs')
| -rw-r--r-- | libs/input/InputWindow.cpp | 1 | ||||
| -rw-r--r-- | libs/input/InputWindow.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/libs/input/InputWindow.cpp b/libs/input/InputWindow.cpp index fe61918..18cd8eb 100644 --- a/libs/input/InputWindow.cpp +++ b/libs/input/InputWindow.cpp @@ -36,6 +36,7 @@ bool InputWindowInfo::frameContainsPoint(int32_t x, int32_t y) const { bool InputWindowInfo::isTrustedOverlay() const { return layoutParamsType == TYPE_INPUT_METHOD || layoutParamsType == TYPE_INPUT_METHOD_DIALOG + || layoutParamsType == TYPE_MAGNIFICATION_OVERLAY || layoutParamsType == TYPE_SECURE_SYSTEM_OVERLAY; } diff --git a/libs/input/InputWindow.h b/libs/input/InputWindow.h index 28fa7ab..bd325b5 100644 --- a/libs/input/InputWindow.h +++ b/libs/input/InputWindow.h @@ -105,6 +105,7 @@ struct InputWindowInfo { TYPE_NAVIGATION_BAR = FIRST_SYSTEM_WINDOW+19, TYPE_VOLUME_OVERLAY = FIRST_SYSTEM_WINDOW+20, TYPE_BOOT_PROGRESS = FIRST_SYSTEM_WINDOW+21, + TYPE_MAGNIFICATION_OVERLAY = FIRST_SYSTEM_WINDOW+27, LAST_SYSTEM_WINDOW = 2999, }; |