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 '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, ...).
Merge commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d' into eclair-plus-aosp
* commit '976e363fe8206fcac5f2342ed3a0c3e0df66d32d':
Add search_mode flag to intents launched by QSB suggestions
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 '2e2f6b5e6866cdba632bdd599cadbf235b80546f' into eclair-plus-aosp
* commit '2e2f6b5e6866cdba632bdd599cadbf235b80546f':
Fix the issue of 'Wifi framework is not aware of state change'
Merge commit '9cea89c103bc876bb083a9ac1b845534dca6172b' into eclair-plus-aosp
* commit '9cea89c103bc876bb083a9ac1b845534dca6172b':
Basic API for third-party apps to define custom Data rows.
Merge commit '94db928d8cf5a69e8c2907fc33a6d656045f263d' into eclair-plus-aosp
* commit '94db928d8cf5a69e8c2907fc33a6d656045f263d':
PowerManager: Require proximity sensor value be less than Sensor.getMaximumRange()
Merge commit '3f0476a4e283ce4e55caac016293dafe9dca11fa' into eclair-plus-aosp
* commit '3f0476a4e283ce4e55caac016293dafe9dca11fa':
Basic API for third-party apps to define custom Data rows.
Merge commit 'cd263b5c072703e80fe43e46baa831304441369b' into eclair-plus-aosp
* commit 'cd263b5c072703e80fe43e46baa831304441369b':
Implement more type checks on Allocations.
* changes:
Implement more type checks on Allocations. Add tracking for allocations created using the "sized" helper. Add more param validation for data upload calls.
Merge commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b' into eclair-plus-aosp
* commit '9bbd5ee49f4a26b87273c40a955557e63f10da3b':
Make IBackupTransport.finishBackup() also return an int code, since it too can
* changes:
Make IBackupTransport.finishBackup() also return an int code, since it too can return TRANSPORT_NOT_INITIALIZED (in fact that's typically how it comes).
Merge commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3' into eclair-plus-aosp
* commit 'fe2bddfae1b8c2375f58216871d923cbfe267dd3':
Don't wake up the screen as soon as the lid opens.
Merge commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce' into eclair-plus-aosp
* commit '7f3fb7dec2afdffa37e3067ca8a5b9d01809a9ce':
Turn animations on by default.
Merge commit '9197081f8feca110455740874e06e05771f462c8' into eclair-plus-aosp
* commit '9197081f8feca110455740874e06e05771f462c8':
Send the address of the device with the UUID intent.
Merge commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9' into eclair-plus-aosp
* commit '6e81a40d078269258d75bf22dd00a9dc22f4d0b9':
Resolve race conditions with disconnect of CDMA data and airplane mode
Merge commit 'a7719af31290bea50d822b535b6a886ba7a88097' into eclair-plus-aosp
* commit 'a7719af31290bea50d822b535b6a886ba7a88097':
Cache the remote device's service channel.
Merge commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5' into eclair-plus-aosp
* commit '36322db5752c7ec196f59ba94abe5d5a63cc19f5':
Add focus API and FLASH_MODE_VIDEO_LIGHT.
Merge commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede' into eclair-plus-aosp
* commit 'dbe8bad1d2d68e2f5947ff0a8347dbb498e17ede':
Work around gcc 4.0.3 bug.
This appears to fix the sim-eng build on the gDapper build machines.
Basic problem is that LayerBuffer::OverlaySource has a constructor that
calls SurfaceFlinger.signalEvent(). SurfaceFlinger lists LayerBuffer
as a friend, but that's not enough to convince gcc that the embedded
OverlaySource class is also a friend. I don't see a way to make them
friendly, so I marked signalEvent() as public.
Merge commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558' into eclair-plus-aosp
* commit 'c2f97178acaf9c406067b9b89776b87ddf9c8558':
Added a workaround to clear the browser cache.
Merge commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449' into eclair-plus-aosp
* commit 'fe6104fbfbba0434e78f9e21f460c71cddfe8449':
When manually setting the uri pass it through to the badge widget.
Merge commit '88a83d3f108dcf01443b241439e14eedbd9615f5' into eclair-plus-aosp
* commit '88a83d3f108dcf01443b241439e14eedbd9615f5':
Update getDisplayLabel() API to support new types.
Merge commit '9568fb21766684083ec256303a6ed7949ada7d9f' into eclair-plus-aosp
* commit '9568fb21766684083ec256303a6ed7949ada7d9f':
Reset backup tracking in response to transport data-wipe notification
Merge commit 'd3997e556eb0509248c72b668c2cd955b7842b55' into eclair-plus-aosp
* commit 'd3997e556eb0509248c72b668c2cd955b7842b55':
Make scrolling textfields work better in the browser.
