Merge commit '7e509fd267d25fbfe2703d0320a5203f24046b61'
* commit '7e509fd267d25fbfe2703d0320a5203f24046b61':
Fix high density bug 2179543: use 'dip' instead of 'px'
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2
* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
Fix high density bug 2179543: use 'dip' instead of 'px'
Merge commit 'b0219b5aadd9271daa316c47202a849e02adeb7f'
* commit 'b0219b5aadd9271daa316c47202a849e02adeb7f':
Power Manager support for light sensor backlight management.
Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-mr2
* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
Power Manager support for light sensor backlight management.
Merge commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74'
* commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74':
Proper fix for zero signal strength and no_service. Fixes#2176141
Merge commit 'f37447bad3773b62176baa837908daf6edb44273' into eclair-mr2
* commit 'f37447bad3773b62176baa837908daf6edb44273':
Proper fix for zero signal strength and no_service. Fixes#2176141
Track phone service state changes and use a separate timer for out-of-service
since the hunting can timeout on some devices.
Store the timeout value in the config.xml, as it is device/network specific.
Settings App will also change to use the hunting duration to compute the cost
of zero signal.
Merge commit '8ab456b3fcb7e81af824a69daee31921d531696b'
* commit '8ab456b3fcb7e81af824a69daee31921d531696b':
Add separate configuration flag for hardware ALS support.
Merge commit '37a13208c93bbe00cf233baf1ebcd6e081972a27' into eclair-mr2
* commit '37a13208c93bbe00cf233baf1ebcd6e081972a27':
Add separate configuration flag for hardware ALS support.
A new flag config_hardware_automatic_brightness_available indicates
that the device has hardware support for automatic screen brightness management,
while config_automatic_brightness_available now indicates that automatic
brightness mode is available in general.
If config_automatic_brightness_available is true but config_hardware_automatic_brightness_available is false,
then automatic brightness mode support in PowerManager support will be used.
Bug b/2015734 (Ambient light sensor support in power manager)
Change-Id: I6cd888252043dd63df3c25a1d14c21a04a91ad28
Signed-off-by: Mike Lockwood <lockwood@android.com>
Merge commit '6195432b6fde3cda4bc7e2406c8f2975795933a7'
* commit '6195432b6fde3cda4bc7e2406c8f2975795933a7':
Fix for 2177367: Reduce duration of vibrate in RotaryLockScreen
Fix issue #2176944: Need API so browser, others can determine memory size of device
Fix issue #2177262: Improve animations
Fix issue #2174566: HOT STABILITY: NPE in activity manager
Merge commit '0221ec55ac57f32a42fb1e7b66779ca955d58558'
* commit '0221ec55ac57f32a42fb1e7b66779ca955d58558':
Control H icon display in Status bar.
Fixes#2175599. Prevents an NPE when AttachInfo is null.
Set the Bond State to NONE when we receive a Agent Cancel.
Make vCard import Photo from vCard file :(
Merge commit '3537b9d86ee900424b6a2e98056d837663de7390'
* commit '3537b9d86ee900424b6a2e98056d837663de7390':
Make the text bit transparent to allow the correct color to show through
Merge commit '33e21fcc99dd91061ea245984c4e9a1544cb943f' into eclair-mr2
* commit '33e21fcc99dd91061ea245984c4e9a1544cb943f':
Control H icon display in Status bar.
Merge commit '568cae571a3d74d1992176a21722e07b44e9a3c4' into eclair-mr2
* commit '568cae571a3d74d1992176a21722e07b44e9a3c4':
Fix issue #2171460: Turn off background blurring of power dialog
