Merge commit '08e2106a19a034670287374d96d671495e4ffc5f'
* commit '08e2106a19a034670287374d96d671495e4ffc5f':
It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
Merge commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85' into eclair-mr2-plus-aosp
* commit '67f1db1cd1ed4af67c76c52542f753af57aa0a85':
It's important that seek requests are only specified in the initial call to MediaSource::read and are not repeated in subsequent calls.
Merge commit 'dc7294d94dba213727c1956774466707e58a8784'
* commit 'dc7294d94dba213727c1956774466707e58a8784':
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
Merge commit '354cf96792196ce0fec358a573d2621ad2ab0788'
* commit '354cf96792196ce0fec358a573d2621ad2ab0788':
The software AVCDecoder now properly seeks as requested.
Add Hanzi to Pinyin converter and sort key for contacts
Sort key and Hanzi to Pinyin converter is used for Chinese
implementation of contacts search, indexing and sorting.
Hanzi to Pinyin converter should be implemented on top of ICU
transliterator in the future.
Change-Id: I620f67c85897ee4054eda2624e7bcc12a81740aa
Merge commit '163964143fe27b7fdbeb51a4fc65d72769c83481' into eclair-mr2-plus-aosp
* commit '163964143fe27b7fdbeb51a4fc65d72769c83481':
Fixed class paths in layout xml files
Merge commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc' into eclair-mr2-plus-aosp
* commit '19553241513bd2ee2610026ebbce8c45c7ae0dbc':
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
Merge commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb' into eclair-mr2-plus-aosp
* commit '0483f1c192201f75f7c2bd9b22cb6680801dabbb':
The software AVCDecoder now properly seeks as requested.
Use this in various places where it should serve no purpose to deliver
both broadcasts. This is intended to reduce somewhat the flurry of
broadcasts that we churn through during boot.
* changes:
AwesomePlayer now renders either remote (IOMXRenderer) or locally depending on what kind of decoder was instantiated. Split off color conversion code into its own shared library.
* changes:
sdk doc change for esr: Add "resources" tab content. Fix links pointing to the old locations. Change Android.mk to output samples files to resources/samples. Misc other fixes.
Merge commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5' into eclair-mr2-plus-aosp
* commit 'ba8e4d240b3d5eaebbdba9351b247ac20bedadc5':
Add account name / type query parameters for calendar Events.
This change fixes the context menu trigger behavior while
the user is selecting via touch. How if a user is selecting
text via dragging their finger, to trigger the context menu
they will have to lift their finger up, then issue a
longpress. This is consistent with the behavior of selecting
via the trackball.
Merge commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c' into eclair-mr2-plus-aosp
* commit 'b6ddc7ae3507f0e1ea9a76c76f829bc8b26a292c':
Notify native plugin code when the browser discards the customView.
The problem is due to spurious headset connection indications received from event observer when a 3.5mm headset w/o mic is connected.
In this particular case, The HeadsetObserver first received a valid indication of headset with mic connection, followed by a headset with mic disconnection and finally a headset w/o mic connection.
The HeadsetObserver delays the headset disconnection intent to leave time to music app to pause music before the output path is switched.
As the last headset w/o mic connection indication is received from the event observer before the intent corresponding to the spurious headset with mic disconnection is broadcast, the later is discarded. Results a state where the headset with mic is always considered as connected.
The fix consists in not canceling pending intents when a new headset state is received and carrying the HeadsetObserver state with the delayed message triggering the broacast of the disconnection intent.
Merge commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0' into eclair-mr2-plus-aosp
* commit 'a8eaaa1027e09daab01224cfe4a27b19570d35b0':
Fix TabHost NPE when there are no tabs
Merge commit 'e30e85c7e6918129d73d332bb227b41abb5bdd47'
* commit 'e30e85c7e6918129d73d332bb227b41abb5bdd47':
Fix the dependencies to make online-sdk-docs.
