Jeff Brown 774ed9d953 resolved conflicts for merge of 8b2c0014 to master ...

Change-Id: I33a5a2949dc6c2d09e8196ba8c7128caa7ac2361

2011-06-07 17:48:39 -07:00

..

tests

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

Android.mk

Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

2011-05-25 14:37:17 -07:00

EventHub.cpp

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

EventHub.h

resolved conflicts for merge of ca2b552d to master

2011-06-03 15:50:27 -07:00

InputApplication.h

Prevent events from getting backlogged.

2011-01-10 17:23:05 -08:00

InputDispatcher.cpp

resolved conflicts for merge of 7e193916 to master

2011-06-03 12:26:54 -07:00

InputDispatcher.h

resolved conflicts for merge of 7e193916 to master

2011-06-03 12:26:54 -07:00

InputManager.cpp

…

InputManager.h

…

InputReader.cpp

resolved conflicts for merge of 8b2c0014 to master

2011-06-07 17:48:39 -07:00

InputReader.h

resolved conflicts for merge of 8b2c0014 to master

2011-06-07 17:48:39 -07:00

InputWindow.cpp

Fix bounds check.

2011-05-13 12:51:12 -07:00

InputWindow.h

am 0d9288d7: am 2bdb756c: am 4fb76253: Fix bounds check. Bug: 4413945

2011-05-13 15:22:35 -07:00

PointerController.cpp

am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2

2011-05-31 16:03:07 -07:00

PointerController.h

am 3f5b95b0: am a4e74744: am fa574c0e: Merge "Touch pad UX improvements." into honeycomb-mr2

2011-05-31 16:03:07 -07:00

SpriteController.cpp

Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

2011-05-25 14:37:17 -07:00

SpriteController.h

Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)

2011-05-25 14:37:17 -07:00