6099 Commits

Author SHA1 Message Date
Patrick Scott
139f6f31d1 am 70c4f6cf: am 021b7b44: Add a static method to obtain the mime type from extension.
Merge commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec'

* commit '70c4f6cfb4fd48d5153080d038ac0f5b6dbd98ec':
  Add a static method to obtain the mime type from extension.
2010-01-13 11:51:33 -08:00
Robert Greenwalt
1bc3c3775b Fix Javadoc errors so the sdk can build.
I unhid some API in a previous install, triggering javadoc processing on
their buggy comments.

Fixing build.
2010-01-13 11:47:50 -08:00
Patrick Scott
70c4f6cfb4 am 021b7b44: Add a static method to obtain the mime type from extension.
Merge commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc' into eclair-mr2-plus-aosp

* commit '021b7b443fa4bb24ec73d0c09cf019c14eba67bc':
  Add a static method to obtain the mime type from extension.
2010-01-13 11:37:33 -08:00
Patrick Scott
021b7b443f Add a static method to obtain the mime type from extension.
This method is used by WebKit to obtain the mime type from an extension.

Bug: 2368893
2010-01-13 14:12:43 -05:00
Robert Greenwalt
c849cdf5cf Unhide some CM constants to support unbundling.
The MOBILE_MMS, MOBILE_SUPL, MOBILE_DUN and MOBILE_HIPRI net types used
by location, messaging, and vending needed to be exposed.

Bug: 2363272
Change-ID: I6d2361d3642064db619b283b9217512563eb3439
2010-01-13 10:01:44 -08:00
Leon Scroggins
a77f93f76a am ace8addc: am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
Merge commit 'ace8addce47efc03be5038eef48d7fb066b14aae'

* commit 'ace8addce47efc03be5038eef48d7fb066b14aae':
  Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:15:38 -08:00
Leon Scroggins
ace8addce4 am 2edd6826: Create a new ImeOption that disables fullscreen in landscape, and use it.
Merge commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6' into eclair-mr2-plus-aosp

* commit '2edd68260f26cbd6eddd0df16404bb6bcb22b3b6':
  Create a new ImeOption that disables fullscreen in landscape, and use it.
2010-01-13 06:11:05 -08:00
Daisuke Miyakawa
4a4b6e0d46 Merge "Handle null correctly." 2010-01-12 15:47:00 -08:00
Daisuke Miyakawa
9030dd125a Handle null correctly.
Bug: 2353544
2010-01-13 08:31:27 +09:00
Adam Powell
908c48587d am 202a6734: am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '202a6734fd39289257955d404edf7a1165f6e480'

* commit '202a6734fd39289257955d404edf7a1165f6e480':
  Added TransformGestureDetector (still in progress)
2010-01-12 15:19:28 -08:00
Adam Powell
202a6734fd am 8acdb201: Added TransformGestureDetector (still in progress) Modified VelocityTracker to track multiple pointers Added TransformTest
Merge commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164' into eclair-plus-aosp

* commit '8acdb201bdad2cd03c07ebad9cda29f7971ed164':
  Added TransformGestureDetector (still in progress)
2010-01-12 15:15:43 -08:00
Adam Powell
8acdb201bd Added TransformGestureDetector (still in progress)
Modified VelocityTracker to track multiple pointers
Added TransformTest
2010-01-12 15:08:23 -08:00
Leon Scroggins
2edd68260f Create a new ImeOption that disables fullscreen in landscape, and use it.
EditorInfo:
Add a flag to tell the InputMethodService to never go into fullscreen
mode.

InputMethodService:
When the new flag is set, onEvaluateFullscreenMode always returns
false.

WebTextView:
Use the new flag, along with IME_FLAG_NO_EXTRACT_UI.  Fixes
http://b/issue?id=2358360
2010-01-12 17:29:25 -05:00
San Mehat
22dd86e055 MountService: Refactor to use NativeDaemonConnector and clean-up
Signed-off-by: San Mehat <san@google.com>
2010-01-12 14:12:16 -08:00
Ken Shirriff
bfd2df21ea Merge "Fix calendar sync_account / type constants to be consistent." 2010-01-12 13:47:07 -08:00
Jean-Baptiste Queru
1c993bfb62 Merge "resolved conflicts for merge of d26707da to master" 2010-01-12 11:55:12 -08:00
Jean-Baptiste Queru
fa101530bc resolved conflicts for merge of d26707da to master
Change-Id: I1a379194f70c4b14191333ca2d8e6dd9d8b0f9dd
2010-01-12 11:53:42 -08:00
Bjorn Bringert
32db57babe Merge "Add and expose SearchManager.getSearchableInfo()" 2010-01-12 11:21:27 -08:00
Makoto Onuki
8f028a94fc Moved DomainNameChecker to android common.
- Moved DomainNameChecker from android.net.http to android common, and renamed to DomainNameValidator.
- Added a simplified version of DNParser, which DomainNameValidator uses instead of X509Name in order to extract Subject Name from a certificate.
- Added unit tests for DomainNameChecker and DNParser.

There's a suspicious comment in DomainNameChecker saying something like "X509Certificate fails to parse a certificate when a subject alt name begins with '*'".  I think we should fix it if it's really the case -- otherwise certificates with the wildcard wouldn't work.  I'll see if it's true after submitting this patch.
2010-01-12 10:27:13 -08:00
Grace Kloba
ba5220fc0c am ce63c639: Merge "DO NOT MERGE." into eclair
Merge commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0' into eclair-plus-aosp

* commit 'ce63c639e90daafc3382020bb2d9e2b17350f1f0':
  DO NOT MERGE.
2010-01-12 10:02:48 -08:00
San Mehat
d26707da89 am c93c70c4: Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair
Merge commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0' into eclair-plus-aosp

* commit 'c93c70c4b849d31ff1b5e5cf2fb9462fd60e5da0':
  framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
2010-01-12 10:02:40 -08:00
Grace Kloba
ce63c639e9 Merge "DO NOT MERGE." into eclair 2010-01-12 10:00:03 -08:00
San Mehat
c93c70c4b8 Merge "framework: storage: Ensure that filesystems are unmounted before shutdown/reboot" into eclair 2010-01-12 09:59:35 -08:00
Grace Kloba
e67d5cee67 DO NOT MERGE.
Couple of tweak for multi-touch in WebView.

1. If we can't zoom, don't get in multitouch mode.
   This avoid the logo in google.com looks fuzzy.
2. Reset mAnchor after sending VIEW_SIZE_CHANGED.
3. Don't call zoom when finishing multitouch unless
   zoom is called before.
4. Change the width for nativeSetSize, which was modified
   in the last check-in. The new logic should make both
   msn.com and news.google.com looks correct.
5. Use the pressure instead of distance/time to filter
   out the jitter just before lifting the finger.

Fix http://b/issue?id=2360032
2010-01-12 09:58:43 -08:00
Andrei Popescu
93aea69649 Merge "Implement timeupdate events for video tag." 2010-01-12 08:17:27 -08:00
Andrei Popescu
048eb3bfa1 Implement timeupdate events for video tag.
Fix http://b/issue?id=2210105
2010-01-12 16:13:52 +00:00
San Mehat
7ebf017658 framework: storage: Ensure that filesystems are unmounted before shutdown/reboot
Signed-off-by: San Mehat <san@google.com>
2010-01-12 07:57:42 -08:00
Bjorn Bringert
0408675d87 Add and expose SearchManager.getSearchableInfo()
This method is needed by QuickSearchBox to get the searchability
meta-data for an activity.

Change-Id: I1b7a72d4dde1ff15410288cfdc33c043738be977
2010-01-12 15:50:04 +00:00
Cary Clark
bad0c54de9 rebuild the nav cache if the clicked on node is invalid
Rebuild the nav cache in the webkit thread after determining
that the clicked on node isn't valid. Remove old code that
passed a flag to avoid using the invalid node, since it
should always be valid now.

requires a companion fix in external/webkit

fixes http://b/2362334
2010-01-12 09:18:08 -05:00
Ken Shirriff
53becd92b5 Fix calendar sync_account / type constants to be consistent.
The EventsEntity names need to match the rest of the Calendar names.
2010-01-11 16:55:17 -08:00
Romain Guy
5c7a5d0857 Merge "Fix how RelativeLayout handles alignParentBottom/Right when dimension is wrap_content. Bug: #2194109." 2010-01-11 16:48:10 -08:00
Romain Guy
42460ac1bb Fix how RelativeLayout handles alignParentBottom/Right when dimension is wrap_content.
Bug: #2194109.
2010-01-11 16:47:30 -08:00
Grace Kloba
bb4ad6a8a3 Merge "As setNewZoomScale is called asynchronously, the WebView can be destroyed. If it is, skip scaling." 2010-01-11 16:35:32 -08:00
Tom O'Neill
244327e209 Improve ContactsContract documentation, esp. of Data inner class
Provide some missing javadoc, make some things a little more explicit, etc.

Change-Id: Ibcdeaa10c641436009a3494b18cecae6f816b75e
2010-01-11 15:49:59 -08:00
Grace Kloba
4c7ec8d6ab As setNewZoomScale is called asynchronously, the
WebView can be destroyed. If it is, skip scaling.

Fix http://b/issue?id=2366538
2010-01-11 15:36:37 -08:00
Dan Egnor
6ee699102f Merge "Simplify & update ANR logging; report ANR data into the dropbox. Eliminate the per-process 200ms timeout during ANR thread-dumping. Dump all the threads at once, then wait for the file to stabilize. Seems to work great and is much, much, much faster." 2010-01-11 15:09:51 -08:00
Dan Egnor
42471dd555 Simplify & update ANR logging; report ANR data into the dropbox.
Eliminate the per-process 200ms timeout during ANR thread-dumping.
Dump all the threads at once, then wait for the file to stabilize.
Seems to work great and is much, much, much faster.

Don't dump stack traces to traces.txt on app crashes (it isn't very
useful and mostly just clutters up the file).

Tweak the formatting of the dropbox dumpsys a bit, for readability,
and avoid running out of memory when dumping large log files.

Report build & kernel version with kernel log dropbox entries.
2010-01-11 14:51:22 -08:00
Jaikumar Ganesh
1f3856c446 am 495d820c: am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit '495d820c0124a811b9352b93ce4fe88c716f259d'

* commit '495d820c0124a811b9352b93ce4fe88c716f259d':
  Don't set priority in Bonding state.
2010-01-11 14:23:18 -08:00
Jaikumar Ganesh
495d820c01 am ccaebfc9: Don\'t set priority in Bonding state. This was causing A2DP get connected for Car Docks, when user didn\'t select it.
Merge commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e' into eclair-plus-aosp

* commit 'ccaebfc9428aa7c167caf469f7393e1fb375307e':
  Don't set priority in Bonding state.
2010-01-11 14:20:53 -08:00
Jaikumar Ganesh
ccaebfc942 Don't set priority in Bonding state.
This was causing A2DP get connected for Car Docks, when user didn't select it.

Bug: 2364328
Dr No: Eastham
2010-01-11 14:16:29 -08:00
Derek Sollenberger
c408d5c278 am 1fed31aa: am fef4874a: fixing build break by removing unused imports.
Merge commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8'

* commit '1fed31aa81f769db308f6d92b0530ad52fa79ca8':
  fixing build break by removing unused imports.
2010-01-11 14:14:28 -08:00
Paul Westbrook
44641d3db3 Bug 2321983
Move SYNC_DETAILS from framework/base to the gsf clientlib
2010-01-11 14:00:35 -08:00
Derek Sollenberger
1fed31aa81 am fef4874a: fixing build break by removing unused imports.
Merge commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009' into eclair-mr2-plus-aosp

* commit 'fef4874afddeeba8eaac6da49cc3203e9ce2d009':
  fixing build break by removing unused imports.
2010-01-11 13:31:43 -08:00
Derek Sollenberger
fef4874afd fixing build break by removing unused imports. 2010-01-11 16:26:07 -05:00
Derek Sollenberger
86cf1ad0e5 am d55aa751: am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f'

* commit 'd55aa75138cb3305e1aeb6fb4873851435462f2f':
  consolidating to only use one surface per plugin. give plugin access to java context.
2010-01-11 13:23:41 -08:00
Derek Sollenberger
d55aa75138 am 7c5bf466: consolidating to only use one surface per plugin. give plugin access to java context.
Merge commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db' into eclair-mr2-plus-aosp

* commit '7c5bf4666cb8f2f79a61f46f14dd2272b0ba41db':
  consolidating to only use one surface per plugin. give plugin access to java context.
2010-01-11 13:11:13 -08:00
Vasu Nori
380ae0a6d4 am 9c74295f: am a1759cea: Merge "add eventlog message whenever sqlite reports db corruption error" into eclair
Merge commit '9c74295fb16da0469304a7c04c471915e28d09bd'

* commit '9c74295fb16da0469304a7c04c471915e28d09bd':
  add eventlog message whenever sqlite reports db corruption error
2010-01-11 13:00:28 -08:00
Scott Main
333beab9d6 am c9a26f29: am aa3b5961: javadoc change: fix the selector sample XML in the class description (was broken due to improper ordering)
Merge commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d'

* commit 'c9a26f291b8a845fcb5e3034c259d13d3297a98d':
  javadoc change: fix the selector sample XML in the class
2010-01-11 13:00:14 -08:00
Derek Sollenberger
7c5bf4666c consolidating to only use one surface per plugin. give plugin access to java context.
There is a companion commit in external webkit.
2010-01-11 13:47:54 -05:00
Andrei Popescu
10d268e315 Merge "Allow a video to be correctly resumed programatically after being paused." 2010-01-11 10:47:23 -08:00