Commit Graph

2732 Commits

Author SHA1 Message Date
Steve Block
ae6cb93477 am 1d15cb0b: am 65dfac3b: Merge "Clean up JavaDoc for CookieManager" into jb-mr1-dev
* commit '1d15cb0b37e4a5d0a7674da3fd321148d2cc1cd1':
  Clean up JavaDoc for CookieManager
2012-08-15 05:06:29 -07:00
Steve Block
9ccdb0461c am 3d935621: am 27f3e32e: Clarify JavaDoc for WebView.loadData()
* commit '3d93562115237d8a893f3e686e44116ba506d57a':
  Clarify JavaDoc for WebView.loadData()
2012-08-14 07:59:11 -07:00
Steve Block
c723e35336 Clean up JavaDoc for CookieManager
Bug: 5461416
Change-Id: I0ae09943007cf3866daad97a76f5008e61c471ed
2012-08-14 15:54:38 +01:00
Steve Block
27f3e32ee1 Clarify JavaDoc for WebView.loadData()
Bug: 5461416
Change-Id: I3f0955677ea64bb4073c97aabea34096298cd710
2012-08-14 15:54:35 +01:00
Mikhail Naganov
ce18fd9510 Merge "Implement WebSettings.{get|set}TextSize via {get|set}TextZoom." 2012-08-08 02:08:58 -07:00
Mikhail Naganov
c70b1f3bd6 Merge "Remove unused BROWSER_TEXT_SIZE_CHANGE log event." 2012-08-08 02:06:36 -07:00
Mikhail Naganov
65e7ace979 Clarify JavaDoc of WebSettings.setAllowFileAccessFromFileURLs.
According to CTS tests (WebSettingsTest.testLocalImageLoads),
local images access is allowed regardless of the state of
AllowFileAccessFromFileURLs.

Bug: 5461416

Change-Id: I71f5c38a6b0f3720c8c369c0e19f379c78ace06f
2012-08-08 10:02:39 +01:00
Mikhail Naganov
1202d66f78 Implement WebSettings.{get|set}TextSize via {get|set}TextZoom.
TextSize is deprecated, so we wouldn't expect from WebViewProvider
implementations to re-implement it in some other way than Android WebView does
it. This also makes recently added TextSize.getValue method redundant.

Change-Id: Ia9d0c743424be0727be6d5df6c7da30514d621b7
2012-08-07 18:26:52 +01:00
Mikhail Naganov
690c6b1925 Remove unused BROWSER_TEXT_SIZE_CHANGE log event.
It turns out that the BROWSER_TEXT_SIZE_CHANGE event isn't listed
in google3/wireless/android/production/checkin_config/root,
which means that statistics on it isn't collected, so the logging
statement doesn't have any useful effect and can be removed to
simplify code.

Change-Id: I66d694cdb13e677bb979f5e962ed2cc8d743bdec
2012-08-07 18:16:17 +01:00
George Mount
ed85b04ebd am 8502ab91: am daceb30b: Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev
* commit '8502ab91bdd8ed34eeebed2daac90dea7b3da0ea':
  Cancel handler for JS unload handler prevents hang.
2012-08-02 16:33:30 -07:00
George Mount
daceb30bf5 Merge "Cancel handler for JS unload handler prevents hang." into jb-mr1-dev 2012-08-02 16:28:03 -07:00
George Mount
df9cae4de3 Cancel handler for JS unload handler prevents hang.
Bug 6803309
 When the alert dialog raised by the JS unload handler was pressed
 outside the alert region, it was canceled and no response was
 sent back to WebViewCore. This captures the cancel event so that
 WebViewCore doesn't hang.

Change-Id: I0c125e759a252a803c2c77aa9533adef7fa82d3d
2012-08-02 15:14:39 -07:00
George Mount
12b7b7fea8 am be38cccd: am ed9960ff: Merge "Don\'t restart input in the middle of a batch." into jb-mr1-dev
* commit 'be38cccd91e12576ed994719b6b83371c5749bb9':
  Don't restart input in the middle of a batch.
2012-08-02 15:10:28 -07:00
George Mount
a99dbde643 Don't restart input in the middle of a batch.
Bug 6854156
 setComposingText is in the middle of a batch and it was resetting
 the InputConnection. When the batch ended, it was closing a
 batch that wasn't open on the new InputConnection. The reset
 turns out not to be necessary anymore -- the LatinIME respects
 the content when setComposingText fails to change anything.

Change-Id: If3352b32ed7b3c90c8dcb3d5ff8d308e82849d85
2012-08-02 09:36:06 -07:00
Teng-Hui Zhu
cf737484a8 am ca6b44f8: am 3a680382: Merge "Add license info to the HTML5Video files." into jb-mr1-dev
* commit 'ca6b44f8a9c78002f1826d49ced350287831dba4':
  Add license info to the HTML5Video files.
2012-08-01 14:53:10 -07:00
Teng-Hui Zhu
778029e5c6 Add license info to the HTML5Video files.
Change-Id: I44775bcdcc48d2c024b086098e140dae92f53339
2012-08-01 13:59:39 -07:00
Mikhail Naganov
f415f3d72b Merge "Deprecate WebSettings.LOAD_NORMAL cache mode." 2012-07-31 05:08:23 -07:00
Mikhail Naganov
56936a1f51 Deprecate WebSettings.LOAD_NORMAL cache mode.
After the switch to the Chromium network stack, this setting is
effectively the same as LOAD_DEFAULT, and having two settings
with the same meaning is confusing.

This change is blocking https://android-git.corp.google.com/g/205883 in CTS

Change-Id: I02cc23477f107e7f4cec37dcbad4f25503b5e840
2012-07-30 14:54:49 +01:00
Mikhail Naganov
ce76ca51d8 Add 'getValue' methods to WebSettings.TextSize and ZoomDensity enums.
As the 'value' fields in these enums are not public, it isn't possible to
retrieve the enum value if the WebViewProvider implementation is defined in a
different package to the API. Adding public hidden methods to fix this.

Change-Id: Ia5fb1332d0043e127b4bad03a295d8abf1a5e5b9
2012-07-30 14:20:01 +01:00
Scott Main
75bea2e8d3 am 7c00f816: am 2f5b61a7: Merge "docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch" into jb-dev
* commit '7c00f81606de1880c3f28e54cea064c3b90da3e7':
  docs: fix a bunch of links from javadocs to api guides and add some attributes to Spinner and Switch
2012-07-25 15:05:18 -07:00
Mikhail Naganov
500b003ff1 Improve JavaDoc for cache mode constants.
Bug: 5461416
Change-Id: I26c48a6428ff1afb5346eeaa02c5ca74ec95173c
2012-07-25 13:06:14 +01:00
Scott Main
4c359b76f9 docs: fix a bunch of links from javadocs to api guides
and add some attributes to Spinner and Switch

Change-Id: If015ad000c1a36e19904c132e98ebff1ceaf718b
2012-07-24 17:50:48 -07:00
Fabrice Di Meglio
85d28a0004 Merge "Replace left/right with start/end for Gravity / LayoutParams / Padding" 2012-07-24 11:11:02 -07:00
Steve Block
46ce1db6ff Improve JavaDoc for HTTP basic authentication methods
Bug: 5461416

Change-Id: Ie3bfbf6acde34ea184aa8c8b1d3841e2a2aa8a22
2012-07-23 14:30:15 -07:00
Steve Block
219dfa4d39 Improve JavaDoc for saved form data
Change-Id: I962df5678081920c30f8a2b1fe79389f702ef3fb
2012-07-23 14:22:21 -07:00
Steve Block
32fe410a5d Improve JavaDoc for saved username/password pairs
Change-Id: Ief079666eb1250f0a57089c778669b638a259194
2012-07-23 10:32:35 +01:00
Ben Murdoch
e09e976dad Allow switching to the Chromium WebViewFactoryProvider at runtime.
Currently, WebViewFactory is hardcoded to always load
android.webkit.WebViewClassic$Factory.  This change allows us to
load the Chromium powered WebView by setting the
"webview.use_chromium" system propery to true.

Change-Id: Icebfc4d5c4a61230c5e5dccac1ec5eca59f650ac
2012-07-23 10:21:10 +01:00
Teng-Hui Zhu
0e5b160418 add a webview API to support media play without user gesture
bug:6806306

webkit change: https://android-git.corp.google.com/g/#/c/208568/
Change-Id: Ic70e5d3f152a7e8d8fdfa1d6f89f96c8cd3c7075
2012-07-20 13:33:52 -07:00
Fabrice Di Meglio
aac0d4ed02 Replace left/right with start/end for Gravity / LayoutParams / Padding
- see bug #5429822 UI should be mirrored for RTL locales (Arabic, Hebrew, farsi)

Change-Id: Id9af5375fb9b0edeae5232c77e52ecd497bd2e67
2012-07-19 19:21:26 -07:00
John Reck
4635dc23dc Bump PREVIOUS_VERSION
Change-Id: Idf2586a7062726f60d3a6c1b75f75fde8fc9c550
2012-07-19 18:00:07 -07:00
Steve Block
60620a2399 Merge "Update JavaDoc for PictureListener after fix to capture layers" 2012-07-19 11:44:08 -07:00
John Reck
b077e243ba Merge "Test aggressive throttling" 2012-07-19 11:28:33 -07:00
Steve Block
72498edd88 Update JavaDoc for PictureListener after fix to capture layers
Bug: 6389297
Change-Id: I970942f926effbb072ae306c994d25c0e77e3810
2012-07-19 17:02:06 +01:00
Jonathan Dixon
f6468ca4dc Merge "Remove deprecated methods from webview provider interface" 2012-07-17 15:41:29 -07:00
Steve Block
6bcb45934e Merge "Improve JavaDoc for WebView.restoreState()" 2012-07-17 08:22:31 -07:00
Steve Block
42499061be Improve JavaDoc for WebView.restoreState()
Change-Id: I01b3f8ac78b08ef0a6f563fa63978934a23fd183
2012-07-17 16:01:38 +01:00
Jonathan Dixon
19274f5a86 Remove deprecated methods from webview provider interface
As these methods are a no-op, no need to foward it to the provider.
Also fixed some missing @Override annotations.

Change-Id: I6ba87cea49d95499de3f62db85c6f6947634bb6f
2012-07-12 18:12:12 -07:00
Chris Craik
d442aaeb46 Merge "Don't attach functor for SW layers" 2012-07-12 16:17:16 -07:00
Chris Craik
793b7f8454 Don't attach functor for SW layers
Change-Id: I60fec1629bf1e343a0d69e0ce13a3d632c3f713d
2012-07-12 14:01:50 -07:00
Teng-Hui Zhu
5a9bb64eaf Merge "Release the media player when trimming memory" 2012-07-11 13:31:02 -07:00
Teng-Hui Zhu
156f97b6c8 Release the media player when trimming memory
Change-Id: I2bb2880546311761fc38d6208de080a66216fa2f
2012-07-10 15:11:38 -07:00
Selim Gurun
f27ac09501 Update documentation to clarify AppCache usage
Bug: 5869022
Change-Id: I5830583b6c68128cbfda0e61cd6f031702faebf5
2012-07-10 11:19:58 -07:00
Selim Gurun
3b2fb7b2d1 Merge "Fix onReachedMaxAppCacheSize callback" 2012-07-10 10:49:16 -07:00
Selim Gurun
b632adfaf4 Update documentation to clarify AppCache usage
Bug: 5869022
Change-Id: I46abecfb0e8975cc924458f444f95cdabaa3f712
2012-07-10 10:36:12 -07:00
Selim Gurun
c86bec9727 Fix onReachedMaxAppCacheSize callback
Bug: 5869022

When appcache reached max size, a callback is triggered. The
second parameter of this callback was returning the used Web SQL
quota, which is a rather different concept then AppCache. Fix this
to return max database size.

Change-Id: Iee11f40aa9635eaa22e237d4ddfb98792c977497
2012-07-09 11:30:54 -07:00
Jonathan Dixon
a64c779cdb Merge "Make WebHistoryItem constructor public and hidden" 2012-07-02 15:53:28 -07:00
Teng-Hui Zhu
c3a2858de9 Avoid redundant reload in inline mode after exit from full screen.
bug:5710646

First, if we exit the full screen mode while playing, we can continue to play
in inline mode.

If it is paused, then we can avoid a reload if user try to play the same video
again after the full screen mode.

webkit change:
https://android-git.corp.google.com/g/#/c/202138/

Change-Id: Ia69fa22a50d916cd8dd2b995cf3531fe9b637531
2012-06-27 15:48:02 -07:00
George Mount
5048cd77dc Merge "Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS" 2012-06-22 10:29:50 -07:00
George Mount
d594047f8f Remove unused ENABLE_ANDROID_INSTALLABLE_WEB_APPS
Remove an unused #define and code associated with it. This will
 smooth a possible future webkit merge.
 WebKit change: I16d8c457a3f08996bc66401b241fe0db5a118975

Change-Id: Ibf046337cdabb9bee9cff8e3d77d9f69a59ecb15
2012-06-21 10:19:56 -07:00
George Mount
f360ae5070 Remove password change from updateTextfield.
Password field change is no longer needed as it was used
 previously in WebTextView and is not needed without it.

Change-Id: I7d5dc39825ee9eae77733d2a9560669cfe70ecf2
2012-06-20 16:26:17 -07:00