Merge commit '8ab456b3fcb7e81af824a69daee31921d531696b'
* commit '8ab456b3fcb7e81af824a69daee31921d531696b':
Add separate configuration flag for hardware ALS support.
Merge commit 'ba5c6ae8ae8373fecb883f07ac39d56c8adfb67f'
* commit 'ba5c6ae8ae8373fecb883f07ac39d56c8adfb67f':
Remove hack in RS that called exit to WAR now fixed driver bugs. Make gloabal init safe by locking around the critical code.
Merge commit 'cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1'
* commit 'cd1b99125205aa7b773d9d2bcf344f1e88d2fcb1':
Make sure CF icon updates when using "all CF" MMI.
Merge commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95'
* commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95':
Fix possible NPE in the code that restores widgets' state.
Merge commit 'df284aa534bd5611684604c469c04b4db6bb42c7' into eclair-mr2-plus-aosp
* commit 'df284aa534bd5611684604c469c04b4db6bb42c7':
Add separate configuration flag for hardware ALS support.
Merge commit '193c985e4458323e11db2671717a7087ae4cc5f3' into eclair-mr2-plus-aosp
* commit '193c985e4458323e11db2671717a7087ae4cc5f3':
Remove hack in RS that called exit to WAR now fixed driver bugs. Make gloabal init safe by locking around the critical code.
Merge commit '8dab969302f2229397024bdaa005b35f30a46c62' into eclair-mr2-plus-aosp
* commit '8dab969302f2229397024bdaa005b35f30a46c62':
Minor bug fixes and add glError check.
Merge commit '1398295617457666bff877887b19ade105b83b82' into eclair-mr2-plus-aosp
* commit '1398295617457666bff877887b19ade105b83b82':
Make sure CF icon updates when using "all CF" MMI.
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp
* commit '7d4134a1a67872c056d05330b1453395a7c8c4d1':
Fix possible NPE in the code that restores widgets' state.
Merge commit '37a13208c93bbe00cf233baf1ebcd6e081972a27' into eclair-mr2
* commit '37a13208c93bbe00cf233baf1ebcd6e081972a27':
Add separate configuration flag for hardware ALS support.
Merge commit '41c19db90e250e2b7cb438904f0e96a0ef455d6d' into eclair-mr2
* commit '41c19db90e250e2b7cb438904f0e96a0ef455d6d':
Remove hack in RS that called exit to WAR now fixed driver bugs. Make gloabal init safe by locking around the critical code.
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 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2' into eclair-mr2
* commit 'c7412b3b08d62c298dc7c3e5f369f406a3c0eac2':
Minor bug fixes and add glError check.
Merge commit '2a39758ecb315a77f05800cc04f7ca65954c9026' into eclair-mr2
* commit '2a39758ecb315a77f05800cc04f7ca65954c9026':
Make sure CF icon updates when using "all CF" MMI.
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2
* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
Fix possible NPE in the code that restores widgets' state.
Merge commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774'
* commit 'f6411533ef8a4e6759dd214636ba3ab1ea25f774':
Do not show soft keyboard for readonly textfields.
Merge commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be' into eclair-mr2-plus-aosp
* commit 'be3feda46eac18a05aaea47d7ef34b611f8be6be':
Do not show soft keyboard for readonly textfields.
Merge commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5'
* commit '800ca40dfa296a90ec2dd2ae526b39181a809bc5':
check for native initialization before calling public function
Merge commit '9f2088240272086cd9eb94d01b1872a1088b76f2' into eclair-mr2-plus-aosp
* commit '9f2088240272086cd9eb94d01b1872a1088b76f2':
check for native initialization before calling public function
Part of a fix for http://b/issue?id=2159869. The request to show
the soft input has been moved to nativeTextInputMotionUp, where it
can check if the input field is readOnly. This way it is also
handled by shortPressOnTextField, for when a user shortpresses
on the field.
Added more checks where it is possible to call a native function
after creating a WebView but before the native side is initialized.
These cases can be triggered by the monkey.
Fixes http://b/issue?id=2187719
Merge commit '2f2d2f8316cfe331160715b8598272ffe391e30f'
* commit '2f2d2f8316cfe331160715b8598272ffe391e30f':
Enable some tests that requires local http server
Merge commit 'd1a720d06f92a7228f28361a01f3a158c560cd18' into eclair-mr2-plus-aosp
* commit 'd1a720d06f92a7228f28361a01f3a158c560cd18':
Enable some tests that requires local http server
Merge commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd' into eclair-mr2
* commit '9e58e6427c8e5fefb65432ea4b56c6cb31e80bbd':
Enable some tests that requires local http server
Merge commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250' into eclair-mr2-plus-aosp
* commit 'badd8399ca803f48ca43658b49c1cdcf0e3ec250':
fix copy/paste using trackball on passion
This fix should be considered for passion mr1, but
does not affect sholes -- this is a trackball only bug.
The selection caret and arrow now take the scale factor and
the height of the title bar into account when preparing the
canvas for drawing.
Clicking the trackball at the end of selecting text no longer
sends a click event.
Requires a companion fix in external/webkit
Fixes http://b/issue?id=2187591
Merge commit '70d71fdcbf365ed148f2f4252a6975851424637e' into eclair-mr2-plus-aosp
* commit '70d71fdcbf365ed148f2f4252a6975851424637e':
remove the bind helper and bind directly
