diff options
author | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 10:10:09 -0700 |
---|---|---|
committer | Jessica Wagantall <jwagantall@cyngn.com> | 2016-06-07 10:10:09 -0700 |
commit | 508eb7749a4ce988d4d1a97377254add24b9bc40 (patch) | |
tree | 9f14950e50cde8816d07350fb645011d5da57377 /services/inputflinger/InputDispatcher.h | |
parent | 6500d428ce816ffa0ba099221a4987ad7bfcb4ab (diff) | |
parent | 03a53d1c7765eeb3af0bc34c3dff02ada1953fbf (diff) | |
download | frameworks_native-508eb7749a4ce988d4d1a97377254add24b9bc40.zip frameworks_native-508eb7749a4ce988d4d1a97377254add24b9bc40.tar.gz frameworks_native-508eb7749a4ce988d4d1a97377254add24b9bc40.tar.bz2 |
Merge tag 'android-6.0.1_r46' into HEAD
Android 6.0.1 release 46
# gpg: Signature made Mon 06 Jun 2016 10:38:23 AM PDT using DSA key ID 9AB10E78
# gpg: Can't check signature: public key not found
Diffstat (limited to 'services/inputflinger/InputDispatcher.h')
-rw-r--r-- | services/inputflinger/InputDispatcher.h | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/services/inputflinger/InputDispatcher.h b/services/inputflinger/InputDispatcher.h index 98355c6..1c054f5 100644 --- a/services/inputflinger/InputDispatcher.h +++ b/services/inputflinger/InputDispatcher.h @@ -89,7 +89,7 @@ struct InputTarget { /* This flag indicates that the event is being delivered to a foreground application. */ FLAG_FOREGROUND = 1 << 0, - /* This flag indicates that the target of a MotionEvent is partly or wholly + /* This flag indicates that the MotionEvent falls within the area of the target * obscured by another visible window above it. The motion event should be * delivered with flag AMOTION_EVENT_FLAG_WINDOW_IS_OBSCURED. */ FLAG_WINDOW_IS_OBSCURED = 1 << 1, @@ -139,6 +139,12 @@ struct InputTarget { | FLAG_DISPATCH_AS_HOVER_EXIT | FLAG_DISPATCH_AS_SLIPPERY_EXIT | FLAG_DISPATCH_AS_SLIPPERY_ENTER, + + /* This flag indicates that the target of a MotionEvent is partly or wholly + * obscured by another visible window above it. The motion event should be + * delivered with flag AMOTION_EVENT_FLAG_WINDOW_IS_PARTIALLY_OBSCURED. */ + FLAG_WINDOW_IS_PARTIALLY_OBSCURED = 1 << 14, + }; // The input channel to be targeted. @@ -1048,6 +1054,7 @@ private: const InjectionState* injectionState); bool isWindowObscuredAtPointLocked(const sp<InputWindowHandle>& windowHandle, int32_t x, int32_t y) const; + bool isWindowObscuredLocked(const sp<InputWindowHandle>& windowHandle) const; String8 getApplicationWindowLabelLocked(const sp<InputApplicationHandle>& applicationHandle, const sp<InputWindowHandle>& windowHandle); |