Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
54,056 Commits 3 Branches 0 Tags
e074e221a8d80b79ec2e8eca0dc026bfcce87cd2
Commit Graph

1858 Commits

Author SHA1 Message Date
Steve Block
324a1f6a12 Merge "Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme" 2011-07-05 07:43:56 -07:00
Steve Block
b4db3964f1 Merge "Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called" 2011-07-05 06:34:57 -07:00
Steve Block
e482d89b82 Clarify the documentation for WebView.loadDataWithBaseURL() when the base URL uses the 'data' scheme 
Bug: 4726284
Change-Id: If4fd3c1a6517a69e0b007f8a67563330eca04449
 2011-07-04 18:25:01 +01:00
Steve Block
3af08a975a Merge "Clarify documentation for WebView.loadData()" 2011-07-04 10:06:31 -07:00
Steve Block
b28b22af13 Clarify documentation for WebView.loadData() 
This method can access the network, but is subject to the usual same
origin policy.

Bug: 4985285
Change-Id: Ia3afa6ed1eeea9127d3ba5a2ecfead8149138b8e
 2011-07-04 13:01:25 +01:00
Steve Block
2cb978e507 Maintain a reference to the Java object when WebView.removeJavascriptInterface() is called 
The Java object should remain usable until the WebView is navigated
away from the current page. The native side holds only a weak
reference, so we need to keep a reference Java-side.

Bug: 4990734
Change-Id: I40bd078f779228480cfe6f52d9feb4e60c963b4b
 2011-07-04 12:19:17 +01:00
Steve Block
fc8a3b222a Merge "Fix WebViewFragment to avoid detroying the WebView too early" 2011-07-04 02:11:38 -07:00
Teng-Hui Zhu
f17bd97103 Merge "Release the media player when exiting the full screen" 2011-07-01 10:02:27 -07:00
Kristian Monsen
5faaadffbf Merge changes I7e8401a4,I412ddf36 
* changes:
  Merge Chromium at r11.0.696.0: New autofill strings
  Merge Chromium at r11.0.696.0: Using setter instead of direct variable access
 2011-07-01 08:04:11 -07:00
Steve Block
071970d9d6 Fix WebViewFragment to avoid detroying the WebView too early 
We must not call WebView.destroy() until after the WebView has been
removed from the view hierarchy.

Bug: 4974517
Change-Id: I33b3a9d4ec098e2ab50626cb8906da7697ff2a33
 2011-07-01 14:10:40 +01:00
Teng-Hui Zhu
b1c2c1e3c7 Release the media player when exiting the full screen 
Once we switch out from full screen mode, the player will be re-created for the
next video, we should release the sources as early as possible.

bug:4332676
Change-Id: I4c26523b3600d3100f81e422979236fca57beb7c
 2011-06-30 16:44:47 -07:00
Shimeng (Simon) Wang
56528a3546 Merge "Keep initial zoom overview for non-standard load." 2011-06-30 13:55:10 -07:00
Shimeng (Simon) Wang
72a1d2e138 Keep initial zoom overview for non-standard load. 
In case of non-standard load such as reload, currently the ZoomManager's
onFirstLayout will not be triggered, hence initial zoom overview will not
be set.

This change provides a fix to set initial zoom overview in case of
non-standard load for the new picture after first layout.

issue: 4975315
Change-Id: If2ba3e472f2bb7b6fc4c52024d18a66dc1e41a23
 2011-06-30 13:36:53 -07:00
Shimeng (Simon) Wang
e58e9b8c82 Merge "Use default scale when restored scale is 0." 2011-06-30 11:23:12 -07:00
Shimeng (Simon) Wang
be768ee508 Use default scale when restored scale is 0. 
issue: 4975315
Change-Id: I47aa09605bb245cd271932d59d4d334f1e1b732f
 2011-06-30 10:27:30 -07:00
Kristian Monsen
6f38f0f68e Merge Chromium at r11.0.696.0: New autofill strings 
Corresponding native change:
https://android-git.corp.google.com/g/#change,118079

Change-Id: I7e8401a4909c903ee4806825ff82a49e3cf6dacb
 2011-06-30 13:48:14 +01:00
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