Commit Graph

1171 Commits

Author SHA1 Message Date
Nicolas Roard
fb7bc34b23 Update layers only
Java counterpart to https://android-git.corp.google.com/g/#change,77334

Bug:2975990

Change-Id: I428944c30cedddc47a2c4f8c772167dd4ce2a78d
2010-11-01 16:55:41 -07:00
Leon Scroggins
c826a69355 Merge commit '55381217' into manualmerge
Conflicts:
	core/java/android/webkit/WebView.java

Change-Id: I1e93881a55c1d81c1142db03498c68196649b69c
2010-11-01 18:00:55 -04:00
Leon Scroggins
553812178a am 3073646f: Merge "Update insertion handler for WebTextView." into gingerbread
* commit '3073646f61dcbbfe5c9e65b8e3a1d9266c3f7276':
  Update insertion handler for WebTextView.
2010-11-01 14:51:00 -07:00
Leon Scroggins
5642625cfb Update insertion handler for WebTextView.
Bug:3152629
Change-Id: If2a33eb5456493fb9b3b2c54fcc4f5348fe129e1
2010-11-01 15:45:37 -04:00
Shimeng (Simon) Wang
170d2ee726 Merge "Stabilize reflow, aka, the fit-to-screen option in settings." 2010-10-29 13:58:18 -07:00
Shimeng (Simon) Wang
c55886aee8 Stabilize reflow, aka, the fit-to-screen option in settings.
This change is only for tablet device which has large screen and
good for fixed viewport.

The reflow will only happen in first layout and double tap if the
text wrap scale is not desired.

The initial text wrap scale is set to the reading level, so that if
the web page is in overview mode, after a double tap, the text will
be nicely shown full screen without any reflow.

All the previous reflowing, such as done when zoomed out, are disabled for
tablet device.

issue: 3003933
Change-Id: I8f460704bb27c50d6f5fa259ca2d5007648adfba
2010-10-29 13:53:33 -07:00
Steve Block
19d928e5a5 Merge "Hook up remaining CookieManager methods" 2010-10-29 08:51:09 -07:00
Ben Murdoch
ffcc49eb42 Add a class that stores localised strings used by libchromium.
These are loaded by the first WebView to be instantiated and read
over JNI by libchromium in external/chromium/android/app/l10n_util.cc

Change-Id: I43d6e5a061691689d28cba2697fedcd27548af08
2010-10-29 11:44:42 +01:00
Shimeng (Simon) Wang
767dbefbe0 Fixes "open pages in overview" option.
This option was disabled when doing fixed viewport.
This is fixed with the intention to show at least overview scale,
 which will be also fine with phone.

issue:3131279
Change-Id: I2e65d40a90a04f2ca72882fec8096dd8a0d81cb0
2010-10-28 10:43:36 -07:00
Steve Block
93e5e14240 Hook up remaining CookieManager methods
hasCookies(), removeExpiredCookie(), removeSessionCookie() and setCookie()

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

Bug: 3116410
Change-Id: I46603be60e2a6b0e8bac9ca506b56d78643a3658
2010-10-28 15:37:33 +01:00
Derek Sollenberger
7e6bf6ff0f Rename some variable to make it clear what data is being stored.
The object that carries drawing data between WebViewCore and WebView
uses ambiguous variable names that do not fully convey the meaning
of the values.  This change updates those names to make it clear to
the reader what the intention of those values is.

Change-Id: I5a403d44881e1fad366f3ec9930ee59134eccd88
2010-10-28 10:11:25 -04:00
Steve Block
f3bac948e4 Merge "Hook up CookieManager.getCookie() for Chromium HTTP stack" 2010-10-27 12:29:03 -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
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
Shimeng (Simon) Wang
346f97f82f Fix the viewport height to view height when title bar is visible.
issue: 3097787
Change-Id: Ie685a94262cecd94f32dbb94991fea76ceb43b94
2010-10-25 13:33:31 -07:00
Steve Block
16b7a1b967 Merge "Add a JNI method to determine which HTTP stack is in use" 2010-10-25 04:44:41 -07:00
Shimeng (Simon) Wang
8117e760ee Let double tap reflow text.
In case when the text wrap scale is out of sync of the zoom scale.

issue:3122512
Change-Id: I9619cc603226503b96e3a0766620bc2884ec1805
2010-10-22 14:16:28 -07:00
Shimeng (Simon) Wang
9c64bae134 Ignore viewport viewScale in fixed viewport mode.
This is to solve macworld.com, which has 900 as viewport but actual
content width is more 1000.

issue: 3003933
Change-Id: I2db3f66828fd00c8be62131599395eb82752b4a2
2010-10-22 10:57:44 -07:00
Shimeng (Simon) Wang
50b1034d35 Pass whether a scroll is user-scrolled or not to webkit.
This is to eliminate false scrollEvent to webkit.  And the side effect
is that the history scroll position will be correctly restored;
otherwise, webkit think there's user scrolled and not send back history
scroll position.

Particulary for NEW_PICTURE_MSG from webkit, the scroll event because of
it are not user-scrolled.

issue: 3063945
Change-Id: I9fdbfcb8baf07baf2331e2c4eed66f88aea744ef
2010-10-22 10:29:19 -07:00
Leon Scroggins
f8ca2d71d5 Do not call WebTextView.requestFocus if WebView is not focused.
Bug:3118097
Bug:3039912

Change-Id: I4c43f394c9dc3c9db58fb744d588dfb36f3221f4
2010-10-22 10:47:36 -04:00
Steve Block
2d80ede01a Add a JNI method to determine which HTTP stack is in use
This will be required when hooking up CookieManager to the Chromium
stack, as we need to decide in Java whether or not to call into native
code.

Bug: 3116410
Change-Id: Ibe2f7687655a93993b19f4fb9b4fed137b3b9466
2010-10-22 13:49:52 +01:00
Steve Block
3b860faec7 Merge "Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack" 2010-10-22 03:56:58 -07:00
Shimeng (Simon) Wang
8db525a9ad Let restored scale be in effect.
This change reverts some previous change to solve macworld.com scale issue.

issue: 3117312
Change-Id: Id822c7f9c196522a24c0b7657225560dcd0e51e4
2010-10-21 14:20:50 -07:00
Steve Block
1c9ca4f1fa Hook up CookieManager.removeAllCookie() for the Chromium HTTP stack
Requires a change to external/webkit ...
https://android-git.corp.google.com/g/75473

Bug: 3086308
Change-Id: I01274b3b1384a6947d5a56a51b0b93b1898ddebc
2010-10-21 17:53:20 +01:00
Ben Murdoch
be00398005 Merge "Set the unique id of the AutoFill profile WebKit can read it" 2010-10-20 11:35:47 -07:00
Ben Murdoch
b1b82a8df8 Set the unique id of the AutoFill profile WebKit can read it
After the recent Chromium merge to 7.0.540.0, it seems that we are no
longer allowed to use a profile unique id of 0. Set the unique id
in the AutoFillProfile class so that WebKit can access it.

Change-Id: I88cd1e91b8c6043c732a1709a89fda4a3c9f921f
2010-10-20 18:56:23 +01:00
Iain Merrick
d77f9b7b39 Implement file downloads for Chrome HTTP stack (Java side)
This just adds an extra entrypoint to BrowserFrame. It delegates
directly to the identical method in CallbackProxy, and from there
downloads are handled in the same way as before.

See matching C++ change in external/webkit (I81300400)

Change-Id: I87e71debe475d0d24e13a5763fbe803e3cd78cf5
2010-10-20 15:55:12 +01:00
Leon Scroggins
4f4a567217 Tell nativeFindAll whether the new search matches the last one.
Bug:3108852

Requires a change in external/webkit.

Change-Id: I4333532b4febfa9e832272cf903c3f96ebff0203
2010-10-19 15:56:56 -04:00
Brad Fitzpatrick
6799864d6c am 59993d9b: Merge "Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX" into gingerbread
Merge commit '59993d9bc589089e6be55371c6536a42afe21a64' into gingerbread-plus-aosp

* commit '59993d9bc589089e6be55371c6536a42afe21a64':
  Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
2010-10-19 12:44:19 -07:00
Brad Fitzpatrick
44d2c69ad3 Avoid NPE in WebTextView.lineUpScroll -> Touch.getMaxScrollX
Bug: 3110967
Change-Id: I156070956528c8c7d1eb6db5d2e8bb1fe119178d
2010-10-19 12:19:41 -07:00
Shimeng (Simon) Wang
b0f67c9d06 am b65058a4: am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
Merge commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5'

* commit 'b65058a45544ba4b9ff5dbad3cc306d86e9554e5':
  Don't force ended when full screen video is returned manually.
2010-10-19 10:44:46 -07:00
Shimeng (Simon) Wang
b65058a455 am 6b2274a1: Merge "Don\'t force ended when full screen video is returned manually." into gingerbread
Merge commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6' into gingerbread-plus-aosp

* commit '6b2274a11bb1c8f35e8e60e7b921cdecdaaa2ec6':
  Don't force ended when full screen video is returned manually.
2010-10-18 17:04:47 -07:00
Shimeng (Simon) Wang
6b2274a11b Merge "Don't force ended when full screen video is returned manually." into gingerbread 2010-10-18 16:40:25 -07:00
Shimeng (Simon) Wang
43aaa2dd3f Don't force ended when full screen video is returned manually.
issue: 3102273
Change-Id: Id9983a229e103dd255b280638979712873117d10
2010-10-18 16:25:59 -07:00
Adam Powell
6018745fb7 am 9f85ef4a: Merge "DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView" into gingerbread
Merge commit '9f85ef4aebf510546355866b7cc458551ae3aa7f' into gingerbread-plus-aosp

* commit '9f85ef4aebf510546355866b7cc458551ae3aa7f':
  DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
2010-10-18 14:23:14 -07:00
Adam Powell
48b99ace19 DO NOT MERGE Fix bug 3107560 - Edge glow appears delayed in WebView
Change-Id: I7f31270c713cdfa3b49f7e9f8d8457c77067516a
2010-10-18 14:00:02 -07:00
Steve Block
1f696ffcdd Merge "Rename DeviceOrientationManager to DeviceMotionAndOrientationManager" 2010-10-18 10:40:47 -07:00
Ben Murdoch
06ff27f0cb am 83366dfb: Merge "Add the HTML5Audio class, to support the audio tag." into gingerbread
Merge commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3' into gingerbread-plus-aosp

* commit '83366dfb96ad15e945a90270d329ce19dcf6b7e3':
  Add the HTML5Audio class, to support the audio tag.
2010-10-18 10:26:43 -07:00
Leon Scroggins
e8aa954e46 resolved conflicts for merge of 46ca6a22 to master
Change-Id: I8302fa2f5acf91fb3793e5978a5dc63ac8f3a457
2010-10-18 10:09:07 -04:00
Nicolas Roard
3d09e139b3 Add the HTML5Audio class, to support the audio tag.
DO NOT MERGE. Cherry pick to GingerBread.

Bug: 3101402
Change-Id: Id7c9418c102d871933c7534fbde18a4bde5f353b
2010-10-18 12:56:02 +01:00
Shimeng (Simon) Wang
53820a9694 am 7ef6834e: Merge "DO NOT MERGE" into gingerbread
Merge commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7' into gingerbread-plus-aosp

* commit '7ef6834eea24e56d6eba3aac7069e9e0981451d7':
  DO NOT MERGE
2010-10-15 18:25:25 -07:00
Shimeng (Simon) Wang
d687504e73 am 31e4d66a: Merge "DO NOT MERGE" into gingerbread
Merge commit '31e4d66ada01ea0714304309967a38d07bfce6c6' into gingerbread-plus-aosp

* commit '31e4d66ada01ea0714304309967a38d07bfce6c6':
  DO NOT MERGE
2010-10-15 18:24:06 -07:00
Leon Scroggins
46ca6a2289 am 36cb18cf: Merge "Line up textfield with WebTextView more often." into gingerbread
Merge commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4' into gingerbread-plus-aosp

* commit '36cb18cf0684cadb3736969ff96f37d5eb9bb1a4':
  Line up textfield with WebTextView more often.
2010-10-15 18:23:58 -07:00
Shimeng (Simon) Wang
bf9cf4d80d DO NOT MERGE
Add wrapper method for native JNI call.

This is to check whether a given mimeType is supported in Android media
framework.

issue: 3101402
Change-Id: Ic8b412c045c36113c830296dacb42ed5f7371c9d
2010-10-15 14:18:01 -07:00