Merge commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50' into eclair-plus-aosp
* commit '62e592a61b3262602845f0eac1f1ad3e4d1f4c50':
Armor string format tokens with translation placeholders.
Merge commit '263b49db5bd2a1dd13aa9ac923626a654f5cbda6'
* commit '263b49db5bd2a1dd13aa9ac923626a654f5cbda6':
Launch synthesis thread at max priority to prevent hicups in playback.
Merge commit '0d430593ee07b78894eff8b78f559d2591a94287' into eclair-plus-aosp
* commit '0d430593ee07b78894eff8b78f559d2591a94287':
Launch synthesis thread at max priority to prevent hicups in playback.
* changes:
Launch synthesis thread at max priority to prevent hicups in playback. Return and log an error when an operation cannot be completed because the speech queue is locked longer than the timeout period. Log cleanup.
Merge commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c'
* commit 'a3811e1b16ca0014ef0df7567fdfb8dc9f62dd2c':
don't layout when setting size from zoom if only height changed
Merge commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4' into eclair-plus-aosp
* commit '6d45accc7166c84f94fdb5ca35602463ec4a32a4':
don't layout when setting size from zoom if only height changed
(companion change in external/webkit)
Add a boolean parameter to WebViewCore.java nativeSizeSize().
If set, only layout if the width has also changed.
If clear, layout if the height alone has changed.
Layout is clear when called from zoom setup, and set otherwise.
Merge commit 'a297a266bdea9f64c6a548661aa4be540c69c676'
* commit 'a297a266bdea9f64c6a548661aa4be540c69c676':
Only add model in the UA for the release build
Merge commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496' into eclair-plus-aosp
* commit 'feb2b311c6d895d9cdab1de5bb7016eb75c41496':
Only add model in the UA for the release build
Merge commit '45c67626dc9fd81e18ab650a53dcf8aa706c0958'
* commit '45c67626dc9fd81e18ab650a53dcf8aa706c0958':
Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
Merge commit 'c035f7c79fda9474002d265175fc52692dbd78fe' into eclair-plus-aosp
* commit 'c035f7c79fda9474002d265175fc52692dbd78fe':
Final high-density frameworks artwork drop from designers (dated 25-Aug-2009).
Merge commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef'
* commit '8c0fa1a2e5966b685f75e438eb089701b404b6ef':
Revert "Remove third party support for Quick Search Box (aka global search)."
Merge commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2' into eclair-plus-aosp
* commit 'e9df3cf79c2084391d5af140680cb4a18feca2e2':
Revert "Remove third party support for Quick Search Box (aka global search)."
Replace a table of objects that was created at boot
in a costly manner, with a pre-generated table of
more densely formatted numerical data.
Based on data from runhat on the phone process,
this looks to shrink the memory footprint from about
16kB to less then 2kB.
Addresses http://buganizer/issue?id=874072
Change-Id: I5a7b9d7de4c9b9a0360e8370252582969fbd8d4f
This introduces a new mechanism to define features associated with
a platform, query the current device for the available features,
and enforce that apps requiring features that aren't available can't
be installed.
Also now allows uses-library to specify that a library is optional,
so the lack of such a library will not prevent the app from being
installed (but if it does exist it will be correctly linked into
the app).
Change-Id: I5b369b46cfa0b3d37c9e08fd14ef1098a978e67b
Merge commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909'
* commit '7ff4ef6a4654f077d0cc2a77c8907024ad136909':
add an accessor for Context for use by subclasses
Merge commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6' into eclair-plus-aosp
* commit 'c298a8518a8fd73a303132c7db241f10eb46c5b6':
add an accessor for Context for use by subclasses
* Other changes
+ Re-assign err codes in VpnManager.
+ Add new err codes: REMOTE_PPP_HUNG_UP, PPP_NEGOTIATION_FAILED.
+ Delete the state file only if it exists (to prevent logging an
unable-to-unlink error).
+ Extend timeout to 40 seconds.
Merge commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015'
* commit 'fef09e8f98f61d3d89a3890f5917061fd6a73015':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
Merge commit '1005569fbb459007ff9d9fddbfa6e49947166166' into eclair-plus-aosp
* commit '1005569fbb459007ff9d9fddbfa6e49947166166':
Fix issue #2084148: Define the format for the auto focus preview for barcode scanning
Merge commit '1a66583feafb2cdb90d23306dd7bbd4f2539d389'
* commit '1a66583feafb2cdb90d23306dd7bbd4f2539d389':
Apparently setting the preferred role of the OMX component is now required on this platform.
Merge commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be' into eclair-plus-aosp
* commit 'bf8ecd7c7ecfb3579a91b43d95e7fa0d8a0d63be':
Apparently setting the preferred role of the OMX component is now required on this platform.
