diff options
| author | Michael Wright <michaelwr@android.com> | 2014-04-29 23:58:16 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2014-04-29 23:58:17 +0000 |
| commit | 8a02b20f6f3fdd5baa5d22321769303ce76ba80a (patch) | |
| tree | 638d6a1eba79b82ad1b18bf07f24ce58a12d58d2 | |
| parent | af40649e4ad506e312b53518cd2b9f2b58dee3ba (diff) | |
| parent | a33666a7cacc72ad1ebcd1652a241b2bb7149914 (diff) | |
| download | base-8a02b20f6f3fdd5baa5d22321769303ce76ba80a.tar.gz | |
Merge "Add TYPE_MAGNIFICATION_OVERLAY to InputWindowInfo::isTrustedOverlay()"
| -rw-r--r-- | services/input/InputWindow.cpp | 1 | ||||
| -rw-r--r-- | services/input/InputWindow.h | 1 |
2 files changed, 2 insertions, 0 deletions
diff --git a/services/input/InputWindow.cpp b/services/input/InputWindow.cpp index fe61918e1d86..18cd8eb7490d 100644 --- a/services/input/InputWindow.cpp +++ b/services/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/services/input/InputWindow.h b/services/input/InputWindow.h index 28fa7ab42d44..bd325b5be27d 100644 --- a/services/input/InputWindow.h +++ b/services/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, }; |