summaryrefslogtreecommitdiffstats
path: root/services/inputflinger
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-074-3/+48
|\ | | | | | | | | | | | | 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
| * Add new MotionEvent flag for partially obscured windows.Michael Wright2016-04-214-3/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Due to more complex window layouts resulting in lots of overlapping windows, the policy around FLAG_WINDOW_IS_OBSCURED has changed to only be set when the point at which the window was touched is obscured. Unfortunately, this doesn't prevent tapjacking attacks that overlay the dialog's text, making a potentially dangerous operation seem innocuous. To avoid this on particularly sensitive dialogs, introduce a new flag that really does tell you when your window is being even partially overlapped. We aren't exposing this as API since we plan on making the original flag more robust. This is really a workaround for system dialogs since we generally know their layout and screen position, and that they're unlikely to be overlapped by other applications. Bug: 26677796 Change-Id: I9e336afe90f262ba22015876769a9c510048fd47
* | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-075-27/+58
|\ \ | |/ | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/native into cm-13.0 Android 6.0.1 release 3 Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
| * Inputflinger: hook up key event replacement processingDmitry Torokhov2015-09-295-27/+58
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add handling of "replacement" key events in InputReader and EventHub by consulting device's character key map (if exists) for presence of replacement key code for given get code and meta state combination, before passing it to InputDispatcher. This enables defining special keys, such as ESC, on keyboards lacking enough physical keys, via combination of normal keys and modifiers, for example AltR + 1 => ESC. Bug: 24504154 Change-Id: I7e36104808bedcf724436c1fbb63d37c35cca8af
* | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-3/+3
|\ \ | |/ | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: include/android/input.h Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
| * DO NOT MERGE Cancel touches as well as pointer gestures.Michael Wright2015-09-222-5/+33
| | | | | | | | | | Bug: 24302031 Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
| * DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer ↵Michael Wright2015-09-224-191/+19
| | | | | | | | | | | | | | | | | | | | | | gestures." into mnc-dev" This reverts commit 9b70ab7a3cb260205e81e40ba181a86710d2eb95, reversing changes made to 153008efb5a00ed3c18d588ce15f90d2442a9786. Bug: 24302031 Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a
| * Cancel touches as well as pointer gestures.Michael Wright2015-07-092-5/+33
| | | | | | | | | | Bug: 19264992 Change-Id: Idbe964a1a35c190a32f845e2a19542d54652d011
| * am fd0fdaf7: am 3643c88f: Merge "Send cancelation events to monitors when ↵Michael Wright2015-06-292-1/+16
| |\ | | | | | | | | | | | | | | | | | | injection fails." into mnc-dev * commit 'fd0fdaf73b1e8fbf643152f532f500be70f11a26': Send cancelation events to monitors when injection fails.
| | * am 3643c88f: Merge "Send cancelation events to monitors when injection ↵Michael Wright2015-06-292-1/+16
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | fails." into mnc-dev * commit '3643c88f7b557e241d65c4857eaf49e28e7c03a2': Send cancelation events to monitors when injection fails.
| * | \ am 7d3ad695: Merge commit \'71997c1a\' into manualmergeMichael Wright2015-06-231-1/+4
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '7d3ad695304a1f24026227e630add6edd76fd0d6': Add new AINPUT_SOURCE_BLUETOOTH_STYLUS
| | * | Merge commit '71997c1a' into manualmergeMichael Wright2015-06-231-1/+4
| | |\ \ | | | | | | | | | | | | | | | Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
| * | \ \ am f8b34319: am 043bd36b: Merge "Only log dropped input when disabled for ↵Michael Wright2015-06-102-2/+8
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | the first event." into mnc-dev * commit 'f8b34319a4c1ccce63b5a8e4732f162d228085cb': Only log dropped input when disabled for the first event.
| | * | | am 043bd36b: Merge "Only log dropped input when disabled for the first ↵Michael Wright2015-06-102-2/+8
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | event." into mnc-dev * commit '043bd36b0d50efa81d010c64009317af160d5fec': Only log dropped input when disabled for the first event.
| * | | | | Mock out more inputflinger host functionsTim Kilbourn2015-06-082-10/+71
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3de1e95930578410d8f7c1e77329c00f05b72325
| * | | | | Basic implementation of input device properties.Tim Kilbourn2015-06-011-4/+87
| |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The input host can load an idc file and pass the resulting property map to a HAL module. Change-Id: Ic8188c9eca193c78686ff67680cf37be91c47526
| * | | | am 7c000280: Merge changes from topic \'button_actions\' into mnc-devMichael Wright2015-05-147-105/+204
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '7c000280a57f352c2485dcaea1d5bfe20f7bfe63': Fix input tests to work with new MotionEvent member Revert "Revert "Add new MotionEvent actions for button press and release.""
| * \ \ \ \ am c921ce26: Merge "Revert "Add new MotionEvent actions for button press and ↵Michael Wright2015-05-147-204/+105
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release."" into mnc-dev * commit 'c921ce268155e8e1d75bd423514bb5a3ee363440': Revert "Add new MotionEvent actions for button press and release."
| * \ \ \ \ \ am f27e6681: Merge "Add new MotionEvent actions for button press and ↵Michael Wright2015-05-147-105/+204
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release." into mnc-dev * commit 'f27e6681048f3ee7a589ab824a1041667ff838e0': Add new MotionEvent actions for button press and release.
| * \ \ \ \ \ \ am 4866f087: Merge "Use previous pressure value if the current fusion data ↵Michael Wright2015-05-132-8/+14
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | is zero." into mnc-dev * commit '4866f087181af02e870b2d2fc1d4be8d38c2f36e': Use previous pressure value if the current fusion data is zero.
| * \ \ \ \ \ \ \ am 4eed0f8f: Merge "Synthesize events for pressure and button changes." into ↵Michael Wright2015-05-132-20/+41
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dev * commit '4eed0f8f8dd3673e55a93c0b62b8b9ebefa135cf': Synthesize events for pressure and button changes.
| * \ \ \ \ \ \ \ \ am 5da11106: am 7ecc8952: Merge "Check orientation range has been ↵Michael Wright2015-04-271-3/+3
| |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | initialized first" * commit '5da11106b3aa10d515d0f080c27f315d5830dc85': Check orientation range has been initialized first
| | * | | | | | | | | Check orientation range has been initialized firstbaik.han2015-04-141-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To avoid nan or infinity when orientation value is used for calculation without being initialized, check mOrientedRanges.haveOrientation value before using mOrientedRanges.orientation.min or .max value. Change-Id: I68ed9ab36819c5faa6422e9f061e1275aeed11e3 Signed-off-by: Baik Han <baik.han@lge.com>
* | | | | | | | | | | input: Disable debug againEthan Chen2015-10-261-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I3adadd69b8b3a42bcb384cac7ccff98ef0ca9c65
* | | | | | | | | | | input: Add option to toggle pointer icon when using stylus(3/3)Steve Kondik2015-10-172-10/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * The visible pointer icon when hovering or drawing with the stylus is quite annoying when trying to actually draw with it. Turn it off by default and add an option to turn it on. Forward Port from CM-11.0 Change-Id: Ie4e9e6bcc48803b195d1615d83d6e36d663cc33a
* | | | | | | | | | | Forward port 'Swap volume buttons' (2/3)nadlabak2015-10-172-9/+34
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | [mikeioannina]: Adjust for 5.0 changes Change-Id: I5ed4ae2b7e69e2ada067ed1d3524b3d3fad30e2e
* | | | | | | | | | | inputflinger: disable touch input while using a stylusChristopher N. Hesse2015-10-172-0/+25
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 5.0 cannot form multitouch events from multiple input devices. So it is not possible to report one touchpoint from the stylus position and, at the same time, another touchpoint from a finger touch. Instead, when a new input device starts up the currently active input is cancelled. This is highly undesirable while writing with the pen. The easiest solution is to ignore non-stylus touch events while the stylus is within range (hovering) of the touchscreen. For example, N-trig digitizers implement this in hardware. But wacom digitizers do report pen data simultaneously with touch data. This patch disables (non-stylus) touch input within 50ms of stylus data. On my Galaxy Note this is necessary to make stylus input usable. Original commit by vbraun: https://github.com/CyanogenMod/android_frameworks_base/commit/b9cb2961309c829586ae24ce432bb1fdb5610ba6 Change-Id: I97f26369826e96c97461c8ae188f1c64dec1b4d3
* | | | | | | | | | | inputflinger: Add gesture sensor supportSteve Kondik2015-10-172-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ieca4e54439c47a817aaa6a9b6fabcee750ffc0c2
* | | | | | | | | | | input: Adjust prioritySteve Kondik2015-10-171-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bring into the desired group to get the best result. Change-Id: I3bd031074cd7006994736b4c22d0294b6012f662
* | | | | | | | | | | Cancel touches as well as pointer gestures.Michael Wright2015-07-132-5/+33
| |_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19264992 Change-Id: If48e0953b972c9d69f516906adf7c6faf67e3eb8
* | | | | | | | | | Merge "Send cancelation events to monitors when injection fails." into mnc-devMichael Wright2015-06-292-1/+16
|\ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ |/| | | | | | | | |
| * | | | | | | | | Send cancelation events to monitors when injection fails.Michael Wright2015-06-122-1/+16
| | |_|_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 20649729 Change-Id: I46cd14ac1f040d404c0b1581b38fa07a944e5fb9
* | | | | | | | | Add new AINPUT_SOURCE_BLUETOOTH_STYLUSMichael Wright2015-06-121-1/+4
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21531826 Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
* | | | | | | | Only log dropped input when disabled for the first event.Michael Wright2015-06-102-2/+8
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 19851495 Change-Id: I8cb8076723c1ca1732c3bc37f283d8eb48b7bee0
* | | | | | | Revert "Revert "Add new MotionEvent actions for button press and release.""Michael Wright2015-05-147-105/+204
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | This reverts commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.
* | | | | | Revert "Add new MotionEvent actions for button press and release."Michael Wright2015-05-147-204/+105
| |_|_|_|/ |/| | | | | | | | | | | | | | This reverts commit 48a8a0e4322969e1551536d6183af3a1faa2240b.
* | | | | Add new MotionEvent actions for button press and release.Michael Wright2015-05-147-105/+204
| |_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Introduce ACTION_BUTTON_PRESS and ACTION_BUTTON_RELEASE as actions to signal a button press or release. If these actions happen simulanteously with a DOWN or UP event then they're explicitly ordered to happen after the DOWN or preceding the UP in order to send them to the most recently targeted view. Also, introduce new stylus button constants that differ from the constants we use for mouse buttons. Bug: 20704355 Change-Id: Ib960a5004db5429ad2fc8db020704773e2978327
* | | | Use previous pressure value if the current fusion data is zero.Michael Wright2015-05-122-8/+14
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Occasionally we'll receive the stylus up signal (pressure = 0) before we receive the touch screen up signal. Rather than giving pointer a pressure value of 0 (which is one of the signals of hovering) or falling back to the touchscreen pressure values (which would make for an inconsistent stream), use the previous pressure value which should always be non-zero for a stream of fused data. Bug: 20449776 Change-Id: I71eb97e7c4ea53e42b0eb54fc1f8ae7f89aad9d1
* | | Synthesize events for pressure and button changes.Michael Wright2015-05-122-20/+41
|/ / | | | | | | | | | | | | | | Even when there isn't movement on the touchscreen we should produce events for pressure and button state changes generated by external stylii. Change-Id: I9fd7ba85902d5d6bfb28d5e5ff5d8f340a94c2bf
* | Merge "Default to TOOL_TYPE_STYLUS for external stylus events."Michael Wright2015-04-211-1/+5
|\ \
| * | Default to TOOL_TYPE_STYLUS for external stylus events.Michael Wright2015-04-211-1/+5
| | | | | | | | | | | | Change-Id: Ife6a7c4802e8b1ec1ff8445e639f8a6d90a00592
* | | Increase stylus data timeout.Michael Wright2015-04-211-1/+1
| | | | | | | | | | | | | | | | | | | | | Temporarily increase the stylus timeout while we figure out where the delay in BT information is coming from. Change-Id: I27ab5a4db4ad14358c6e6803961612420371fce9
* | | Revert "Increase stylus data timeout."Michael Wright2015-04-211-1/+1
|/ / | | | | | | This reverts commit 8b0673ce0ca97952d3ed9cb8912b31f367e41c0c.
* | Increase stylus data timeout.Michael Wright2015-04-211-1/+1
| | | | | | | | | | | | | | | | Sometimes stylus data will be delayed by 30 - 40ms. By increasing the timeout we pretty much always pick up stylus data and the touch latency feels surprisingly small. Change-Id: I39f5b9037ce0444b1e957149d3f1c3a3137804cb
* | Always update external stylus state.Michael Wright2015-04-201-1/+1
| | | | | | | | | | | | | | | | This prevents us from dropping any states (namely the pressure transition from non-zero to zero) if we get the touch up before we get the stylus data. Change-Id: Ifc198628d35b7079dc5ec23d81f9681d122757a0
* | Mark all InputReaderContext methods as pure virtualMichael Wright2015-04-171-2/+2
| | | | | | | | | | | | Also, fix the build. Change-Id: I45d3daa8c0710b2f9421e8ffd011d2d39c05e030
* | Fuse stylus and touch screen data.Michael Wright2015-04-175-359/+823
| | | | | | | | | | | | | | TODO: Ensure we dispatch new pressure and button data when stylus is stationary. Change-Id: I10a665a9b81ff4b9acd01bf72f0fc2e0c2abc203
* | Add method stubs for input device properties.Tim Kilbourn2015-04-162-0/+40
| | | | | | | | Change-Id: Icd785cb55ae2b225102fa249240837a91a41aae3
* | Pass through availability of audio mic for input devices.Tim Kilbourn2015-04-094-3/+31
| | | | | | | | | | Bug: 15374820 Change-Id: Id2ca6da10165e3a887ebfbb18f663a3bf316ac79
* | Merge "Stub implementations of HAL usage callbacks."Tim Kilbourn2015-03-312-0/+13
|\ \
generated by cgit v1.1 at 2025-01-07 19:59:03 +0000