Commit Graph

1811 Commits

Author SHA1 Message Date
Shimeng (Simon) Wang
82a077043f Consider default zoom scale for mobile viewport.
issue: 4482888
Change-Id: I6a100700b7a7e9464b397f219217225f3ada0f63
2011-06-09 16:02:34 -07:00
Shimeng (Simon) Wang
b924ab5bda Merge "Fix height measure state." 2011-06-09 15:56:19 -07:00
Shimeng (Simon) Wang
e7c2ee75e9 Fix height measure state.
issue: 4257815
Change-Id: I6fc164767f805cfd13cf31707f3d53aa2714f9fc
2011-06-09 15:11:25 -07:00
Shimeng (Simon) Wang
d169d3cb65 Merge "Better handle double tap for smooth reflow and zoom." 2011-06-09 14:10:54 -07:00
Shimeng (Simon) Wang
136c20b88e Better handle double tap for smooth reflow and zoom.
In case it's the first time to reflow or the page is in zoom overview
mode, let the reflow and zoom happen at the same time to avoid the
need of double tapping twice.

Also fix the viewport width to webview's original width for mobile
site.

issue: 4482888
Change-Id: Ic7c73a9eb3f75fd68322f7f4da14141126e75ad8
2011-06-09 13:51:55 -07:00
Brian Carlstrom
d496da46a8 Merge "Implement android.webkit.BrowserFrame.requestClientCert" 2011-06-09 12:36:54 -07:00
John Reck
6d70fcf830 Merge "Don't cut velocity" 2011-06-09 11:07:54 -07:00
John Reck
7c272964c2 Don't cut velocity
Bug: 4545016

Change-Id: I0ebad82c1cc54c2e4e29f3827c3755edda9f47a5
2011-06-09 10:31:19 -07:00
Steve Block
430ad47334 Merge "Fixes WebView.loadData() to avoid constructing invalid URLs." 2011-06-09 10:16:29 -07:00
Romain Guy
0fbf20703f am 34e9f249: am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit '34e9f249a9b36ebe64476b997bca0edf990fbc0d':
  Disable plugins if setPluginsEnabled(false) called.
2011-06-09 09:03:55 -07:00
Brian Carlstrom
a14775949c Implement android.webkit.BrowserFrame.requestClientCert
Following the example of reportSslCertError, implement requestClientCert

ERROR CASE                                              CLIENT CERT CASE
<... From external/webkit ...>                          <... From external/webkit ...>
android.webkit.BrowserFrame.reportSslCertError          android.webkit.BrowserFrame.requestClientCert
CallbackProxy.onReceivedSslError                        CallbackProxy.onReceivedClientCertRequest
WebViewClient.onReceivedSslError                        WebViewClient.onReceivedClientCertRequest
<... See packages/apps/Browser ...>                     <... See packages/apps/Browser ...>
SslErrorHandler.proceed (with SslCertLookupTable)       ClientCertRequestHandler.proceed (with SslClientCertLookupTable)
android.webkit.BrowserFrame.nativeSslCertErrorProceed   android.webkit.BrowserFrame.nativeSslClientCert
<... To external/webkit ...>                            <... To external/webkit ...>

Change-Id: I2ba6007ad9b2ee520a0a6b17f3a767679b1664de
2011-06-09 05:01:56 -07:00
Steve Block
f95d490b78 Fixes WebView.loadData() to avoid constructing invalid URLs.
Also updates the documentation to make clear how the encoding parameter should be used.

Bug:4541798
Change-Id: I9283513fbd8bcc3dc54056cfa2d0ab2425681824
2011-06-09 12:03:36 +01:00
Steve Block
21ac7a84fc Merge "Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()" 2011-06-09 03:48:41 -07:00
Steve Block
ae32857ebd Fix some poorly worded API documentation for WebView.loadDataWithBaseURL()
See https://mondrian.corp.google.com/changelist/110819-p9

Change-Id: I35fc65752687322ddfec39f5e2d7e5e5b89951e7
2011-06-09 11:27:48 +01:00
John Reck
60c84d67c5 Fix initial zoom with loadViewState
Change-Id: I06ee6a44c6e102ed84b44c68a83ab7db29d9f160
2011-06-08 18:00:02 -07:00
Jeff Brown
48076da85c am c3709f25: am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit 'c3709f2509bfc15d13a590b8342503f858ee67e2':
  Improve browser scrolling when using the mouse wheel.
2011-06-07 17:18:48 -07:00
Romain Guy
34e9f249a9 am fbef58fa: am 258f32e2: Merge "Disable plugins if setPluginsEnabled(false) called."
* commit 'fbef58faad5a31faf36294e4d160cbd148ed5458':
  Disable plugins if setPluginsEnabled(false) called.
2011-06-07 15:09:02 -07:00
Jeff Brown
c3709f2509 am 277bfd7c: am c1830a77: Merge "Improve browser scrolling when using the mouse wheel." into honeycomb-mr2
* commit '277bfd7cdd889e4f59e57925b90d1899f7312c4e':
  Improve browser scrolling when using the mouse wheel.
2011-06-06 20:32:02 -07:00
Jeff Brown
7f5b99676f Improve browser scrolling when using the mouse wheel.
The way that smooth scrolling is implemented in the Browser,
repeated requests to scroll by a certain amount do not add up
to one large scroll by the cumulative amount.  This makes
the mouse wheel unusable on large pages because the Browser
will scroll at a more or less constant rate no matter how often
the wheel is turned.

The fix is to not animate scrolls when using the mouse wheel.

Change-Id: I23c05cdd2383944b8730deb225b7f3f57f1729df
2011-06-06 18:59:41 -07:00
John Reck
83e5929d4c Delay set picture if necessary
Normally this wouldn't happen as a new picture should come after
 webcore has initialized. However, now that a view state can be loaded,
 setting a new picture needs to be delayed until after everything has
 initialized.

Change-Id: I823bc17eb939eab0436d7a398ebcbe849c0fb945
2011-06-04 19:50:29 -07:00
John Reck
95b7d6f9c2 Prevent WebKit updates in loadViewState case
Change-Id: I466f10c308b43f8683e537620e1c3e922a2cd465
2011-06-03 15:36:25 -07:00
John Reck
5e02e09565 Merge "Initial support for view state serialization" 2011-06-03 15:21:16 -07:00
John Reck
816c0defc7 Initial support for view state serialization
Framework for serializing the view state
 Still needs to prevent sending messages to webkit (pinch
 zoom doesn't work correctly as a result)

Change-Id: Ic3f8fe19b27ff1f841b556e87f582dab2a6d903b
2011-06-03 11:47:56 -07:00
Derek Sollenberger
df0d966d67 Merge "Add API to allow plugins to lock their orientation in full-screen mode." 2011-06-03 05:50:16 -07:00
Shimeng (Simon) Wang
ebf762777a Make sure scale will not go beyond overview scale after rotation.
Change-Id: If8f7fe131814102e6abf5c8d59888d17a7200003
2011-06-02 14:11:57 -07:00
Tero Saarni
29086e46be Disable plugins if setPluginsEnabled(false) called.
Old deprecated method for enabling/disabling plugins was
ignoring flag parameter and causing plugins always to be loaded.
Fixes issue 17242.

Change-Id: I1da10a3ee7f3041e59b43641169c3935a05aa347
Signed-off-by: Tero Saarni <tero.saarni@gmail.com>
2011-06-02 23:06:58 +03:00
Derek Sollenberger
7ab3d673ba Add API to allow plugins to lock their orientation in full-screen mode.
This CL has companion changes in the browser and webkit.

bug: 3398386
Change-Id: I09eee11e3a22ba3ce0af67e2a068dc7331dc49c2
2011-06-02 10:47:32 -04:00
Teng-Hui Zhu
b145112eff Merge "Correctly detect when switching back from full screen" 2011-06-01 15:53:18 -07:00
Teng-Hui Zhu
1a88acbed9 Correctly detect when switching back from full screen
In full screen mode, the play message can be trigger, that means we can't
assume that the play message only comes from inline mode.

bug:4498120

Change-Id: Ibf85bb74778df207a6ce786dc63b0845356a281c
2011-06-01 14:34:59 -07:00
Shimeng (Simon) Wang
19e6a16f68 Merge "Fix overview scale setting for mobile sites." 2011-06-01 14:28:54 -07:00
Shimeng (Simon) Wang
73bb5734f0 Fix overview scale setting for mobile sites.
This fix will only set the overview scale in case the screen
is rotated from landscape to protrait, since in this case
the overview scale will be smaller and need explicit setting.
For the other way around, there's no need to set and it has wrong
effect for mobile sites.

issue: 4343683
Change-Id: I92cbf848bc2ed4184bd0c6b67992ff5cbc633c9f
2011-06-01 13:57:43 -07:00
Teng-Hui Zhu
3fafd39d07 The screen shot support for inline video on Java side
Basically, the GL texture bound with Surface Texture is not a singleton any
more. And the Surface Texture will be recreated every time a new video starts.
This can help to recycle the decoder's memory while using the GL texture to
show the screen shot.

The corresponding webkit change is: 112500

Change-Id: I3c35f6a0abc70b9039c316ca82b236c797d81c7e
2011-06-01 13:42:46 -07:00
Kristian Monsen
2032eee0c1 Fix for bug 4144936: [Proxy setting]: traffic to a bypass domain doesn't bypass proxy
This is the WebView part, passing the bypass list to
the native side.

Moved some code to JWebCoreJavaBridge.java because
because sendStaticMessage only takes one argument.

Needs CL in external/webkit:
https://android-git.corp.google.com/g/#change,112401

Needs following CL in external/chromium:
https://android-git.corp.google.com/g/#change,111832

Change-Id: Ib548bdcbc9eb22bbb8f2754808840052bd3ec80e
2011-05-31 14:54:51 +01:00
Tadashi G. Takaoka
d555e5dccc Fix input type judgment of WebTextView
Bug: 4490948
Cherry-pick: I232b8f13
Change-Id: I09a7e829edd7ca8d54fa109dc14b4a3946de0f1b
2011-05-31 16:27:28 +09:00
Tadashi G. Takaoka
6d1b8995a6 am 69a48776: am 8ede6274: Fix input type judgment of WebTextView (DO NOT MERGE)
* commit '69a487763812d2c0fb3c9900b12862997bc77f4d':
  Fix input type judgment of WebTextView (DO NOT MERGE)
2011-05-31 00:23:25 -07:00
Tadashi G. Takaoka
8ede62745f Fix input type judgment of WebTextView (DO NOT MERGE)
Bug: 4490948
Change-Id: I232b8f1301128f1c77d72d92777a45c63f215a9c
2011-05-31 11:24:23 +09:00
Tadashi G. Takaoka
ccb2bc6c15 am e0a82fcc: am 241c000c: Merge "Fix InputType determination of WebTextView (DO NOT MERGE)" into honeycomb-mr2
* commit 'e0a82fcc6058e6297d11a040aae13e37a2439c14':
  Fix InputType determination of WebTextView (DO NOT MERGE)
2011-05-27 10:55:23 -07:00
Brian Carlstrom
4fdf396219 Merge "Tracking merge of dalvik-dev to master" 2011-05-27 10:12:34 -07:00
Tadashi G. Takaoka
f7145d5d66 Fix InputType determination of WebTextView (DO NOT MERGE)
The InpuType from <input type="email" /> has been broken.

Change-Id: Ie37de69682410cdd58c29910d483e924f5b614b6
Related-Bug: 4490948
Cherry-pick: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
2011-05-28 01:56:25 +09:00
Tadashi G. Takaoka
2c0a809315 Fix InputType determination of WebTextView
The InpuType from <input type="email" /> has been broken.

Related-Bug: 4490948
Change-Id: Ibd7f2977a177f1d97e3a29ac44220e5136bbd653
2011-05-27 22:00:07 +09:00
Brian Carlstrom
a7284f0e72 Tracking merge of dalvik-dev to master
Adapt to change in the way MockWebServer sets up CONNECT proxies.
  git cherry-pick --no-commit c7e2feee5e7908a019a0de91123c1feb9bdc38bc

React to move of Base64 in libcore
  git cherry-pick --no-commit 119f7ebdd1f8df3a8ff8e3b8056bff725d569253

Expose and document android.net.HttpResponseCache.
  git cherry-pick --no-commit 7b73f0fdb8c032a65c55610541d66385bd8bcbe6)

make update-api

Change-Id: Ieb48b304ea38ee8c2ec01e860d99b1404583889e
2011-05-27 01:21:50 -07:00
Shimeng (Simon) Wang
09cb64bcd1 Fix zoom overview width and postscale for non-wide-viewport mode.
issue: 4396010
Change-Id: I90aefac9fdf53834c0774d5c1b37693413798689
2011-05-26 15:09:12 -07:00
Kristian Monsen
1fae3cf246 Merge "Merge Chromium at 10.0.634.0: Add autofill fax string" 2011-05-25 12:09:46 -07:00
Russell Brenner
0d74112eed Merge "merge from honeycomb mr2" 2011-05-25 11:04:28 -07:00
Kristian Monsen
a014db7f0b Merge Chromium at 10.0.634.0: Add autofill fax string
Introduced here:
http://src.chromium.org/viewvc/chrome/trunk/src/chrome/browser/autofill/fax_field.cc?view=diff&pathrev=70875&r1=70709&r2=70710

Change-Id: I20130029e26f2d9ef6ea4828921b070c887ccb69
2011-05-25 18:54:31 +01:00
Russell Brenner
70ecf97804 merge from honeycomb mr2
Refire the redraw event if webkit wasn't ready

If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: I70fcf652cc854f995885c58b55d58ecf75734ab8
2011-05-25 10:23:26 -07:00
Russell Brenner
dd36e1bde1 am 8b98284b: am 64796477: Merge "DO NOT MERGE-Refire the redraw event if webkit wasn\'t ready" into honeycomb-mr2
* commit '8b98284b97b81a4cc85d9fc26e79160e9c38ff1c':
  DO NOT MERGE-Refire the redraw event if webkit wasn't ready
2011-05-25 09:14:50 -07:00
Russell Brenner
64796477f6 Merge "DO NOT MERGE-Refire the redraw event if webkit wasn't ready" into honeycomb-mr2 2011-05-25 09:00:26 -07:00
John Reck
2221e34ba5 am 00bcea1a: am dc8a53a7: am 2959916b: Merge "Update the Desktop UA to Chrome" into honeycomb-mr2
* commit '00bcea1ac3be490e2730d15a6406541341dd3853':
  Update the Desktop UA to Chrome
2011-05-24 19:54:11 -07:00
Russell Brenner
1d87cbf602 DO NOT MERGE-Refire the redraw event if webkit wasn't ready
If webkit wasn't in a drawing mood, post a WEBKIT_DRAW event to
assure that the update is not lost.

bug: 4474358
Change-Id: Ib0c4cedb10f58821f95c439824c30043a906f8b8
2011-05-24 17:17:40 -07:00