35135 Commits

Author SHA1 Message Date
Kristian Monsen
732734acd6 Fix for simulator build
The code looks correct, but causes an internal compiler error on
simulator builds on mine (an other) gLucid desktops.

Change-Id: Iaf0d8120778ec1c6fc739ef13e6eaaac53e3bcc8
2010-10-27 22:49:34 +01:00
Andy McFadden
091511b41b am e3e8642c: am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:28:17 -07:00
Andy McFadden
e3e8642ce4 am 001c7d12: Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:25:29 -07:00
Andy McFadden
001c7d1281 Merge "Set capabilities sooner." into gingerbread 2010-10-27 13:22:50 -07:00
Joe Onorato
c597ba8e9a getRingtone is causing an anr. Turn it off for now.
Change-Id: Ia002c9be1cd203e5e989f2a9e49c49b97778ec1b
2010-10-27 13:19:47 -07:00
Gil Dobjanschi
30ca240a98 Merge "Waveform member variables must be private" 2010-10-27 12:37:34 -07:00
Joe Onorato
19536efbe6 Merge "Make the low battery dialog work again." 2010-10-27 12:29:32 -07:00
Joe Onorato
82ced694ec Merge "Move the battery LED code over to the battery service from the notification service (!)" 2010-10-27 12:29:12 -07:00
Steve Block
f3bac948e4 Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack" 2010-10-27 12:29:03 -07:00
Gil Dobjanschi
6f3c808b4f Waveform member variables must be private
Change-Id: I8e61dbe5ad51b455377e39a0918ac82d138d8228
2010-10-27 12:26:54 -07:00
Eric Rowe
e19b389321 Merge "Modify bluetooth test cases GB for new HC APIs" 2010-10-27 12:07:44 -07:00
Xavier Ducrohet
4c9d691a01 am 57f7ccc4: am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread 2010-10-27 11:59:05 -07:00
Yu Shan Emily Lau
0af3cfc6f3 am 751cc424: am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:58:58 -07:00
Steve Block
0d4fd36709 Merge "Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack" 2010-10-27 11:47:45 -07:00
Jack Palevich
1396afb730 Preserve the render mode when recreating the render thread.
Change-Id: I67a12a9598d3ef099bef8727411891614b1bc3f7
2010-10-27 11:37:23 -07:00
Andy McFadden
1b4c7966b1 Set capabilities sooner.
Bug 3135433.

Change-Id: I4e34b60c0a01b85ce0d80eb96ff3510604a68c71
2010-10-27 11:26:05 -07:00
Joe Onorato
10523b4d0c Make the low battery dialog work again.
Change-Id: I97232a3645e6a817c9c5f5f90b88a7e925d36d13
2010-10-27 11:26:00 -07:00
Joe Onorato
de1b359e88 Move the battery LED code over to the battery service from the notification service (!)
Change-Id: I12d7994ae245a36b8b2c3272fcbe173881caebd0
2010-10-27 11:26:00 -07:00
Xavier Ducrohet
57f7ccc422 am 63e5d07e: Merge "Fix issue with project resources overriding framework resources." into gingerbread 2010-10-27 11:23:58 -07:00
Xavier Ducrohet
63e5d07ec9 Merge "Fix issue with project resources overriding framework resources." into gingerbread 2010-10-27 11:22:22 -07:00
Xavier Ducrohet
0424d69d48 Merge "Reimplement the native matrix method using the new delegate way." 2010-10-27 11:18:02 -07:00
Yu Shan Emily Lau
751cc4245f am 8b023a2e: Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:14:36 -07:00
Yu Shan Emily Lau
8b023a2ea2 Merge "Add the mediaplayer release in the test validation. This is to ensure the media player release properly." into gingerbread 2010-10-27 11:12:58 -07:00
Marco Nelissen
b89a29dd75 am cd08ada7: am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:11:19 -07:00
Marco Nelissen
cd08ada7f1 am 67c7a4ae: Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:08:14 -07:00
Marco Nelissen
67c7a4ae2e Merge "Fix off-by-two and other bugs in the visualization code. b/3137511" into gingerbread 2010-10-27 11:06:39 -07:00
Amith Yamasani
29ab7d8501 Merge "Fix sub-header height to follow drawable. Floating panels for Preference screens." 2010-10-27 11:04:43 -07:00
Amith Yamasani
27da0bf0a3 Fix sub-header height to follow drawable. Floating panels for Preference screens. 2010-10-27 11:03:22 -07:00
Andreas Huber
05e148360b Merge "Remove annoying warning during mpeg4 extraction." 2010-10-27 10:58:31 -07:00
Gil Dobjanschi
00c346becf Merge "Added waveform data support" 2010-10-27 10:50:28 -07:00
Nick Pelly
449fb2de1b am 222f489f: am 6d55e134: Make best effort attempt to recover NFC service when it dies. 2010-10-27 10:46:23 -07:00
Nick Pelly
222f489fc0 am 6d55e134: Make best effort attempt to recover NFC service when it dies. 2010-10-27 10:43:19 -07:00
Andreas Huber
936747d672 Merge "FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem." 2010-10-27 10:39:57 -07:00
Gil Dobjanschi
4545f73530 Added waveform data support
Change-Id: I28e922e0d6588ffe13da7e814dae61f17446b1e9
2010-10-27 10:35:29 -07:00
Andreas Huber
7459b018db FileSource may fail to open a file in which case subsequent code dereferences a NULL pointer. This fixes this recently introduced problem.
Change-Id: I60dd9532b694a1b488743b71f43e107c778d6683
2010-10-27 10:33:04 -07:00
Andreas Huber
c69b9d3370 Remove annoying warning during mpeg4 extraction.
Change-Id: Iffadeefb43bab6da1299b0a0582d6c6990156c32
related-to-bug: 3093774
2010-10-27 10:25:44 -07:00
Marco Nelissen
f514bdc964 Fix off-by-two and other bugs in the visualization code.
b/3137511

Change-Id: Ic431701e93c025bc417c9742e9af6bb2350c7dd6
2010-10-27 10:23:59 -07:00
Kristian Monsen
73b1089d9e Merge "Fix for simulator build break" 2010-10-27 10:07:58 -07:00
Xavier Ducrohet
4f291d33e1 Reimplement the native matrix method using the new delegate way.
Instead of renaming the old Matrix class into _Original_Matrix
and have layoutlib provide a full new implementation of Matrix,
we keep the old one by only modifying it to implement the native
methods which calls out to a new Matrix_Delegate class.

The goal is to not have to maintain the java portion in
sync between the framework and the layoutlib version.

Change-Id: I3e1aefffbae45e91b75331c0c6ff2260323deacd
2010-10-27 09:55:58 -07:00
Kristian Monsen
883a922fbe Fix for simulator build break
strrchr returns a const char* in c++ if you give in a const char*

Change-Id: I15ac2ae9e1d41d7737193146c526fcbddccae27c
2010-10-27 17:54:46 +01:00
Steve Block
dcd2d0dee9 Hook up CookieManager.getCookie() for Chromium HTTP stack
Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76603

Bug: 3116410
Change-Id: Id0cd5871fd13f952d4f2aa963576a4e610459a18
2010-10-27 17:13:48 +01:00
Leon Scroggins
81bd788ecf Make sure nativeMotionUp is called.
If someone sets mLogEvent to false to prevent logging,
nativeMotionUp will not be called, so touches to WebView
will no longer work.  Make sure this does not happen.

Change-Id: Ie79ccc68677cea2f686f7c7da734bf719910f583
2010-10-27 10:31:05 -04:00
Steve Block
b5ac9de4b5 Hook up CookieManager.acceptCookie() and setAcceptCookie() for the Chromium HTTP stack
Also requires a change to external/webkit ...
https://android-git.corp.google.com/g/76066

Bug: 3116410
Change-Id: If8562468708e7d68c5be53db3860647687ebf3bd
2010-10-27 14:06:54 +01:00
Steve Block
82d9816136 Update Chromium HTTP stack to get database and cache paths from CookieSyncManager
Currently these paths are obtained from the BrowserFrame via JNI.
However, the paths are not synced to the BrowserFrame until the
WebCore thread has started up. This means that if the
WebRequestContext is created on the IO thread, the paths may not be
available.

This change moves the paths from BrowserFrame to CookieSyncManager to
avoid the need to wait for the WebCore thread.

Note that the new methods may be called on either the UI or WebCore
threads, so are synchronised.

Requires a change to external/webkit ...
https://android-git.corp.google.com/g/76579

Change-Id: I8e910ee209c570e90181bd308a78d1987b4d120c
2010-10-27 14:06:53 +01:00
Iain Merrick
2bcd292da9 Strip off MIME types when loading content URLs.
Matching behaviour that has been in ContentLoader.java since
approximately day 0. Without this, we can't load Gmail attachments
with the Chrome HTTP stack because of permission errors -- we have
to load exactly the URL Gmail tells us.

See http://b/issue?id=3125650

Change-Id: I764036efd428299b2fcd611b62dc046a40d80a55
2010-10-27 12:33:09 +01:00
Iain Merrick
2723d06033 Merge "Only AV formats should be handled by MediaPlayer (Java side)" 2010-10-27 03:31:01 -07:00
Iain Merrick
4e7665d2b9 Only AV formats should be handled by MediaPlayer (Java side)
Must be submitted with corresponding C++ change (I50da7599).

When opening a text file in the browser, WebKit was attempting to
display it as a movie. This is because the media player now reports
that it can handle various document formats, including plain text.

See http://b/issue?id=3132917

This CL updates WebViewCore.supportsMimeType() to explicitly check
for audio and video formats only. This is called from WebKit via
JNI, and doesn't seem to be used elsewhere, so it should be a safe
change to make. Renamed to isSupportedMediaMimeType() for clarity.

Test: push a text file to /sdcard/foo.txt, and open it in the
browser (as file:///sdcard/foo.txt).

Change-Id: Id39b770b05ced7c976d8043649845f26115b24c9
2010-10-27 11:28:30 +01:00
Nick Pelly
6d55e1342f Make best effort attempt to recover NFC service when it dies.
Retrieve the service again from ServiceManager on RemoteException.

Change-Id: Ie227b52019e7deafeab712af1addd6d957f7a8ee
Signed-off-by: Nick Pelly <npelly@google.com>
2010-10-27 01:15:32 -07:00
satok
86417ea3f8 Remove InputMethodAndSubtypeEnabler and call intent of Settings.ACTION_INPUT_METHOD_AND_SUBTYPE_ENABLER
Change-Id: I467cfba9644ec266f6a98f7aec0886ad205fef4f
2010-10-27 15:27:22 +09:00
Gil Dobjanschi
c7415b7800 Merge "Removed the start and end transition types." 2010-10-26 18:57:57 -07:00