Merge commit '22d3ba8ac6faddcdad279b775a5f6237c0d2132f'
* commit '22d3ba8ac6faddcdad279b775a5f6237c0d2132f':
Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit 'dee76be487fcdc975877f85221a693b87b9669a7' into eclair-plus-aosp
* commit 'dee76be487fcdc975877f85221a693b87b9669a7':
Fix for 2122292: make sure we unregister the ContentObserver for the system location settings. Also make the GoogleLocationManager use the singleton pattern correctly.
Merge commit '24a3ff958b87550904a71961835f6883d1411c27' into eclair-plus-aosp
* commit '24a3ff958b87550904a71961835f6883d1411c27':
Change double tap toast to long toast.
Merge commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31'
* commit 'a57f82975eeb0a7dfa7d0fd310ae9612857a6c31':
Reimplement the settings to use async callbacks
Merge commit '194099dc4f614130f3baff14850792e6dc3fa59b' into eclair-plus-aosp
* commit '194099dc4f614130f3baff14850792e6dc3fa59b':
Reimplement the settings to use async callbacks
Merge commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3'
* commit 'a1d6c7d001cc4d2e53353be07127420c8907b6a3':
Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
Merge commit '909e7b8c9d94e28978721874a574ffbe84ef3b36'
* commit '909e7b8c9d94e28978721874a574ffbe84ef3b36':
Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit '0676690091b348d939db0340c3a0d888683c1abb' into eclair-plus-aosp
* commit '0676690091b348d939db0340c3a0d888683c1abb':
Fix bug with ScrollView so that text entry fields are not hidden by virtual keyboard.
Merge commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a' into eclair-plus-aosp
* commit 'd58ccff769e40a6c52e9f6e30e4016590e05ba9a':
Add a boolean indicating if the apple-touch-icon is precomposed.
Merge commit '263a2f5031f50d020a51d45ef26b99dcee5cb65e'
* commit '263a2f5031f50d020a51d45ef26b99dcee5cb65e':
Support the new dpi change in the WebView.
Merge commit '408cf85207a43c9169f9fb520a584d2858847d24' into eclair-plus-aosp
* commit '408cf85207a43c9169f9fb520a584d2858847d24':
Support the new dpi change in the WebView.
Merge commit '1e577ced7dcd973267f38351616d28f8a090f013'
* commit '1e577ced7dcd973267f38351616d28f8a090f013':
Make media scanner read the jpeg orientation tag.
Merge commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6' into eclair-plus-aosp
* commit '7b7029e0325b1a096bdbe5da3f8ec795c2aff9d6':
Make media scanner read the jpeg orientation tag.
Merge commit '5136e726015b2bea3309f44c503ccc49e264cdb6'
* commit '5136e726015b2bea3309f44c503ccc49e264cdb6':
Don't snap the initialScale to min or max if it is not defined.
Merge commit 'f53c1865248dd2b38f8c24a0419d550330619b19' into eclair-plus-aosp
* commit 'f53c1865248dd2b38f8c24a0419d550330619b19':
Don't snap the initialScale to min or max if it is not defined.
Merge commit '5b4aa6db428263aa0a48ab3efb896df66a852bce' into eclair-plus-aosp
* commit '5b4aa6db428263aa0a48ab3efb896df66a852bce':
VpnService: use Credentials instead of CertTool.
Merge commit 'f145f5c31028746e89a9a9f6f4cafe203043cc62'
* commit 'f145f5c31028746e89a9a9f6f4cafe203043cc62':
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
Merge commit '585c67f70f18b8879ced854c5865141d6c650cd8' into eclair-plus-aosp
* commit '585c67f70f18b8879ced854c5865141d6c650cd8':
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on
* changes:
experimental fix for compatibility mode. When we scale up by 1.5 (240 dpi), we put stretched ninepatches on exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
exact pixel boundaries when we walk the inverse matrix (e.g. 2/3, 1+1/3, 2, 2+2/3, 3+1/3, 4, ...).
These are not stable, since any variance in the inverse matrix (even in the lowest bit) can cause some other
part of the ninepatch to start a hair to the left, resulting in misaligning every 3 pixels.
The fix changes the matrix' phase enough to keep all of the stretched ninepatches in phase.
Merge commit '302b363c5ed5672406f7a216929c42fddc68f053'
* commit '302b363c5ed5672406f7a216929c42fddc68f053':
Add search_mode flag to intents launched by QSB suggestions
Merge commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d' into eclair-plus-aosp
* commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d':
Add search_mode flag to intents launched by QSB suggestions
Merge commit 'a945ebadfcca0dbe3587d395e205470d7f23337d'
* commit 'a945ebadfcca0dbe3587d395e205470d7f23337d':
Fix the incorrect field name in EAP wifi network.
There was a regression introduced in AudioFlinger by change 24114 for suspended output:
The suspended output was not reading and mixing audio tracks.
When the phone is ringing, the A2DP output is suspended if the SCO headset and A2DP headset are the same. As the ringtone is played over the duplicated output, the fact that the A2DP output was not reading data was causing the hardware output to be stalled from time to time.
Merge commit '5f55d8c9d447f492aed955ac29454e0c482a4956' into eclair-plus-aosp
* commit '5f55d8c9d447f492aed955ac29454e0c482a4956':
Fix the incorrect field name in EAP wifi network.
Merge commit '6f462b06fdbe7d6bdb19ee14a6db1427ed36fd0c'
* commit '6f462b06fdbe7d6bdb19ee14a6db1427ed36fd0c':
Fix the issue of 'Wifi framework is not aware of state change'
Merge commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f' into eclair-plus-aosp
* commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f':
Fix the issue of 'Wifi framework is not aware of state change'
