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

1874 Commits

Author SHA1 Message Date
Shimeng (Simon) Wang
07ac175452 Set mActualScale when initialScale is set. 
This sets mActualScale to be correct value if initialScale is set.

issue: 4982074
Change-Id: I69d12d185710e89fc91a3a6bdf566c7092f059b7
 2011-07-11 14:13:17 -07:00
Shimeng (Simon) Wang
e5f5e82027 Merge "Prevent set mInitialScale being overridden by mDefaultScale." 2011-07-08 16:48:23 -07:00
Shimeng (Simon) Wang
1151fe78fc Prevent set mInitialScale being overridden by mDefaultScale. 
If mInitialScale is set, use it as the default scale; otherwise,
it'll be overridden by default density in case of book app where
mobile fixed viewport is used; since today the default scale is used
to calculate the mobile fixed viewport.

issue: 4982074
Change-Id: I21c2bf41478bb97351cb3fb1cc3735ab7d75e164
 2011-07-08 14:38:38 -07:00
John Reck
effa7523f4 Merge "NPE guard in setupViewport" 2011-07-08 12:43:22 -07:00
Kristian Monsen
7cec24f747 Merge "Merge Chromium at r12.0.742.93: New autofill string" 2011-07-08 11:31:33 -07:00
John Reck
d4324aa101 NPE guard in setupViewport 
Bug: 4163660

Change-Id: Ie74072094c0dbfca4391cf898420544884101c1f
 2011-07-08 11:23:39 -07:00
Kristian Monsen
918b183295 Merge Chromium at r12.0.742.93: New autofill string 
Added a string that we now use.

Change-Id: I6df3f2b5c2f01e4d757dadb048cb53bfe9819ff9
 2011-07-08 16:45:10 +01:00
Shimeng (Simon) Wang
ab5a5e6748 Merge "Update viewport asap." 2011-07-07 16:17:16 -07:00
Shimeng (Simon) Wang
56bd4349fc Update viewport asap. 
Update viewport as soon as possible to make sure layout has correct viewport.

This helps fixes gmail flickering issue.

Also helps the case a mobile site is switched to desktop when the
user agent is switched.

issue: 4723800
Change-Id: I3dc9e52d912d49478d562cec3f38d653a563715e
 2011-07-07 15:26:22 -07:00
Huahui Wu
1d19c18f9b Merge "Revert "b/3302378 Passes touch pressures, size and timestamps to webkit."" 2011-07-07 15:10:25 -07:00
Huahui Wu
98933f3f68 Revert "b/3302378 Passes touch pressures, size and timestamps to webkit." 
This reverts commit 6e64e0c617.
It introduced a null pointer crash for pinch-and-zoom.

Change-Id: I886057053b4cd2aded0f58618a806f7a67e58968
 2011-07-07 14:58:37 -07:00
Huahui Wu
b083fa61d9 Merge "b/3302378 Passes touch pressures, size and timestamps to webkit." 2011-07-07 11:05:13 -07:00
Huahui Wu
6e64e0c617 b/3302378 Passes touch pressures, size and timestamps to webkit. 
Related CL in WebKit:
  https://android-git.corp.google.com/g/#change,118422

Change-Id: Ibf209131a6d9ca8186c461b0c5b6286e5f669d0d
 2011-07-07 10:59:27 -07:00
Mathew Inwood
bdaa1aafd5 SearchBox API to determine if it's supported by the current page. 
Change-Id: I0119243ed0e19e237c1f51de887af5c954f96693
 2011-07-07 12:56:39 +01:00
Shimeng (Simon) Wang
a0c26920b6 Merge "Treat restored defaultScale as overview." 2011-07-06 14:40:53 -07:00
Shimeng (Simon) Wang
1bf0456b29 Treat restored defaultScale as overview. 
Since usually restored defaultScale means previous scale is not saved.

issue: 4975315
Change-Id: Icc34469d0459fb5254567fe9f3cc5032b6349405
 2011-07-06 14:30:38 -07:00
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