summaryrefslogtreecommitdiffstats
path: root/include/android
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'android-6.0.1_r22' of ↵Steve Kondik2016-03-101-1/+16
|\ | | | | | | | | | | https://android.googlesource.com/platform/frameworks/native into cm-13.0 Android 6.0.1 release 22
| * Revert "inputflinger: Initial support for rotary encoders."Prashant Malani2016-01-131-9/+0
| | | | | | | | This reverts commit ac72bbf4e46d6689070df09a25db2960a9036eb2.
| * Merge "inputflinger: Initial support for rotary encoders." into cw-e-devPrashant Malani2015-12-081-0/+9
| |\
| | * inputflinger: Initial support for rotary encoders.Prashant Malani2015-09-141-0/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change introduces support for rotary encoder input devices. We also define a new input source (namely, AINPUT_SOURCE_ROTARY_ENCODER) and a new axis of input (namely, AXIS_SCROLL), since the rotary encoder motion doesn't necessarily tie to a horizontal or vertical scroll motion. A ROTARY_ENCODER input device class is also introduced, corresponding to the new input source. A new input source can be defined as producing rotary encoder motion events, if its corresponding .idc file contains the following declaration: device.type = rotaryEncoder Bug: 18707397 Change-Id: I8ccd540908311d1ff44fdfeba81b691895413641 Signed-off-by: Prashant Malani <pmalani@google.com>
| * | Add KEYCODE_SOFT_SLEEP for Ungaze.Nick Armstrong-Crews2015-09-021-1/+3
| |/ | | | | | | | | BUG: b/23589870 Change-Id: I9bb575fe97bfae926ef4db37615e88057b81480c
* | Merge tag 'android-6.0.0_r26' into HEADRicardo Cerqueira2015-11-0515-283/+1969
|\ \ | | | | | | | | | | | | | | | | | | | | | | | | 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-14/+1
| |/ | | | | | | | | | | | | | | | | | | | | 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-1/+5
| |\ | | | | | | | | | Change-Id: I34801df36735545fc500486209573ed2864a0430
| * | Introduce stem keycodes for WearAnthony Hugh2015-06-241-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
| * | Merge commit '71997c1a' into manualmergeMichael Wright2015-06-231-0/+2
| |\ \ | | | | | | | | | | | | Change-Id: Ia68fbd20ce66571dfd33764e52c3a00e2285e648
| * \ \ am 8a4222a6: Merge "Add tracing header" into mnc-devChris Craik2015-06-111-0/+55
| |\ \ \ | | | | | | | | | | | | | | | | | | | | * commit '8a4222a647bd17c991959eca17a50ba911c3ab6b': Add tracing header
| * \ \ \ Merge commit '217a04ba' into manualmergeAdam Lesinski2015-05-181-0/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | Change-Id: I526cf2be7949fa52ce0f70f9a1f671669140679a
| * \ \ \ \ am 7c000280: Merge changes from topic \'button_actions\' into mnc-devMichael Wright2015-05-141-0/+8
| |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-141-8/+0
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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-141-0/+8
| |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | release." into mnc-dev * commit 'f27e6681048f3ee7a589ab824a1041667ff838e0': Add new MotionEvent actions for button press and release.
| * \ \ \ \ \ \ \ resolved conflicts for merge of 91e485fa to mnc-dev-plus-aospKenny Root2015-05-1315-278/+1966
| |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ibb4a2058e585218bdeaf4c1d568093fbbd8f6478
| | * | | | | | | | frameworks/native: document native types and enumsJohan Euphrosine2015-05-1215-278/+1966
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Id94b610f27b87426abb30e13484cbd16990aa995
* | | | | | | | | | Add GESTURE_SENSOR input sourceEthan Chen2015-10-171-0/+1
| |_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: If61a7e7bf2d8b2665db7ca57ed68a4462d0c1783
* | | | | | | | | DO NOT MERGE Add new media navigation keys.Michael Wright2015-08-071-1/+5
| |_|_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 22059484 Change-Id: I587eb7622555194f18f403da583e3b70656a530e
* | | | | | | | Add new AINPUT_SOURCE_BLUETOOTH_STYLUSMichael Wright2015-06-121-0/+1
| |_|_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 21531826 Change-Id: I3792860ad3f6579ceb50ccaa212f8fbd471a9b6b
* | | | | | | Add tracing headerChris Craik2015-06-101-0/+55
| |_|_|_|_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:21195272 Change-Id: I520de9fee7fc40d0570d6bef450d756ce42a1462
* | | | | | Adding round qualifier constant to native API.Adam Lesinski2015-05-151-0/+15
| |_|_|_|/ |/| | | | | | | | | | | | | | Change-Id: I43e6c029412d0ed1d345c16fdce90e2879c52a8e
* | | | | Merge changes from topic 'button_actions' into mnc-devMichael Wright2015-05-141-0/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | | | | | | | | | | | | | | | | * changes: Fix input tests to work with new MotionEvent member Revert "Revert "Add new MotionEvent actions for button press and release.""
| * | | | Revert "Revert "Add new MotionEvent actions for button press and release.""Michael Wright2015-05-141-0/+8
| | | | | | | | | | | | | | | | | | | | This reverts commit 70b41ef580644fd0fe6fa9b8ac7e4a745cfb6db3.
* | | | | Merge "Revert "Add new MotionEvent actions for button press and release."" ↵Michael Wright2015-05-141-8/+0
|\ \ \ \ \ | |/ / / / | | | | / | |_|_|/ |/| | | into mnc-dev
| * | | Revert "Add new MotionEvent actions for button press and release."Michael Wright2015-05-141-8/+0
| | | | | | | | | | | | | | | | This reverts commit 48a8a0e4322969e1551536d6183af3a1faa2240b.
* | | | Merge "Add new MotionEvent actions for button press and release." into mnc-devMichael Wright2015-05-141-0/+8
|\ \ \ \ | |/ / / | | / / | |/ / |/| |
| * | Add new MotionEvent actions for button press and release.Michael Wright2015-05-141-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
* | | Fix broken NDK sensor manager API.Svet Ganov2015-05-071-0/+24
|/ / | | | | | | Change-Id: I21bb8b0dcfd3f1c812753a9fd77dea792e7155f2
* | Add body sensors app op - framework nativeSvetoslav2015-05-011-11/+0
| | | | | | | | Change-Id: I727a2bb1e28ae9158f2df9c74dd0aee977dfd47f
* | Introduces navigation keycodes.Joseph Cooper2015-04-161-1/+5
| | | | | | | | | | | | | | | | | | | | | | 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
* | multinetwork API: native headerErik Kline2015-04-071-0/+109
|/ | | | | Bug: 19537384 Change-Id: I7bb2f4310755e0c2ea2f32288000e54d671aebbe
* New keycode definitions for TV remotes.ASAZU, Hideki2014-09-021-1/+29
| | | | | | | Keys which are necessary for supporting world-wide broadcast standard or used commonly for TV/STB remotes. Change-Id: I2721ceb7d956c87f1d4106b99f9d21947ae13d47
* Add native flag to reflect new density typeAdam Lesinski2014-08-221-0/+1
| | | | | Bug:17007265 Change-Id: If0129c4ad222fe28628d6f7cd8ee78fc6424e177
* Add Voice Assist key.Michael Wright2014-08-211-1/+2
| | | | | Bug: 16292420 Change-Id: I607fadc2edf673079bfd9f7406e6e45603474957
* Sensor related changes for NDK.Aravind Akella2014-08-051-1/+13
| | | | | | | | | i) ASensorManager_getDefaultSensor returns a wake-up/non wake-up sensor depending on the type. ii) Add ASensor_isWakeUpSensor and ASensorManager_getDefaultSensorEx methods. Bug : 16399898 Change-Id: I1a86fb8d9de23039fdf41679d1487e1cd761a9d0
* Surface reportingMode for Sensors.Aravind Akella2014-06-121-0/+15
| | | | Change-Id: Iac8dd3408c90eb7d285a2e8043131fab3a7e58fa
* am b3a65bb0: am 9dcd38ad: Merge "Add heart rate to ASensorEvent" into ↵Etienne Le Grand2014-05-271-0/+7
|\ | | | | | | | | | | | | klp-modular-dev * commit 'b3a65bb0c2d2f6e660510efe0d93b3d26b0b2bf9': Add heart rate to ASensorEvent
| * am 9dcd38ad: Merge "Add heart rate to ASensorEvent" into klp-modular-devEtienne Le Grand2014-05-271-0/+7
| |\ | | | | | | | | | | | | * commit '9dcd38ad3b8335308b59932718e3f145aa50d318': Add heart rate to ASensorEvent
| | * Merge "Add heart rate to ASensorEvent" into klp-modular-devEtienne Le Grand2014-05-271-0/+7
| | |\
| | | * Add heart rate to ASensorEventEtienne Le Grand2014-05-231-0/+7
| | | | | | | | | | | | | | | | Change-Id: Ic82838b17a575de93d499e44a454bb382f17678f
* | | | am 040730e8: am 1236710b: Remove getRequiredPermission from NDK.Aravind Akella2014-05-231-7/+0
|\ \ \ \ | |/ / / | | | | | | | | | | | | * commit '040730e8954b2f686390434646f82bc333de7058': Remove getRequiredPermission from NDK.
| * | | am 1236710b: Remove getRequiredPermission from NDK.Aravind Akella2014-05-221-7/+0
| |\ \ \ | | |/ / | | | | | | | | | | | | * commit '1236710bccd8f5870c0281e24a899c3d58f708e6': Remove getRequiredPermission from NDK.
| | * | Remove getRequiredPermission from NDK.Aravind Akella2014-05-221-7/+0
| | |/ | | | | | | | | | Change-Id: Ic967adde89f30261c75fca67c09d14d35bd1cdb3
* | | New keycode definitions for HDMI-CECJinsuk Kim2014-05-201-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Following keys are added to be mapped to HDMI-CEC standard keys: KEYCODE_MEDIA_TOP_MENU KEYCODE_11 KEYCODE_12 KEYCODE_LAST_CHANNEL KEYCODE_TV_DATA_SERVICE Change-Id: Ie73cf4cd8355ced4753eb5bba0ea130b087dfc36
* | | Add KEYCODE_PAIRING.Tim Kilbourn2014-05-161-0/+1
| | | | | | | | | | | | | | | | | | Used for initiating a peripheral pairing mode. Change-Id: I7e8439d27491ccc72d045cabf5751a35b9113aa7
* | | Enable wakeup sensors.Aravind Akella2014-04-231-1/+3
|/ / | | | | | | | | | | | | | | SensorService should hold a wakelock till the app reads events from a wakeup sensor. Currently drivers hold a wakelock with a timeout while delivering events from a wake up sensor like Significant Motion. This hack can be removed now. Bug: 9774884 Change-Id: If3b5acb99c9cf0cd29012fcfa9d6b04c74133d01
* | am cf818ebb: Merge "Add stringType and requiredPermission to sensors, ↵Aravind Akella2014-04-111-0/+22
|\ \ | |/ | | | | | | | | | | effectively adding permission checking for sensors" into klp-modular-dev * commit 'cf818ebbf07c6a20ef48d71bf82f8d4bdf3a398c': Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors
| * Add stringType and requiredPermission to sensors, effectively adding ↵Aravind Akella2014-04-111-0/+22
| | | | | | | | | | | | | | | | permission checking for sensors This reverts commit 4369a4ebd5ae7567e7075bc82830b83178099ed5. Change-Id: Ifa8619cc6873470a07a987763d818d78d4232610
* | am 4369a4eb: Revert "Add stringType and requiredPermission to sensors, ↵Etienne Le Grand2014-04-051-22/+0
|\ \ | |/ | | | | | | | | | | effectively adding permission checking for sensors" * commit '4369a4ebd5ae7567e7075bc82830b83178099ed5': Revert "Add stringType and requiredPermission to sensors, effectively adding permission checking for sensors"