Commit Graph

1842 Commits

Author SHA1 Message Date
Brian Carlstrom
6e24576b6b Merge "KeyChain API for credential installation" 2011-06-29 18:49:39 -07:00
Brian Carlstrom
a00a2b33cc KeyChain API for credential installation
Bug: 3497064
Change-Id: I4ac4d8b5559496b1632d63c2129e2bafd240893f
2011-06-29 18:46:56 -07:00
Shimeng (Simon) Wang
3e622f5c3c Merge "Initial zoom overview flag only meaningful in page overview mode." 2011-06-29 18:04:56 -07:00
Teng-Hui Zhu
7a1e5769ee Merge "Media player should be paused while the surface is still alive" 2011-06-29 15:58:38 -07:00
Teng-Hui Zhu
ac3cea3b1e Media player should be paused while the surface is still alive
bug:4975014
Change-Id: Ic3ff5480c3ab18fb1037d270aa822bacdd7d6b20
2011-06-29 15:34:00 -07:00
Shimeng (Simon) Wang
50e04e2d45 Initial zoom overview flag only meaningful in page overview mode.
Change-Id: I206864678e61777276468718a78e3da8de4f06a7
2011-06-29 12:28:16 -07:00
Huahui Wu
5bb9b19c5a 2nd try: Gets the URL that has a cert error and carrys it in SslError.
Identical to https://android-git.corp.google.com/g/#change,117828
which was reverted since its collaborative CL broke the build.

Change-Id: I5fa7d3e9b6026639bf72530ff5b449e36f802914
2011-06-28 12:32:56 -07:00
Huahui Wu
899639dd44 Merge "Revert "Gets the URL that has a cert error and carrys it in SslError."" 2011-06-28 10:12:56 -07:00
Huahui Wu
2e029c67a8 Revert "Gets the URL that has a cert error and carrys it in SslError."
This reverts commit 3015516a46.
2011-06-28 10:10:07 -07:00
Huahui Wu
fa487ca830 Merge "Gets the URL that has a cert error and carrys it in SslError." 2011-06-28 09:38:47 -07:00
Huahui Wu
3015516a46 Gets the URL that has a cert error and carrys it in SslError.
b/2689122 SSL error shows the wrong page when triggered by an image/javascript in the page.
This change receives the URL which has a cert error from webkit and carrys it in SslError.
so the Browser app can show the URL in the dialog boxes. Related CLs are:
   webkit: https://android-git.corp.google.com/g/#change,117817
   browser: https://android-git.corp.google.com/g/#change,117835

Change-Id: I65c3f038a48b6386fa93cb25a9ef70dbfb982c18
2011-06-27 18:14:54 -07:00
John Reck
1c1e6df04a Don't resend WEBKIT_DRAW if paused
Bug: 4606210
 If a WEBKIT_DRAW message came in after the WebView was paused,
 it would fail to draw causing it to re-send the WEBKIT_DRAW message
 which would lead to an infinite loop until the WebView is resumed.
 Fix this by not re-sending the WEBKIT_DRAW message if webview is paused.

Change-Id: I3dd946e4e948cf3fd6af07ba6f7fdac2f967a631
2011-06-24 11:07:09 -07:00
Shimeng (Simon) Wang
b30381d783 Use local variable instead of webview method.
This removes the thread warning.

Change-Id: Id2eec46fda8413cfaed49d2a97de40491b7496a2
2011-06-22 17:44:27 -07:00
Brian Carlstrom
452ffe7d1e JniUtil depends on webcore native library and should not depend on others to load it
Bug: 4584468

Change-Id: Ib553cda843669d40cc52ff0bc84bea2c626c5045
2011-06-22 11:29:56 -07:00
Svetoslav Ganov
fbb1560d6e Touch exploration hover events don't map coordinates correctly on scrollable WebViews.
1. While mapping Android hover to WebKit mouse events I was not
   taking into account the horizontal and vertical scroll.

bug:4807087

Change-Id: Ie24a8a30ce6a20d27b627ae7c7fbff1b74d140c8
2011-06-21 17:51:40 -07:00
John Reck
caeb120170 Make textZoom public
Deprecate textSize (enum based) in favor of textZoom (percentage based)

Change-Id: Ibb4c25b461bcb57e5c2cdf709485d255db20a43c
2011-06-17 11:50:15 -07:00
John Reck
ff56bcde85 Add textZoom setting
Replaces the limited textSize (enum) with a more flexible
 textZoom (percent)

Change-Id: I443757841910f5cbe1c9078166361d1686005f14
2011-06-17 09:39:39 -07:00
John Reck
9b90d553bb Support for getting the background color
Change-Id: I58a52f79e5a50dbb2cd1ba81d13e95ed9a1b7095
2011-06-14 15:53:46 -07:00
Steve Block
3f71cfc149 Merge "Fix thread violation in WebView.getViewHeight()" 2011-06-13 17:17:11 -07:00
John Reck
7abf5a6215 Merge "Tweaks for webview snap" 2011-06-13 11:12:03 -07:00
John Reck
2664d85f58 Tweaks for webview snap
Changed weighted average
 Increase horizontal snap

Change-Id: I7ed50e13b0b0ba409a8e655d38c704f72a3f2f78
2011-06-13 10:38:55 -07:00
Teng-Hui Zhu
592b2a65b0 Fix a NPE if the Chrome Client is not setup
This can happen when applications are using WebView to show HTML5 video in
full screen mode while not setting up WebChromeClient correctly.

Change-Id: I6575e3364f04f6eaf800f854d60992fe6c3be651
2011-06-13 10:10:51 -07:00
Teng-Hui Zhu
4e6c1da41c am 5a9bbc34: am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit '5a9bbc34cb2a83188b7407c4f7bae47e40593c34':
  fix one NPE when webChromeClient don't have progress view support
2011-06-10 15:21:26 -07:00
John Reck
b0e81da4b8 Merge "Tweak snap settings" 2011-06-10 14:57:33 -07:00
John Reck
75738725e7 Tweak snap settings
Different settings for horiz vs. vert snap
 Snap angle increase in snap mode

Change-Id: I105e79b0c6fae239beef0c311cddd748def2ad8b
2011-06-10 14:51:53 -07:00
Teng-Hui Zhu
5a9bbc34cb am b5141a9f: am 90bdb69b: Merge "fix one NPE when webChromeClient don\'t have progress view support" into honeycomb-mr2
* commit 'b5141a9fc7e841167c3e07f8797d8aef9a787d25':
  fix one NPE when webChromeClient don't have progress view support
2011-06-10 14:27:13 -07:00
Shimeng (Simon) Wang
a8ed4ad80d Merge "Fix reflow for mobile sites." 2011-06-10 14:13:36 -07:00
Shimeng (Simon) Wang
e86cdeb86c Fix reflow for mobile sites.
1. use correct mDefaultScale instead of 1.0f.
2. ignore mMinZoomScaleFixed in case of using wide viewport since
sometimes mobile site will impose a min scale while the web content
will make it bigger than overview scale.

issue: 4257815

Change-Id: Ib4ca9b4dab8585827081a32432076eeeaedecd38
2011-06-10 13:42:32 -07:00
Teng-Hui Zhu
2302fe5226 fix one NPE when webChromeClient don't have progress view support
Change-Id: I5a88365f216d5dea38ab2eac9562d26b00a2d617
2011-06-10 10:56:33 -07:00
John Reck
4bfd6f0fe5 Expose hook for crash backup
Allows browser to know when to update the crash state in response
 to a textfield's contents changing

Change-Id: Idda7a2931f4c9ae01418b91bbabb1e237f118664
2011-06-09 17:45:28 -07:00
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