Merge commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e' into eclair-mr2-plus-aosp
* commit '3a3fd2ba1ffc6171725375396cc59711a34bb39e':
Implement API to have new broadcasts replace existing broadcasts.
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 '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.
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 'e7c1b11ec892fbb1eb053f9aa4f6839031b19c1c' into eclair-mr2-plus-aosp
* commit 'e7c1b11ec892fbb1eb053f9aa4f6839031b19c1c':
Fix the dependencies to make online-sdk-docs.
Merge commit '8091424ea332f754e6f1c712a9e28bfa7d02741e' into eclair-mr2-plus-aosp
* commit '8091424ea332f754e6f1c712a9e28bfa7d02741e':
Fix#2269582 Sometimes camera preview screen is truncated
Merge commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba' into eclair-mr2-plus-aosp
* commit 'a7d461e09adf716c2148b45a5d94f5b8cb37f9ba':
Layoutlib: Add a constant for default density value.
Merge commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f' into eclair-mr2
* commit '54bb575e85d1e40efbfbb868f37553cdd8ed318f':
Fix the dependencies to make online-sdk-docs.
Merge commit '9b52a2184e99565bcd7f77effb321c95a2a4837e' into eclair-mr2
* commit '9b52a2184e99565bcd7f77effb321c95a2a4837e':
Fix#2269582 Sometimes camera preview screen is truncated
Merge commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7' into eclair-mr2
* commit '62d4395bdb3114b9a75e46140456bc54fd13a3e7':
Layoutlib: Add a constant for default density value.
Merge commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a' into eclair
* commit '6f95f461098d5b9e93212cf9cc7c7a6498eecf3a':
Fix the dependencies to make online-sdk-docs.
Merge commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853' into eclair-mr2-plus-aosp
* commit '70b942d34d1d1a30ab2d73bbefe214f5db0f4853':
Post a Runnable to execute setNewZoomScale when
There were a few places in the window manager where we wouldn't cause
a layout after making a window visible. This would leave it using
whatever size and position it last have since we don't layout windows
when they are not visible.
Also includes a little part I missed in the security issue that
allowed wallpapers to see input on the lock screen.
Change-Id: Icd7e037ad9a67ac936bc7039d87ed68f49502d73
Merge commit '089455760c05289c1315268a6cb896577ceebc64' into eclair-mr2-plus-aosp
* commit '089455760c05289c1315268a6cb896577ceebc64':
Initial checkin of software AMR NB encoder based on PV source code.
Make sure the application is always given the most recent configuration
when launcher. Use the current configuration, instead of whatever happens
to be set by the app, for reporting what it was launched with.
Change-Id: I2ffe306f56cc9092b640546dd0a28d2c29b9c0b3