Merge commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e' into eclair-plus-aosp
* commit 'dfe25b0e0c382d04a59bb03c7f5f8689ece5395e':
LayoutLib: support for custom styles.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp
* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
Don't set priority in Bonding state.
Merge commit '50a3977c619be113bb35fb7fd53874effad6dbe4' into eclair-plus-aosp
* commit '50a3977c619be113bb35fb7fd53874effad6dbe4':
Adding BusinessCard sample to Android.mk and to the Resources TOC on developer.android.com.
Merge commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef' into eclair-plus-aosp
* commit 'a2b0d38f8c6311e712c32318d4ebb68e5a2fecef':
First draft of multitouch in the WebView.
Merge commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5' into eclair-plus-aosp
* commit '6d0f6c78037225ef5648d10e45a513a2e7c612b5':
DO NOT MERGE A library for encoding and decoding ETC1 textures.
Merge commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea' into eclair-plus-aosp
* commit 'aa3b5961c0142fe2fe87a5e4f67a12b3728f1bea':
javadoc change: fix the selector sample XML in the class
Merge commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd' into eclair-plus-aosp
* commit '3fb4ee4e03351078ceadf3d8dd05789ae152e8dd':
Immediately close the shade when the status bar is disabled. (DO NOT MERGE)
The ETC1 compressed texture format is commonly
supported by OpenGL ES 2.0-capable devices.
This change adds a host-only version of the library. It is used by
the etc1tool.
Merge commit '063d03ed0882582840c7db610635aa89c1a01eec' into eclair-plus-aosp
* commit '063d03ed0882582840c7db610635aa89c1a01eec':
Converting tabs to spaces in docs/html/resources/resources_toc.cs.
Merge commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5' into eclair-plus-aosp
* commit 'd71c2aa1a33a456b631ae539fe57f8eb5615fcd5':
SDK doc change: add "Optimizing Judiciously" excerpt to best practices. Clean up blockquote usage in other files.
Merge commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e' into eclair-plus-aosp
* commit 'ce60d4b27e17d98423fd339f61e8b746866f1f4e':
Move Layoutlib API library to sdk.git
Merge commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b' into eclair-plus-aosp
* commit '0b6c6f2cbc7490c952141cee6a662ddcdb0bae5b':
Fix media option settings for A2DP.
Merge commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e' into eclair-plus-aosp
* commit 'e344955393133ac2f99f06cc6a4fe97fbf76f62e':
Fix bug 2325244 screen turns black for a brief period of time
Modified AudioFlinger duplicating output thread so that audio tracks are not mixed until both outputs (A2DP and hardware) have exited standby mode. This avoids to have one output far ahead of the other and audio frames dropped because the compensation mechanism cannot keep up.
Also calculate the maximum wait time in OutputTrack::write() based the on smallest frame count of all output threads instead of the frame count of the thread the OutputTrack is connected to. This avoids starving the thread with the smallest frame count by waiting too long on the other thread.
Since the frame count was reduced on hardware output to reduce latency the difference between A2DP and hardware outputs frame counts had become problematic.
Also increased the number of overflow buffers to cope with bigger timing differences among outputs.
Merge commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7' into eclair-plus-aosp
* commit '11b97c50e6fb6d723e88eac3c125b60ca42184f7':
Use UNDEFINED priorities when unpaired.
Merge commit '87ed10d78d290f48d382a6e628241da0c61cfb45' into eclair-plus-aosp
* commit '87ed10d78d290f48d382a6e628241da0c61cfb45':
Accept incoming connections if no other sink is in NonDisconnecting state.
Merge commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6' into eclair-plus-aosp
* commit '74962e56c5d625fe94a6bfc9cf1acd361382f0b6':
upload new dev site robots.txt to disallow old tutorial and
Merge commit 'e4c2a37624612c9708d0767f8643a10502e6887a' into eclair-plus-aosp
* commit 'e4c2a37624612c9708d0767f8643a10502e6887a':
docs: add new device features for the uses-feature
* changes:
docs: add "required" attribute to the <uses-feature> docs and add a note to the CAMERA permission stating that it enables the <uses-feature> for camera. This is an incrimental update for the 2.0.1 docs. More changes to come for the 2.1 docs to include more features