summaryrefslogtreecommitdiffstats
path: root/include
Commit message (Collapse)AuthorAgeFilesLines
* am 61220e88: am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: ↵Jeff Brown2011-06-071-5/+0
|\ | | | | | | | | | | | | 4364920" into honeycomb-mr2 * commit '61220e880ac4d9d76b7fd50744439e68e929c697': Revert velocity damping. Bug: 4364920
| * am bbbab26e: am 2c180499: Merge "Revert velocity damping. Bug: 4364920" into ↵Jeff Brown2011-06-061-5/+0
| |\ | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit 'bbbab26ebe9bc789ba9abac757895a6c31de7cc5': Revert velocity damping. Bug: 4364920
| | * Merge "Revert velocity damping. Bug: 4364920" into honeycomb-mr2Jeff Brown2011-06-061-5/+0
| | |\
| | | * Revert velocity damping.Jeff Brown2011-06-061-5/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4364920 Velocity damping proved to be a bad idea because it would cause a significant ramp in velocity at the beginning of a gesture, instead of the desired smooth behavior. Oh well. Change-Id: Ie631946f47ef2492bd71fbed1ab44bbb39a875a8
| | * | merge various SF fixes from gingerbread to honeycomb-mr2 (DO NOT MERGE)Mathias Agopian2011-06-061-1/+8
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fix a race that could cause GL commands to be executed from the wrong thread. RefBase subclasses can now decide how they want to be destroyed. Fix a race in SurfaceFlinger that could cause layers to be leaked forever. Fix a race-condtion in SurfaceFlinger that could lead to a crash. initial cherry-pick: resolved conflicts for merge of b9783b49 to honeycomb-plus-aosp Change-Id: I2a335e03fff219e35c18a7b0089b3a11d636576f
| * | resolved conflicts for merge of b9783b49 to honeycomb-plus-aospMarco Nelissen2011-06-061-1/+8
| |\ \ | | | | | | | | | | | | Change-Id: I1d86ea56b3d1d1b69f6671e5b0df0ca3f0c79643
| | * \ am c9cd2387: Merge changes I37f0f315,I8cbf6044,Ibb598931,I5262bf11 into ↵Simon Wilson2011-05-241-1/+8
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | gingerbread * commit 'c9cd2387b6938a6fbefc731d2177902266f2a130': Fix a race that could cause GL commands to be executed from the wrong thread. RefBase subclasses can now decide how they want to be destroyed. Fix a race in SurfaceFlinger that could cause layers to be leaked forever. Fix a race-condtion in SurfaceFlinger that could lead to a crash.
| | | * | RefBase subclasses can now decide how they want to be destroyed.Mathias Agopian2011-05-231-1/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This adds a destroy() virtual on RefBase which sublasses can implement. destroy() is called in lieu of the destructor whenthe last strong ref goes away. Bug: 4483050 Change-Id: I8cbf6044a6fd3f01043a45592b5a60fa1e5fade2
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | bug:4553469 Change-Id: Iae88af354fee4925cb7978572c27f6dd5595ca59
* | | | | | CameraParameters: add PIXEL_FORMAT_RGBA8888Iliyan Malchev2011-06-061-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I2780e936f5b4628d506ac4e6947b78ef831fbde8 Signed-off-by: Iliyan Malchev <malchev@google.com>
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I5cbc7246a63301fa7ff735fa3d6512e940608d2b
* | | | | | | am 56503b8d: am 8186a5f0: am 10c3f367: Merge "Implement pointer ↵Jeff Brown2011-06-031-0/+81
|\ \ \ \ \ \ \ | |_|/ / / / / |/| | / / / / | | |/ / / / | |/| | | | | | | | | | | | | | | | acceleration." into honeycomb-mr2 * commit '56503b8ddfe5c82407da32e18061e725f668432d': Implement pointer acceleration.
| * | | | | am 8186a5f0: am 10c3f367: Merge "Implement pointer acceleration." into ↵Jeff Brown2011-06-021-0/+81
| |\ \ \ \ \ | | | |_|_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | honeycomb-mr2 * commit '8186a5f065fac2b82c90cd18d79cd234bc221402': Implement pointer acceleration.
| | * | | | Implement pointer acceleration.Jeff Brown2011-06-021-0/+81
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4124987 Change-Id: I1f31a28f1594c55302ccabe13fe3ca6d2ff71d50
* | | | | | resolved conflicts for merge of 54cb63e2 to masterDianne Hackborn2011-06-021-0/+1
|\ \ \ \ \ \ | |/ / / / / | | | | | | | | | | | | Change-Id: I5b741a1781e3f76c03fc1534ffce871117effd10
| * | | | | am 528c49f1: am b96cbbd1: Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+1
| |\ \ \ \ \ | | |/ / / / | | | | | | | | | | | | | | | | | | * commit '528c49f112dce5f9687f30a9751e783196eca0c6': Add "tv" density for 720p screens.
| | * | | | Add "tv" density for 720p screens.Dianne Hackborn2011-05-271-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I028969b007f2fceea66947d77a2ae31ef1d1a630
* | | | | | am da9837fb: am c058d386: am ff762299: Merge "Small fixes and cleanup of ↵Dianne Hackborn2011-06-021-42/+21
|\ \ \ \ \ \ | |/ / / / / | | | / / / | |_|/ / / |/| | | | | | | | | | | | | | resource config handling." into honeycomb-mr2 * commit 'da9837fb61c8aa53c67921682016d97655332089': Small fixes and cleanup of resource config handling.
| * | | | am c058d386: am ff762299: Merge "Small fixes and cleanup of resource config ↵Dianne Hackborn2011-05-271-42/+21
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | handling." into honeycomb-mr2 * commit 'c058d38602a1ffe00e14b4ab32c876c252eabe6d': Small fixes and cleanup of resource config handling.
| | * | | Small fixes and cleanup of resource config handling.Dianne Hackborn2011-05-271-42/+21
| | | | | | | | | | | | | | | | | | | | Change-Id: I402c31b68f2b4825cb4c610a65ee8e1da471c7bb
| * | | | am 8148cc3e: am 86ea1f5f: Initial checkin of spot presentation for touchpad ↵Jeff Brown2011-05-251-0/+5
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | gestures. (DO NOT MERGE) * commit '8148cc3e47e50c916066e2fed562618b5827188f': Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)
| | * | | Initial checkin of spot presentation for touchpad gestures. (DO NOT MERGE)Jeff Brown2011-05-251-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a new PointerIcon API (hidden for now) for loading pointer icons. Fixed a starvation problem in the native Looper's sendMessage implementation which caused new messages to be posted ahead of old messages sent with sendMessageDelayed. Redesigned the touch pad gestures to be defined in terms of more fluid finger / spot movements. The objective is to reinforce the natural mapping between fingers and spots which means there must not be any discontinuities in spot motion relative to the fingers. Removed the SpotController stub and folded its responsibilities into PointerController. Change-Id: Ib647dbd7a57a7f30dd9c6e2c260df51d7bbdd18e
| * | | | am af685f3b: am 85a7f99c: Merge "Refactor how timeouts are calculated. (DO ↵Jeff Brown2011-05-251-0/+10
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | NOT MERGE)" into honeycomb-mr2 * commit 'af685f3bb566f297deee1615d55d4f33d5580ba3': Refactor how timeouts are calculated. (DO NOT MERGE)
| | * | | Refactor how timeouts are calculated. (DO NOT MERGE)Jeff Brown2011-05-231-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added a timeout mechanism to EventHub and InputReader so that InputMappers can request timeouts to perform delayed processing of input when needed. Change-Id: I89c1171c9326c6e413042e3ee13aa9f7f1fc0454
| * | | | am 16330e24: am 94e838f6: Merge "Improve VelocityTracker numerical ↵Jeff Brown2011-05-252-3/+30
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | stability. (DO NOT MERGE)" into honeycomb-mr2 * commit '16330e249663fed890df0e95fce4016c2971120a': Improve VelocityTracker numerical stability. (DO NOT MERGE)
| | * | | Improve VelocityTracker numerical stability. (DO NOT MERGE)Jeff Brown2011-05-232-3/+30
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Replaced VelocityTracker with a faster and more accurate native implementation. This avoids the duplicate maintenance overhead of having two implementations. The new algorithm requires that the sample duration be at least 10ms in order to contribute to the velocity calculation. This ensures that the velocity is not severely overestimated when samples arrive in bursts. The new algorithm computes the exponentially weighted moving average using weights based on the relative duration of successive sample periods. The new algorithm is also more careful about how it handles individual pointers going down or up and their effects on the collected movement traces. The intent is to preserve the last known velocity of pointers as they go up while also ensuring that other motion samples do not count twice in that case. Bug: 4086785 Change-Id: I95054102397c4b6a9076dc6a0fc841b4beec7920
| * | | | am 4bd89fb0: am 82e4373e: Merge "Use touch pad gestures to manipulate the ↵Jeff Brown2011-05-252-0/+61
| |\ \ \ \ | | |/ / / | | | | | | | | | | | | | | | | | | | | | | | | | pointer. (DO NOT MERGE)" into honeycomb-mr2 * commit '4bd89fb00f319c5d6d4f17b39fd4c0b3dc827ad1': Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)
| | * | | Use touch pad gestures to manipulate the pointer. (DO NOT MERGE)Jeff Brown2011-05-232-0/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 1. Single finger tap performs a click. 2. Single finger movement moves the pointer (hovers). 3. Button press plus movement performs click or drag. While dragging, the pointer follows the finger that is moving fastest. This is important if there are additional fingers down on the touch pad for the purpose of applying force to an integrated button underneath. 4. Two fingers near each other moving in the same direction are coalesced as a swipe gesture under the pointer. 5. Two or more fingers moving in arbitrary directions are transformed into touches in the vicinity of the pointer. This makes scale/zoom and rotate gestures possible. Added a native VelocityTracker implementation to enable intelligent switching of the active pointer during drags. Change-Id: I7b7ddacc724fb1306e1590dbaebb740d3130d7cd
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I4ab6c57e5b2b989676b8dfbb98402d10a5752261
* | | | | | Remove unnecessary level of priority indirectionGlenn Kasten2011-06-011-1/+0
|/ / / / / | | | | | | | | | | | | | | | Change-Id: I942d43973c20a7ace8b0d3f78b4da97e45e996c6
* | | | | Revert "Use AudioTrack::event_type not int in callback"Glenn Kasten2011-06-013-5/+4
| | | | | | | | | | | | | | | This reverts commit 2225e4b7049fa3fb9d39a068b8268b63c952d7c1
* | | | | Use AudioTrack::event_type not int in callbackGlenn Kasten2011-06-013-4/+5
| | | | | | | | | | | | | | | | | | | | Change-Id: Ifefc708d46874e04fd0d01cb6e2d43b987ee796c
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Record and playback objects (resp AudioRecord and AudioTrack) are created using a channel mask, but this information is lost in the mixer because only the channel count is known to AudioFlinger. A channel count can always be derived from a channel mask. The change consists in: - disambiguiting variable names for channel masks and counts - passing the mask information from the client to AudioFlinger and the mixer. - when using the DIRECT ouput, only verifying the format of the track is compatible with the output's for PCM. Change-Id: I50d87bfb7d7afcabdf5f12d4ab75ef3a54132c0e
* | | | | | Send estimated bandwidth value as informational event when cache fetcher pausesJames Dong2011-05-311-0/+6
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | o Application can make informed decision about the available network bandwidth when cache fetcher pauses. o Application can also adjust how frequently the bandwidth is estimated within a range from one second to one minute. Change-Id: I90068001343e79da1886de03c565537787e1580b
* | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Removed unused functions allowing dynamic loading of audio effects libraries from effects factory API. Change-Id: I06cc5a51dc10aca87c7a8687bbb874babd711eca
* | | | | | 9-axis sensor fusion with Kalman filterMathias Agopian2011-05-271-1/+5
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add support for 9-axis gravity and linear-acceleration sensors virtual orientation sensor using 9-axis fusion Change-Id: I6717539373fce781c10e97b6fa59f68a831a592f
* | | | | New effect library APIEric Laurent2011-05-2710-816/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Moved and renamed media/EffectApi.h to hardware/audio_effect.h Modified the effect library API to expose a library info structure containing an interface functions table. Also removed enums for audio channels, audio format and devices from effect API and use values from system/audio.h instead. Modified effects factory to support new library interface format and load libraries and efffects listed in audio_effects.conf file. The file audio_effects.conf is first loaded from /vendor/etc and then from /system/etc/audio_effects.conf if not found. Modified existing effect libraries to implement the new library interface. Change-Id: Ie52351e071b6d352fa2fbc06c3846686f8c45df9
* | | | | Merge "Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts ↵Andreas Huber2011-05-261-0/+1
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | streams."
| * | | | | Support mpeg1,2 audio and mpeg1,2,4 video content extraction from .ts streams.Andreas Huber2011-05-251-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9d2ee63495f161e30daba7c3aab16cb9d8ced6a5
* | | | | | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I9e024a63eb9bf6f839deee3c7766a66e63126c96
* | | | | | | SurfaceTexture: clean up some comments, tests, etc.Jamie Gennis2011-05-251-20/+45
| |/ / / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This change fixes up some stale comments, member variable names, log messages and disables a failing test. Change-Id: Ic1d3344b18066cf710e4a42838b2417c6b1f2f6c
* | | | | | Merge "Support wrapping app processes to inject debug instrumentation. Bug: ↵Jeff Brown2011-05-241-2/+8
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | 4437846"
| * | | | | | Support wrapping app processes to inject debug instrumentation.Jeff Brown2011-05-241-2/+8
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 4437846 Change-Id: I4552501c693716b14714afb5c5248edaca9547ab
* | | | | | resolved conflicts for merge of bbca8133 to masterDianne Hackborn2011-05-241-0/+1
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Change-Id: I81493674dceab848e41d380a77a37e5a9be06db6