Merge commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df' into eclair-mr2
* commit 'fb872d1af3c775114ac7d241eb1924a9aafbb9df':
Fix a race that kept the locale picker from working under heavy CPU load.
Merge commit '898897338dfd62a268a89fb55ee900a9bd5a683f' into eclair-mr2
* commit '898897338dfd62a268a89fb55ee900a9bd5a683f':
Fix bug 2201417. Whenever the System setting that indicates
Merge commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550' into eclair-mr2
* commit 'd376d2407bbc14a2d221dfef9955d0feeab0d550':
A better solution for ignoring user activity while the screen is animating off.
Merge commit '7bde36e64e66c81f0150d0372e1357a31f4ec704' into eclair-mr2
* commit '7bde36e64e66c81f0150d0372e1357a31f4ec704':
added GL test for textured lines
Merge commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694' into eclair-mr2
* commit '73e17015d3cd67c93ccad5d63d31c439ff6fa694':
fix [2143798] Need to figure out how to do video
Merge commit '4252244939089ce0b055456335071bb7f2c0d1c3' into eclair-mr2
* commit '4252244939089ce0b055456335071bb7f2c0d1c3':
docs: fix broken link for download page.
Merge commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35' into eclair-mr2
* commit 'd85c4b346fe8e335a979b8bbfd2767eae91aca35':
Explicitly specify that online-sdk depends on framework-res.
Merge commit 'aebcaec3c171f636a24051ce85ded2f86b09461b' into eclair-mr2
* commit 'aebcaec3c171f636a24051ce85ded2f86b09461b':
Remove the activity restart between urls.
Merge commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6' into eclair-mr2
* commit '98de26e06aeab9d3e6abd92080eec9ad54f537b6':
Add some logging to detect if AsyncPlayer is lagging. Bug 2201082.
* changes:
When upgrading packages with shared user ids make sure we are eliminating the package about to be deleted or upgraded when updating permissions associated with the shared user. Include a simple null check when retrieving the permission.
* changes:
Check that the window which wants to force hide is visible before setting the flag forceHiding to true. If we do layout the surfaces again this flag gets set no matter what since the keyguard window is always present in the list of tokens and this hides the window which would have become visible since the keyguard just got dismissed. This causes unnecessary focus changes due to changes in visibility of current window.
in the case where we fade a 32-bits surface (ie: GL_MODULATE w/ a,a,a,a + blending),
we first make a copy of the background into a RGB buffer, then we blend the 32-bits
surface as usual (without the alpha component), and finally blend the copy of
the background on top with 1-a. This uses a lot of bandwidth, but no CPU time.
Merge commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d' into eclair-mr2
* commit 'aea1b3b24ee895c24ed25c5706bc2f390b41689d':
Disambiguation between multiple pointers and swipe gestures.
Merge commit 'a2058e431736810503bc85fadec31a8e0bfcad95' into eclair-mr2
* commit 'a2058e431736810503bc85fadec31a8e0bfcad95':
Change default TIME_DELAYED_TO_RESTART_RADIO to 60secs from 20secs.
Merge commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec' into eclair-mr2
* commit '2d155d264e5cefc27abf2c5020fcfa06bde755ec':
PowerManagerService: Fix bug resulting in backlights turning on while screen is off.
Merge commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98' into eclair
* commit 'd14f1bd7e4ba28489bdc472aa736aee5a587cb98':
docs: add 2.0 video to developer site feature videos
Merge commit '5a4d66965d3c5061d47201fcaa62c90d126e7187' into eclair
* commit '5a4d66965d3c5061d47201fcaa62c90d126e7187':
doc change: some fixes for online sdk docs. update "testing" section of screens support doc.
Merge commit '37ebfad1619f250bda4803dfb8683f408d9482cb' into eclair-mr2
* commit '37ebfad1619f250bda4803dfb8683f408d9482cb':
doc change: fix broken link at top of installing doc
Merge commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd' into eclair-mr2
* commit 'adf4b4f5cd5982a56f8027a5a91b25762dd7b1bd':
Fixed the H263 video duation which caused the incorrect video validation.
Merge commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85' into eclair-mr2
* commit 'e8543418783f8f8f9a6bafdaa1dd6289661eac85':
Run the metadataretriever at background priority. Bug 2187133.
Merge commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029' into eclair-mr2
* commit '54620b1a77e51b3fa531dbd099bd69c39d7d0029':
Revert "Now that the underlying bug is fixed we can continue using OMX_UseBuffer for this decoder's input buffers."
Merge commit '6158038a09069bc178970160d4b3667573bfc655' into eclair-mr2
* commit '6158038a09069bc178970160d4b3667573bfc655':
Add Authentication Type field to the APN settings.
Merge commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372' into eclair-mr2
* commit '3333fa4f3d2e1bd3842fe7d41d19557ff9a98372':
PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'a47d153647d8750b667942ad80e7b905ea98c68b' into eclair-mr2
* commit 'a47d153647d8750b667942ad80e7b905ea98c68b':
do not merge - Fix for issue 2184627 cherry picked from eclair-mr2
* changes:
Fix bug 2201417. Whenever the System setting that indicates whether the notifcation stream uses the ring volume changes, the table of stream volume aliases in AudioService is updated. But the name of the alias stored in VolumeStreamState.mVolumeIndexSettingName was not updated whenever the NOTIFICATIONS_USE_RING_VOLUME setting was updated. This caused the wrong volume setting to be persisted. This change ensures the setting name is updated whenever the volume alias is, and persists the notification volume change right away (instead of after a delay), so that registered observers are notified right away. The notification seekbar in the sound settings is an example of such an observer.
