Ricardo Cerqueira 1cdd1b5ad2 Android 6.0.0 release 26 ... -----BEGIN PGP SIGNATURE----- Version: GnuPG v1 iEYEABECAAYFAlYxAgIACgkQ6K0/gZqxDnjCqACfbBT6VOiUFQvRn7w1SAa+4rjF 1IwAn2rBUqWo0dOKVwF1DDfFmGZXc8SB =1BqV -----END PGP SIGNATURE----- Merge tag 'android-6.0.0_r26' into HEAD Android 6.0.0 release 26 Conflicts: include/android/input.h Change-Id: Ifa374c6d3055be3b8a5d60967f8b4c0043da739b		2015-11-05 01:41:42 +00:00
..
host	DO NOT MERGE Revert "am f37143d8: Merge "Cancel touches as well as pointer gestures." into mnc-dev"	2015-09-22 22:05:48 +01:00
tests	Revert "Revert "Add new MotionEvent actions for button press and release.""	2015-05-14 14:48:03 +01:00
Android.mk	Move inputflinger process to host directory	2015-02-23 16:04:57 -08:00
EventHub.cpp	Fuse stylus and touch screen data.	2015-04-17 16:37:16 +00:00
EventHub.h	Fuse stylus and touch screen data.	2015-04-17 16:37:16 +00:00
InputApplication.cpp
InputApplication.h
InputDispatcher.cpp	Send cancelation events to monitors when injection fails.	2015-06-12 13:25:11 +01:00
InputDispatcher.h	Send cancelation events to monitors when injection fails.	2015-06-12 13:25:11 +01:00
InputListener.cpp	Revert "Revert "Add new MotionEvent actions for button press and release.""	2015-05-14 14:48:03 +01:00
InputListener.h	Revert "Revert "Add new MotionEvent actions for button press and release.""	2015-05-14 14:48:03 +01:00
InputManager.cpp	input: Adjust priority	2015-10-17 13:51:11 -07:00
InputManager.h
InputReader.cpp	Android 6.0.0 release 26	2015-11-05 01:41:42 +00:00
InputReader.h	input: Add option to toggle pointer icon when using stylus(3/3)	2015-10-17 14:03:23 -07:00
InputWindow.cpp
InputWindow.h	Stop consuming input on error dialogs.	2014-11-11 14:05:03 -08:00
PointerControllerInterface.h