4636 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
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
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
Ben Murdoch
47f5f6df04 am c17a6895: am 208360b2: Fix for b/2164520: Download manager should handle video/m4v MIME type.
Merge commit 'c17a6895bf226205023c99898f65643bdf3b9c10'

* commit 'c17a6895bf226205023c99898f65643bdf3b9c10':
  Fix for b/2164520: Download manager should handle video/m4v MIME type.
2009-10-19 09:53:13 -07:00
Ben Murdoch
c17a6895bf am 208360b2: Fix for b/2164520: Download manager should handle video/m4v MIME type.
Merge commit '208360b22db7bdd940a7005fd44135e8916742af' into eclair-mr2-plus-aosp

* commit '208360b22db7bdd940a7005fd44135e8916742af':
  Fix for b/2164520: Download manager should handle video/m4v MIME type.
2009-10-19 09:42:07 -07:00
Ben Murdoch
208360b22d Fix for b/2164520: Download manager should handle video/m4v MIME type.
The fix relaxes our processing of the content-disposition header by allowing unquoted filenames, and adds the m4v type to the MIME type map incase the content-disposition header was not specified.

Change-Id: Iaab0c5b17991a2c05eff5db01babe084444fd3b7
2009-10-19 17:22:59 +01:00
Marc Blank
9f54b190ab am 73b4234f: am eab82c3c: Merge change I44bbc36d into eclair-mr2
Merge commit '73b4234fadedce2866f3227e92a41c09d60ccf47'

* commit '73b4234fadedce2866f3227e92a41c09d60ccf47':
  Add htm and html extensions to the map as "text/html"
2009-10-17 09:41:24 -07:00
Marc Blank
73b4234fad am eab82c3c: Merge change I44bbc36d into eclair-mr2
Merge commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206' into eclair-mr2-plus-aosp

* commit 'eab82c3c8c9dd88ff7267c154b415558d8e5c206':
  Add htm and html extensions to the map as "text/html"
2009-10-17 09:29:17 -07:00
Android (Google) Code Review
eab82c3c8c Merge change I44bbc36d into eclair-mr2
* changes:
  Add htm and html extensions to the map as "text/html"
2009-10-17 12:20:42 -04:00
Mark Wagner
7b5676e4d4 support for multiline paragraph style indentation
This change is likely incomplete and perhaps not right in other ways.
The gist of the change is that the span can return the number of lines
to which to apply the "leading margin".
Some specific things that should be looked at:

1) if the user has nested multiple
LeadingMarginSpans then they will inherit the "line count" feature.
This is wrong but I didn't want to spend time fixing it until it
was clear that this overall approach was acceptible.

2) The units for how many lines should indented is "lines" rather than
something like dips.

3) I wasn't sure what our strategy was for binary compatibility so
I didn't want to modify the methods in LeadingMarginSpan.  Instead I
made another interface with extends LeadingMarginSpan that has the
extra method to return the line count.
2009-10-16 15:26:31 -07:00
Eric Laurent
374d5bc0b3 Bluetooth A2DP suspend-resume improvements.
This change will reduce the occurence rate of A2DP sink suspend resume failures observed in issues 2184627, 2181005 and possibly 2189628.

More robust suspend/resume logic.
Use only the suspend request to audio hardware to avoid having two concurent suspend resume control paths.
2009-10-16 15:10:09 -07:00
Marc Blank
3905e87e90 Add htm and html extensions to the map as "text/html"
* Fixes #2192935
* Exchange attachment handling depends on MimeTypeMap to determine the
  mime type of attachments based on their file extension

Change-Id: I44bbc36d7a5aa0800f072553274346d4547f8d4c
2009-10-16 10:22:08 -07:00
Mike Lockwood
77b722b60f am 5e6aa492: am 2086152c: am f55aa972: Merge change I01935be3 into eclair
Merge commit '5e6aa492b78f38d0dabaaa1559e2a3afe5259d74'

* commit '5e6aa492b78f38d0dabaaa1559e2a3afe5259d74':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:59:13 -07:00
Mike Lockwood
5e6aa492b7 am 2086152c: am f55aa972: Merge change I01935be3 into eclair
Merge commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b' into eclair-mr2-plus-aosp

* commit '2086152c1b60ad3bfe85c1ddc3871cff77e6da1b':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:48:30 -07:00
Mike Lockwood
2086152c1b am f55aa972: Merge change I01935be3 into eclair
Merge commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542' into eclair-mr2

* commit 'f55aa972f9911c6aafc9fbdb736bdec11e004542':
  Remove PowerManager.setAutoBrightness()
2009-10-16 09:38:03 -07:00
Android (Google) Code Review
f55aa972f9 Merge change I01935be3 into eclair
* changes:
  Remove PowerManager.setAutoBrightness()
2009-10-16 12:29:15 -04:00
Mike Lockwood
dc3494e3d8 Remove PowerManager.setAutoBrightness()
We will use the System.SCREEN_BRIGHTNESS_MODE Settings value instead.
Add SCREEN_BRIGHTNESS_MODE_MANUAL and SCREEN_BRIGHTNESS_MODE_AUTOMATIC constants.

Change-Id: I01935be3fcb48cf76392d2c594205cb47babc5b2
Signed-off-by: Mike Lockwood <lockwood@android.com>
2009-10-16 07:42:26 -07:00
Cary Clark
39e6773431 do not merge: fix copy/paste using trackball on passion
This fix is alrady in mr2. It 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
2009-10-16 09:27:47 -04:00
Patrick Scott
8a7df536ae am 93968f43: am e1f43dad: Share chunks between all ByteArrayBuilders.
Merge commit '93968f43aff775395f71b7e03316dad6c4bea473'

* commit '93968f43aff775395f71b7e03316dad6c4bea473':
  Share chunks between all ByteArrayBuilders.
2009-10-16 05:37:01 -07:00
Patrick Scott
93968f43af am e1f43dad: Share chunks between all ByteArrayBuilders.
Merge commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12' into eclair-mr2-plus-aosp

* commit 'e1f43dadb9a1f0744f7e24373ca796c7a8ca2b12':
  Share chunks between all ByteArrayBuilders.
2009-10-16 05:31:59 -07:00
Patrick Scott
e1f43dadb9 Share chunks between all ByteArrayBuilders.
If a single ByteArrayBuilder accumulates many chunks, it is possible that many
of those chunks will not be reused and will just take up memory in the pool. If
the pool is shared across all instances, fewer chunks need to be allocated. This
allows a site like http://www.606studios.com/bendisboard/showthread.php?t=170286
to load without crashing due to OOM.

The shared pool contains SoftReferences to each chunk. If the vm feels memory
pressure, it is allowed to mark these references for collection. Before
accessing the pool of chunks, I remove any queued references from the pool.

Cleanup ByteArrayBuilder a little by removing unused methods and fields.
Document some synchronization spots in LoadListener and add a lock when
downloading a certificate.

Bug: 1637965
2009-10-16 08:07:29 -04:00
Romain Guy
68608741d4 am 49f8a0ee: am 7d4134a1: am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95'

* commit '49f8a0ee916c70dd5322d5f18951d50725ed3f95':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 19:23:49 -07:00
Romain Guy
49f8a0ee91 am 7d4134a1: am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '7d4134a1a67872c056d05330b1453395a7c8c4d1' into eclair-mr2-plus-aosp

* commit '7d4134a1a67872c056d05330b1453395a7c8c4d1':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 19:13:51 -07:00
Romain Guy
7d4134a1a6 am 173a25f6: Merge change I0d74deb6 into eclair
Merge commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725' into eclair-mr2

* commit '173a25f670e0e9cba2eb78d7c93bc1c0fc70b725':
  Fix possible NPE in the code that restores widgets' state.
2009-10-15 15:42:05 -07:00