summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Expand)AuthorAgeFilesLines
* am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4...Jeff Brown2011-06-071-5/+0
|\
| * am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into ...Jeff Brown2011-06-061-5/+0
| |\
| | * Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2Jeff Brown2011-06-061-5/+0
| | |\
| | | * Revert velocity damping.Jeff Brown2011-06-061-5/+0
| | * | merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)Mathias Agopian2011-06-061-1/+8
| | |/
| * | resolved conflicts for merge of b9783b49 to honeycomb-plus-aospMarco Nelissen2011-06-061-1/+8
| |\ \
| | * \ am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into ginge...Simon Wilson2011-05-241-1/+8
| | |\ \
| | | * | RefBase subclasses can now decide how they want to be destroyed.Mathias Agopian2011-05-231-1/+8
* | | | | Merge "Improve android.hardware.Camera.Area javadoc."Wu-cheng Li2011-06-071-2/+2
|\ \ \ \ \
| * | | | | Improve android.hardware.Camera.Area javadoc.Wu-cheng Li2011-06-071-2/+2
* | | | | | CameraParameters: add PIXEL_FORMAT_RGBA8888Iliyan Malchev2011-06-061-0/+1
* | | | | | Merge "Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.h"James Dong2011-06-031-0/+1
|\ \ \ \ \ \
| * | | | | | Move OMX_QCOM_COLOR_FormatYVU420SemiPlanar definition to OMX_IVCommon.hJames Dong2011-06-031-0/+1
* | | | | | | am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration....Jeff Brown2011-06-031-0/+81
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | |
| * | | | | am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into honeyc...Jeff Brown2011-06-021-0/+81
| |\ \ \ \ \ | | | |_|_|/ | | |/| | |
| | * | | | Implement pointer acceleration.Jeff Brown2011-06-021-0/+81
* | | | | | resolved conflicts for merge of 54cb63e2 to masterDianne Hackborn2011-06-021-0/+1
|\ \ \ \ \ \ | |/ / / / /
| * | | | | am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+1
| |\ \ \ \ \ | | |/ / / /
| | * | | | Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+1
* | | | | | am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of reso...Dianne Hackborn2011-06-021-42/+21
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | |
| * | | | am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config h...Dianne Hackborn2011-05-271-42/+21
| |\ \ \ \ | | |/ / /
| | * | | Small fixes and cleanup of resource config handling.Dianne Hackborn2011-05-271-42/+21
| * | | | am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad g...Jeff Brown2011-05-251-0/+5
| |\ \ \ \ | | |/ / /
| | * | | Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)Jeff Brown2011-05-251-0/+5
| * | | | am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO NO...Jeff Brown2011-05-251-0/+10
| |\ \ \ \ | | |/ / /
| | * | | Refactor how timeouts are calculated. (DO NOT MERGE)Jeff Brown2011-05-231-0/+10
| * | | | am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical stability....Jeff Brown2011-05-252-3/+30
| |\ \ \ \ | | |/ / /
| | * | | Improve VelocityTracker numerical stability. (DO NOT MERGE)Jeff Brown2011-05-232-3/+30
| * | | | am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the poi...Jeff Brown2011-05-252-0/+61
| |\ \ \ \ | | |/ / /
| | * | | Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)Jeff Brown2011-05-232-0/+61
* | | | | Merge "Do not call getEstimatedBandwidth if the streaming is not HTTP-based"James Dong2011-06-021-0/+1
|\ \ \ \ \
| * | | | | Do not call getEstimatedBandwidth if the streaming is not HTTP-basedJames Dong2011-06-021-0/+1
* | | | | | Remove unnecessary level of priority indirectionGlenn Kasten2011-06-011-1/+0
|/ / / / /
* | | | | Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-013-5/+4
* | | | | Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-013-4/+5
* | | | | Merge "Use channel mask instead of channel count for track creation"Jean-Michel Trivi2011-06-014-23/+25
|\ \ \ \ \
| * | | | | Use channel mask instead of channel count for track creationJean-Michel Trivi2011-06-014-23/+25
* | | | | | Send estimated bandwidth value as informational event when cache fetcher pausesJames Dong2011-05-311-0/+6
|/ / / / /
* | | | | Merge "Removed interface to load audio effects libraries"Eric Laurent2011-05-313-92/+0
|\ \ \ \ \
| * | | | | Removed interface to load audio effects librariesEric Laurent2011-05-273-92/+0
* | | | | | 9-axis sensor fusion with Kalman filterMathias Agopian2011-05-271-1/+5
|/ / / / /
* | | | | New effect library APIEric Laurent2011-05-2710-816/+20
* | | | | Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ...Andreas Huber2011-05-261-0/+1
|\ \ \ \ \
| * | | | | Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-251-0/+1
* | | | | | Merge "For out of band timed text support (timed text in a separate file)."Gloria Wang2011-05-251-0/+1
|\ \ \ \ \ \
| * | | | | | For out of band timed text support (timed text in a separate file).Gloria Wang2011-05-251-0/+1
* | | | | | | SurfaceTexture: clean up some comments, tests, etc.Jamie Gennis2011-05-251-20/+45
| |/ / / / / |/| | | | |
* | | | | | Merge "Support wrapping app processes to inject debug instrumentation. Bug: 4...Jeff Brown2011-05-241-2/+8
|\ \ \ \ \ \
| * | | | | | Support wrapping app processes to inject debug instrumentation.Jeff Brown2011-05-241-2/+8
| |/ / / / /
* | | | | | resolved conflicts for merge of bbca8133 to masterDianne Hackborn2011-05-241-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / /