Merge commit 'b078a7f780f2aaf3917660902fd839abada5e167'
* commit 'b078a7f780f2aaf3917660902fd839abada5e167':
Do not show radio/checkboxes for <optgroup> labels.
Merge commit 'a8da17356f9a385e097e3eef205358462d214538' into eclair-mr2-plus-aosp
* commit 'a8da17356f9a385e097e3eef205358462d214538':
Do not show radio/checkboxes for <optgroup> labels.
Fix for http://b/issue?id=2186188. Keep track of <optgroup> labels
separately from disabled <option> labels. Requires a change to
external/webkit.
In CheckedTextView, if the CheckMarkDrawable is set to null,
remove it.
Merge commit '60be84855435c2f354833a98e1bf6154cc45078c'
* commit '60be84855435c2f354833a98e1bf6154cc45078c':
Let PLUS occur once anywhere in dial-str network portion.
Merge commit '8785c064fab3429c792ac160aeeb19e9926382f0' into eclair-mr2-plus-aosp
* commit '8785c064fab3429c792ac160aeeb19e9926382f0':
Let PLUS occur once anywhere in dial-str network portion.
Create a new extractNetworkPortion() function, since the old one is
public, that does effectively the same thing but is more flexible as
just mentioned.
Addresses issue:
http://buganizer/issue?id=2013998
Change-Id: Ie5df08ef9c871881e8728a44abf0385908000823
Merge commit '484a065ce325a1c1bf38627ff924516b25a02efb'
* commit '484a065ce325a1c1bf38627ff924516b25a02efb':
It turns out to be useful to allow enumeration on a per-tag basis,
Merge commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp
* commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5':
It turns out to be useful to allow enumeration on a per-tag basis,
* changes:
It turns out to be useful to allow enumeration on a per-tag basis, and it's easy to support based on the data structures we have, so add a tag parameter to getNextEvent().
Merge commit 'ef7671dbee57ad68f581f0852d797887f9d07890'
* commit 'ef7671dbee57ad68f581f0852d797887f9d07890':
add dpad control of text selection for sholes
Merge commit '7e509fd267d25fbfe2703d0320a5203f24046b61'
* commit '7e509fd267d25fbfe2703d0320a5203f24046b61':
Fix high density bug 2179543: use 'dip' instead of 'px'
Merge commit '5af4cf47b94383deb47648240036c7090f46fd41' into eclair-mr2-plus-aosp
* commit '5af4cf47b94383deb47648240036c7090f46fd41':
add dpad control of text selection for sholes
Merge commit '32de91306233b08604ce7a158a37235c7042ae13' into eclair-mr2-plus-aosp
* commit '32de91306233b08604ce7a158a37235c7042ae13':
Fix high density bug 2179543: use 'dip' instead of 'px'
WebView.mHeldMotionless should only be set to MOTIONLESS_FALSE
if some scrolling occurs, even in the case where motion is discarded
by snap-scroll mode.
Refactoring the code allows the code to be smaller, and provides
a single point where scrollBy() is called while dragging.
This doesn't change the snap-scroll logic in any way.
related to http://b/issue?id=2092446
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2
* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
Fix high density bug 2179543: use 'dip' instead of 'px'
Make movement of text selection arrow and I-beam respond to
both trackball and d-pad. Make the 'click' action work for
both trackball-up and d-pad center.
fixes http://b/issue?id=2186069
Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp
* commit '12a19551dd106b04898d262807213ce4c6d1e5f7':
If openOrCreateDatabase() throws an exception, delete
* changes:
If openOrCreateDatabase() throws an exception, delete the old db and re-do it. If it still fails, something bad happens, like the directory may have the different permission. Let it throw as WebView needs the db.
Merge commit 'b0219b5aadd9271daa316c47202a849e02adeb7f'
* commit 'b0219b5aadd9271daa316c47202a849e02adeb7f':
Power Manager support for light sensor backlight management.
Merge commit '2312b65ddf3b9bff11fc31caef8d145faed106ea'
* commit '2312b65ddf3b9bff11fc31caef8d145faed106ea':
Log exception if we hit an error parsing an incoming SMS message.
Merge commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533' into eclair-mr2-plus-aosp
* commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533':
Power Manager support for light sensor backlight management.
Merge commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6' into eclair-mr2-plus-aosp
* commit '6ef38fb4262356c15cad8a1957ce58d2bb5b3de6':
Log exception if we hit an error parsing an incoming SMS message.
Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-mr2
* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
Power Manager support for light sensor backlight management.
Merge commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1' into eclair-mr2
* commit 'cea8f8e4a8506678c0255763f46d1f6577f991a1':
Log exception if we hit an error parsing an incoming SMS message.
Fix problem with ignored sensor events right after screen turns on.
Do not flash button backlights when device is booting.
Process the first light sensor change after waking the screen immediately rather than debouncing.
Cancel mAutoBrightnessTask when light sensor is disabled.
Change-Id: Iffc5e090b239432b7643812fa8ecb5f69da1679d
Signed-off-by: Mike Lockwood <lockwood@android.com>
