6034 Commits

Author SHA1 Message Date
Cary Clark
9394f5e824 am 2c15a260: am 7a719785: Merge change Ifcafa460 into eclair-mr2
Merge commit '2c15a260a12c76ab4a36fb5fc287fa22fa948b79'

* commit '2c15a260a12c76ab4a36fb5fc287fa22fa948b79':
  fix multiple text areas, and text areas without focus rings
2009-10-21 12:14:46 -07:00
Cary Clark
2c15a260a1 am 7a719785: Merge change Ifcafa460 into eclair-mr2
Merge commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50' into eclair-mr2-plus-aosp

* commit '7a7197853de1b8aea0945b5b72e0eb12b2837b50':
  fix multiple text areas, and text areas without focus rings
2009-10-21 11:59:20 -07:00
Android (Google) Code Review
7a7197853d Merge change Ifcafa460 into eclair-mr2
* changes:
  fix multiple text areas, and text areas without focus rings
2009-10-21 14:14:46 -04:00
Cary Clark
fcafa46069 fix multiple text areas, and text areas without focus rings
If the typed key doesn't go with the current text area, clear
the focus so the key won't return to that text area. However,
don't clear the focus if it is already off the old text area.

fixes http://b/issue?id=2201049
2009-10-21 13:55:48 -04:00
Leon Scroggins
2e7b1b7d4c am b078a7f7: am a8da1735: Do not show radio/checkboxes for <optgroup> labels.
Merge commit 'b078a7f780f2aaf3917660902fd839abada5e167'

* commit 'b078a7f780f2aaf3917660902fd839abada5e167':
  Do not show radio/checkboxes for <optgroup> labels.
2009-10-21 07:32:53 -07:00
Leon Scroggins
b078a7f780 am a8da1735: 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.
2009-10-21 07:21:57 -07:00
Leon Scroggins
a8da17356f 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.
2009-10-21 10:01:49 -04:00
Dan Egnor
bc04846150 am 484a065c: am 2a2805b7: Merge change Ib3b06fc3 into eclair-mr2
Merge commit '484a065ce325a1c1bf38627ff924516b25a02efb'

* commit '484a065ce325a1c1bf38627ff924516b25a02efb':
  It turns out to be useful to allow enumeration on a per-tag basis,
2009-10-20 13:35:51 -07:00
Dan Egnor
484a065ce3 am 2a2805b7: Merge change Ib3b06fc3 into eclair-mr2
Merge commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5' into eclair-mr2-plus-aosp

* commit '2a2805b7fbd25ee11ad554e33bf34dbb2e8b71c5':
  It turns out to be useful to allow enumeration on a per-tag basis,
2009-10-20 13:29:31 -07:00
Android (Google) Code Review
2a2805b7fb Merge change Ib3b06fc3 into eclair-mr2
* 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().
2009-10-20 16:23:01 -04:00
Dan Egnor
b3b06fc39b 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().
2009-10-20 13:05:17 -07:00
Cary Clark
bad3f6455e am 536d7f03: am ac492e18: tweak snap scroll
Merge commit '536d7f037d21ca29c6c0c57e7d64c1f581f60ab0'

* commit '536d7f037d21ca29c6c0c57e7d64c1f581f60ab0':
  tweak snap scroll
2009-10-20 12:39:05 -07:00
Cary Clark
107a8034de am ef7671db: am 5af4cf47: Merge change I4958d608 into eclair-mr2
Merge commit 'ef7671dbee57ad68f581f0852d797887f9d07890'

* commit 'ef7671dbee57ad68f581f0852d797887f9d07890':
  add dpad control of text selection for sholes
2009-10-20 12:30:06 -07:00
Marco Nelissen
c05275aa0f am 7e509fd2: am 32de9130: am cdc8b326: Merge change I61741f5a into eclair
Merge commit '7e509fd267d25fbfe2703d0320a5203f24046b61'

* commit '7e509fd267d25fbfe2703d0320a5203f24046b61':
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 12:29:29 -07:00
Cary Clark
536d7f037d am ac492e18: tweak snap scroll
Merge commit 'ac492e181a21749858ebf30dc1f5bcb0ded4383c' into eclair-mr2-plus-aosp

* commit 'ac492e181a21749858ebf30dc1f5bcb0ded4383c':
  tweak snap scroll
2009-10-20 12:28:56 -07:00
Cary Clark
ef7671dbee am 5af4cf47: Merge change I4958d608 into eclair-mr2
Merge commit '5af4cf47b94383deb47648240036c7090f46fd41' into eclair-mr2-plus-aosp

* commit '5af4cf47b94383deb47648240036c7090f46fd41':
  add dpad control of text selection for sholes
2009-10-20 12:18:56 -07:00
Marco Nelissen
7e509fd267 am 32de9130: am cdc8b326: Merge change I61741f5a into eclair
Merge commit '32de91306233b08604ce7a158a37235c7042ae13' into eclair-mr2-plus-aosp

* commit '32de91306233b08604ce7a158a37235c7042ae13':
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 12:18:24 -07:00
Cary Clark
ac492e181a tweak snap scroll
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
2009-10-20 15:17:55 -04:00
Android (Google) Code Review
5af4cf47b9 Merge change I4958d608 into eclair-mr2
* changes:
  add dpad control of text selection for sholes
2009-10-20 15:09:51 -04:00
Marco Nelissen
32de913062 am cdc8b326: Merge change I61741f5a into eclair
Merge commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221' into eclair-mr2

* commit 'cdc8b326dd0989003e2fdd7d5a605b5755acf221':
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 11:29:26 -07:00
Cary Clark
c05af372b8 add dpad control of text selection for sholes
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
2009-10-20 14:27:36 -04:00
Grace Kloba
a91cb7284e am 1bee6131: am 12a19551: Merge change I58def690 into eclair-mr2
Merge commit '1bee61319615f2564a5cf0a4275d82fea35cb39d'

* commit '1bee61319615f2564a5cf0a4275d82fea35cb39d':
  If openOrCreateDatabase() throws an exception, delete
2009-10-20 10:23:57 -07:00
Grace Kloba
1bee613196 am 12a19551: Merge change I58def690 into eclair-mr2
Merge commit '12a19551dd106b04898d262807213ce4c6d1e5f7' into eclair-mr2-plus-aosp

* commit '12a19551dd106b04898d262807213ce4c6d1e5f7':
  If openOrCreateDatabase() throws an exception, delete
2009-10-20 10:13:59 -07:00
Android (Google) Code Review
cdc8b326dd Merge change I61741f5a into eclair
* changes:
  Fix high density bug 2179543: use 'dip' instead of 'px'
2009-10-20 13:10:42 -04:00
Android (Google) Code Review
12a19551dd Merge change I58def690 into eclair-mr2
* 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.
2009-10-20 13:03:02 -04:00
Mike Lockwood
623b6ade72 am b0219b5a: am aa033b79: am d7786b41: Power Manager support for light sensor backlight management.
Merge commit 'b0219b5aadd9271daa316c47202a849e02adeb7f'

* commit 'b0219b5aadd9271daa316c47202a849e02adeb7f':
  Power Manager support for light sensor backlight management.
2009-10-20 09:46:40 -07:00
Mike Lockwood
b0219b5aad am aa033b79: am d7786b41: Power Manager support for light sensor backlight management.
Merge commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533' into eclair-mr2-plus-aosp

* commit 'aa033b79714f458b47d7c3fbc45e9fe51194f533':
  Power Manager support for light sensor backlight management.
2009-10-20 09:35:10 -07:00
Mike Lockwood
aa033b7971 am d7786b41: Power Manager support for light sensor backlight management.
Merge commit 'd7786b41b78ba8592daea708b024b5a75e441992' into eclair-mr2

* commit 'd7786b41b78ba8592daea708b024b5a75e441992':
  Power Manager support for light sensor backlight management.
2009-10-20 09:22:20 -07:00
Marco Nelissen
b0905dc788 Fix high density bug 2179543: use 'dip' instead of 'px' 2009-10-20 07:54:00 -07:00
Eric Laurent
41e1371484 am 2ff77e27: am 52f545c7: Merge change Ibe55f880 into eclair-mr2
Merge commit '2ff77e2706a417dd75de07285ff948146d2f99cf'

* commit '2ff77e2706a417dd75de07285ff948146d2f99cf':
  Bluetooth A2DP suspend-resume improvements.
2009-10-20 00:48:09 -07:00
Eric Laurent
2ff77e2706 am 52f545c7: Merge change Ibe55f880 into eclair-mr2
Merge commit '52f545c7fd427610cf06d8215fde434cbbf55d81' into eclair-mr2-plus-aosp

* commit '52f545c7fd427610cf06d8215fde434cbbf55d81':
  Bluetooth A2DP suspend-resume improvements.
2009-10-20 00:40:20 -07:00
Android (Google) Code Review
52f545c7fd Merge change Ibe55f880 into eclair-mr2
* changes:
  Bluetooth A2DP suspend-resume improvements.
2009-10-20 03:32:44 -04:00
Mike Lockwood
d7786b41b7 Power Manager support for light sensor backlight management.
Change-Id: I470e2d7d12abf0dbfd31d84859b06bfae3cb36a1
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-19 22:30:34 -04:00
Amith Yamasani
155000d1f1 am c0df229d: am b0f4d0cd: am f37447ba: Proper fix for zero signal strength and no_service. Fixes #2176141
Merge commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74'

* commit 'c0df229d203aa8d4f06c7847c0d53d8ad9026b74':
  Proper fix for zero signal strength and no_service. Fixes #2176141
2009-10-19 15:55:39 -07:00
Amith Yamasani
c0df229d20 am b0f4d0cd: am f37447ba: Proper fix for zero signal strength and no_service. Fixes #2176141
Merge commit 'b0f4d0cd249773927c891ab52505505b6b19347b' into eclair-mr2-plus-aosp

* commit 'b0f4d0cd249773927c891ab52505505b6b19347b':
  Proper fix for zero signal strength and no_service. Fixes #2176141
2009-10-19 15:44:08 -07:00
Amith Yamasani
b0f4d0cd24 am f37447ba: 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
2009-10-19 15:30:01 -07:00
Amith Yamasani
f37447bad3 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.
2009-10-19 15:16:26 -07:00
Mark Wagner
6fdd2c5958 am da4204ca: am dad4780b: Merge change I3834b1cb into eclair-mr2
Merge commit 'da4204caa487bc613e51684db457ef4be6a914fc'

* commit 'da4204caa487bc613e51684db457ef4be6a914fc':
  support for multiline paragraph style indentation
2009-10-19 14:15:09 -07:00
Ken Shirriff
bc994a33b6 am 5b231096: am f9feb96e: Merge change I4458a55d into eclair-mr2
Merge commit '5b231096f25dcca09e17e485684f1f55f8fc67a4'

* commit '5b231096f25dcca09e17e485684f1f55f8fc67a4':
  Add access to ContentProvider for SyncState.
2009-10-19 14:14:58 -07:00
Mark Wagner
da4204caa4 am dad4780b: Merge change I3834b1cb into eclair-mr2
Merge commit 'dad4780bbd6be0891ea8745bd274fc8d6882f071' into eclair-mr2-plus-aosp

* commit 'dad4780bbd6be0891ea8745bd274fc8d6882f071':
  support for multiline paragraph style indentation
2009-10-19 14:04:00 -07:00
Leon Scroggins
ae2fa3f402 am 88f594d1: am 788a7ee1: Merge change Ia245b1c4 into eclair-mr2
Merge commit '88f594d1594ab6ada7334e318afb075b0e810f51'

* commit '88f594d1594ab6ada7334e318afb075b0e810f51':
  Add a string for upload file button.
2009-10-19 13:58:42 -07:00
Ken Shirriff
5b231096f2 am f9feb96e: Merge change I4458a55d into eclair-mr2
Merge commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8' into eclair-mr2-plus-aosp

* commit 'f9feb96e4ff4e390112410f0b4a514a0fca951d8':
  Add access to ContentProvider for SyncState.
2009-10-19 13:58:07 -07:00
Android (Google) Code Review
dad4780bbd Merge change I3834b1cb into eclair-mr2
* changes:
  support for multiline paragraph style indentation
2009-10-19 16:57:33 -04:00
Android (Google) Code Review
f9feb96e4f Merge change I4458a55d into eclair-mr2
* changes:
  Add access to ContentProvider for SyncState.
2009-10-19 16:52:14 -04:00
Leon Scroggins
88f594d159 am 788a7ee1: Merge change Ia245b1c4 into eclair-mr2
Merge commit '788a7ee1e9277dcce016fd084c81614222f7374a' into eclair-mr2-plus-aosp

* commit '788a7ee1e9277dcce016fd084c81614222f7374a':
  Add a string for upload file button.
2009-10-19 13:46:56 -07:00
Android (Google) Code Review
788a7ee1e9 Merge change Ia245b1c4 into eclair-mr2
* changes:
  Add a string for upload file button.
2009-10-19 16:39:35 -04:00
Ken Shirriff
e341c7e7c8 Add access to ContentProvider for SyncState.
This is used (temporarily) by the new calendar sync implementation.
2009-10-19 13:13:19 -07:00
Patrick Scott
63a83cc601 am cab9cb19: am 169ef4cc: Check for null before returing a chunk from the pool.
Merge commit 'cab9cb1970c2ec41b5a497f8f5e983ae26940e41'

* commit 'cab9cb1970c2ec41b5a497f8f5e983ae26940e41':
  Check for null before returing a chunk from the pool.
2009-10-19 10:19:03 -07:00
Patrick Scott
cab9cb1970 am 169ef4cc: Check for null before returing a chunk from the pool.
Merge commit '169ef4cca30c77a1a85c9684560c504a5ac230b5' into eclair-mr2-plus-aosp

* commit '169ef4cca30c77a1a85c9684560c504a5ac230b5':
  Check for null before returing a chunk from the pool.
2009-10-19 10:13:57 -07:00
Patrick Scott
169ef4cca3 Check for null before returing a chunk from the pool.
Since references can be queued in another thread, the first entry in the pool
could have been queued after processPoolLocked. Check for null and create a new
chunk if the check fails.
2009-10-19 13:04:08 -04:00