summaryrefslogtreecommitdiffstats
path: root/include/input
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r46' into HEADJessica Wagantall2016-06-071-0/+13
|\ | | | | | | | | | | | | 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-211-0/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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_r22' of ↵Steve Kondik2016-03-101-0/+9
|\ \ | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/native into cm-13.0 Android 6.0.1 release 22
| * \ resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ↵Nick Kralevich2015-10-231-0/+1
| |\ \ | | |/ | | | | | | | | | | | | | | | | | | | | | fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e am: 18e7c64ea8 * commit '18e7c64ea82e002978ef069884d195e02e7302df': DO NOT MERGE: fix build breakage
| * | am 16b0ae10: Merge "add number constraint for samples per MotionEvent" into ↵Adam Lesinski2015-10-121-0/+5
| |\ \ | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '16b0ae105e4e94ff09d1517b68f7c66f2022a19e': add number constraint for samples per MotionEvent
| * \ \ am 2f3c3eb4: Merge "Allow defining replacement key events in keymap" into ↵Puneet Kumar2015-10-082-0/+15
| |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '2f3c3eb4e47d7cb6ef67e0fd2063e4b93e38e9ec': Allow defining replacement key events in keymap
| * | | | Add KEYCODE_SOFT_SLEEP for Ungaze.Nick Armstrong-Crews2015-09-021-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | BUG: b/23589870 Change-Id: I9bb575fe97bfae926ef4db37615e88057b81480c
* | | | | Merge tag 'android-6.0.1_r3' of ↵Steve Kondik2015-12-073-0/+21
|\ \ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | https://android.googlesource.com/platform/frameworks/native into cm-13.0 Android 6.0.1 release 3 Change-Id: I437aaf148d440a8144afe1454948980fc3b40cca
| * | | | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ↵Nick Kralevich2015-10-231-0/+1
| |\ \ \ \ | | |_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa632f6ad7 am: 9ec978732f am: 1b28b05d2e am: 0370a03b6e * commit '0370a03b6e74e40d5110b83fed2243bf072aee73': DO NOT MERGE: fix build breakage
| | * | | resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ↵Nick Kralevich2015-10-231-0/+1
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa632f6ad7 am: 9ec978732f am: 1b28b05d2e * commit '1b28b05d2edf11f49717b53cd49a9161892f0388': DO NOT MERGE: fix build breakage
| | | * \ \ resolve merge conflicts of 834ac204ce to klp-modular-dev. am: 7f1ea80d65 am: ↵Nick Kralevich2015-10-231-0/+1
| | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fa632f6ad7 am: 9ec978732f * commit '9ec978732f8dd82e7adef3e37097eaca3fbd65f0': DO NOT MERGE: fix build breakage
| | | | * \ \ resolve merge conflicts of 834ac204ce to klp-modular-dev.Nick Kralevich2015-10-231-0/+1
| | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 7f1ea80d65 * commit '7f1ea80d65996ab687ff56a884da915535cdc176': DO NOT MERGE: fix build breakage
| | | | | * \ \ resolve merge conflicts of 834ac204ce to klp-modular-dev.Nick Kralevich2015-10-221-0/+1
| | | | | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 23905002 Change-Id: Ic7262861af91a8fff27692c0f68761cb3ab12aa3
| | | | | | * | | DO NOT MERGE: fix build breakageNick Kralevich2015-10-221-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | fix klp-dev only build breakage. frameworks/native/libs/input/Input.cpp: In member function 'android::status_t android::MotionEvent::readFromParcel(android::Parcel*)': frameworks/native/libs/input/Input.cpp:494:47: error: 'UINT16_MAX' was not declared in this scope Bug: 23905002 Change-Id: I4b6b864ca64d39a8873d045a61e0ddaea2ab9109
| | * | | | | | | add number constraint for samples per MotionEvent am: 5d17838ade am: ↵Flanker2015-10-221-0/+5
| | |\ \ \ \ \ \ \ | | | |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 am: 9830f11dc6 * commit '9830f11dc6b6aa4001c79147966fdb9eaa71c2f2': add number constraint for samples per MotionEvent
| | | * | | | | | add number constraint for samples per MotionEvent am: 5d17838ade am: ↵Flanker2015-10-221-0/+5
| | | |\ \ \ \ \ \ | | | | |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 72c8ca4a01 am: 9964d83869 am: 90dc6dc825 * commit '90dc6dc825ebd1f0f4c9474fad887cd7eac8e9bd': add number constraint for samples per MotionEvent
| | | | * | | | | add number constraint for samples per MotionEvent am: 5d17838adeFlanker2015-10-221-0/+5
| | | | |\ \ \ \ \ | | | | | |/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 72c8ca4a01 * commit '72c8ca4a0191827fd3265c0820b685a6cf420be1': add number constraint for samples per MotionEvent
| | | | | * | | | add number constraint for samples per MotionEventFlanker2015-10-221-0/+5
| | | | | |\ \ \ \ | | | | | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: 5d17838ade * commit '5d17838adef13062717322e79d4db0b9bb6b2395': add number constraint for samples per MotionEvent
| | | | | | * | | add number constraint for samples per MotionEventFlanker2015-10-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23905002 Signed-off-by: Adam Lesinski <adamlesinski@google.com> (cherry picked from commit 552a8a5d8df32f659b8d11311a244cdc6d3b7733) Change-Id: I9b7ea859889b7697bee4165a2746602212120543
| | | * | | | | | DO NOT MERGE: Introduce stem keycodes for WearAnthony Hugh2015-06-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cherry-pick from master This change adds four new stem keycodes for Android Wear. These keycodes are intended to represent the various hardware buttons around the watch. There is one primary stem key that will be used for power/settings and three generic stem keys that will be customizable. BUG: 21903503 Change-Id: I762b8c0bcf3780a1756f4c1b8bbf07a039ba7781
| * | | | | | | | Merge "add number constraint for samples per MotionEvent" into mnc-dr-devAdam Lesinski2015-10-121-0/+5
| |\ \ \ \ \ \ \ \ | | |_|_|_|_|_|_|/ | |/| | | | | | |
| | * | | | | | | add number constraint for samples per MotionEventFlanker2015-10-121-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug:23905002 Change-Id: Ifd24802977c3dcdd1dbc5120a78aac41beae4603 Signed-off-by: Adam Lesinski <adamlesinski@google.com>
| * | | | | | | | Allow defining replacement key events in keymapDmitry Torokhov2015-09-292-0/+15
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Currently keyboard maps allow to assign character sequences to key events and allow specifying a so-called "fallback" key events that are re-injected into input stream if target application indicates that it was not able to handle the original key event. Unfortunately there is no way to perform substitution before handing the event to applicationis. This change adds a new keymap keyword "replace" that allows users query "replacement" actions for key (if any), with the intent that such replacement happens early in the event handling process. Bug: 24504154 Change-Id: I3e6a2476c856524171df00ad22ff56f2018c1278
* | | | | | | | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-051-4/+0
|\ \ \ \ \ \ \ \ | |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 6.0.0 release 26 Conflicts: include/android/input.h Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b
| * | | | | | | DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer ↵Michael Wright2015-09-221-8/+0
| | |_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gestures." into mnc-dev" This reverts commit 9b70ab7a3cb260205e81e40ba181a86710d2eb95, reversing changes made to 153008efb5a00ed3c18d588ce15f90d2442a9786. Bug: 24302031 Change-Id: Ia746381b30be3b54cb646ed412b7271962c4b02a
| * | | | | | Merge commit '62ec2dd5' into mmMichael Wright2015-08-071-0/+4
| |\ \ \ \ \ \ | | |/ / / / / | | | | | | | | | | | | | | Change-Id: I34801df36735545fc500486209573ed2864a0430
| * | | | | | Introduce stem keycodes for WearAnthony Hugh2015-06-241-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change adds four new stem keycodes for Android Wear. These keycodes are intended to represent the various hardware buttons around the watch. There is one primary stem key that will be used for power/settings and three generic stem keys that will be customizable. BUG: 21903503 Change-Id: I60f87f027fa4d4b19933d96b4110019805b30895
* | | | | | | Support WAKE flag in keyboard layoutsnadlabak2015-10-171-0/+1
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This flag is used to specify the internal keyboard keys allowed to wake the device. Change-Id: Ic15aca1134206c9b006a4d97dded10bccae640d3
* | | | | | DO NOT MERGE Add new media navigation keys.Michael Wright2015-08-071-0/+4
|/ / / / / | | | | | | | | | | | | | | | | | | | | Bug: 22059484 Change-Id: I587eb7622555194f18f403da583e3b70656a530e
* | | | | Add method to set action button on MotionEventMichael Wright2015-06-171-0/+2
| | | | | | | | | | | | | | | | | | | | Change-Id: I09f00fa1c2b793a88772f67fe195860ec436179d
* | | | | Fix input tests to work with new MotionEvent memberMichael Wright2015-05-141-1/+1
| | | | | | | | | | | | | | | | | | | | Change-Id: I0dde0f91f693903f26edc116b5dbcbf33bac2b93
* | | | | Revert "Revert "Add new MotionEvent actions for button press and release.""Michael Wright2015-05-142-0/+8
| | | | | | | | | | | | | | | | | | | | This reverts commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.
* | | | | Revert "Add new MotionEvent actions for button press and release."Michael Wright2015-05-142-8/+0
| | | | | | | | | | | | | | | | | | | | This reverts commit 48a8a0e4322969e1551536d6183af3a1faa2240b.
* | | | | Add new MotionEvent actions for button press and release.Michael Wright2015-05-142-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* | | | | Introduces navigation keycodes.Joseph Cooper2015-04-161-0/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | These four new navigation keycodes are intended to be used to navigate a tree hierarchy or list of items. They should be used to allow the user to advance forward or backward within a list of sibling items, expand the currently selected item to navigate the item's children, or back out from the current item to its parent item or state. Change-Id: I4781e9d7756ed00ca14d8d4c743da3cc0e68ea6c
* | | | | Pass through availability of audio mic for input devices.Tim Kilbourn2015-04-091-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | | Bug: 15374820 Change-Id: Id2ca6da10165e3a887ebfbb18f663a3bf316ac79
* | | | | Merge "Move inputflinger process to host directory"Michael Wright2015-02-241-2/+0
|\ \ \ \ \
| * | | | | Move inputflinger process to host directoryMichael Wright2015-02-231-2/+0
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I08ee44bf8b93e7f1760ee9f8d9876a1e2e2e86c8
* | | | | | am 7735c058: am c9aa628d: Cancel touch events when a low-level touch gesture ↵Jeff Brown2015-02-182-0/+13
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / | | | | | | | | | | | | | | | occurs. * commit '7735c058869e0a7fd716054110aa6cb4eff4b075': Cancel touch events when a low-level touch gesture occurs.
| * | | | Cancel touch events when a low-level touch gesture occurs.Jeff Brown2015-02-122-0/+13
| |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When the touch firmware or driver sends a key event that is triggered by a low-level gesture such as a palm slap. For this to work, the touch device's .kl file must specify the "GESTURE" flag for each key that is produced by a gesture. Note that the "VIRTUAL" flag should also be specified for any such keys for which we would like to generate haptic feedback. eg. key 142 SLEEP VIRTUAL GESTURE Bug: 19264992 Change-Id: Ief494ec7e3ca66d2358a1001fdfae4f263ee1cd1
* | | | am 3aa066e9: am 19f8b79f: Merge "New keycode definitions for TV remotes." ↵Wally Yau2014-09-031-0/+28
|\ \ \ \ | |/ / / | | | | | | | | | | | | | | | | | | | | into lmp-dev * commit '3aa066e9d7480f0be806ac2d9f92bbb22771477b': New keycode definitions for TV remotes.
| * | | New keycode definitions for TV remotes.ASAZU, Hideki2014-09-021-0/+28
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Keys which are necessary for supporting world-wide broadcast standard or used commonly for TV/STB remotes. Change-Id: I2721ceb7d956c87f1d4106b99f9d21947ae13d47
* | | | am dea63477: am b1bbfc2d: Merge "Add Voice Assist key." into lmp-devMichael Wright2014-08-221-0/+1
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit 'dea63477e470f3bbcdbe16fcaa20343a4cf4d186': Add Voice Assist key.
| * | | Add Voice Assist key.Michael Wright2014-08-211-0/+1
| | | | | | | | | | | | | | | | | | | | Bug: 16292420 Change-Id: I607fadc2edf673079bfd9f7406e6e45603474957
| * | | Shelve InputFlinger for another release. DO NOT MERGEMichael Wright2014-08-181-54/+0
|/ / / | | | | | | | | | Change-Id: I0f034a2b8b1d9192f61f5001799bd3aa4b3964c7
* | | Bump axis limitMichael Wright2014-06-091-1/+1
| | | | | | | | | | | | Change-Id: I53d18646be2b884c5022f10c7c4ea8f6cda176c8
* | | am 26063a91: am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure ↵Narayan Kamath2014-06-032-8/+16
|\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | member to 8 bytes" * commit '26063a9155ddd18d858cea7fac7c1ddf71e1bcb7': x86_64: Align uint64_t/int64_t structure member to 8 bytes
| * \ \ am f1dd859b: Merge "x86_64: Align uint64_t/int64_t structure member to 8 bytes"Narayan Kamath2014-06-032-8/+16
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit 'f1dd859baa114995bcbcfb7119e939d0b4f45ed5': x86_64: Align uint64_t/int64_t structure member to 8 bytes
| | * | | x86_64: Align uint64_t/int64_t structure member to 8 bytesFengwei Yin2014-05-302-8/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To make sure the stature which pass between 32/64bit process have same memory layout for 32/64bit. Signed-off-by: Fengwei Yin <fengwei.yin@intel.com> Co-Authored-by: Narayan Kamath <narayan@google.com> (Unit test only.) Change-Id: I1bc2d12cce41ec0bc484adcaf968f274bec75c12
| * | | | am cfba3bf1: am c9fcaf37: Merge "Change InputMessage.motion.pointerSize to a ↵Narayan Kamath2014-05-161-3/+3
| |\ \ \ \ | | |/ / / | | | / / | | |/ / | |/| | | | | | | | | | uint32_t." * commit 'cfba3bf1606dfdb1daf1be1c19176180660ae19d': Change InputMessage.motion.pointerSize to a uint32_t.