Commit Graph

3051 Commits

Author SHA1 Message Date
Ben Murdoch
4088970dce am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev
* commit '3011fc1aa7dbffd3faab7d41203f63d2c0b50c2c':
  Fallback to NullWebView when Chromium WebView not present.
2014-05-19 11:30:41 +00:00
Ben Murdoch
0e04bcfbdc Fallback to NullWebView when Chromium WebView not present.
If it's not possible to load the Chromium WebView, fallback to loading
the NullWebView that will throw UnsupportedOperationException.

Bug: 13438487
Change-Id: If44b8b7a569c2f8e0e8bba7e6953288802d1c9e0
2014-05-16 13:41:12 +01:00
Mikhail Naganov
a08771edfa am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
* commit 'fa75ff626ca48db1007105fa5fd72d83c81c56e2':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:19:12 +00:00
Mikhail Naganov
6940b66409 Add EventLog event for logging of attempts to call java.lang.Object.getClass
Bug: 13694467
Change-Id: I886c6ffb3a008d0cf701c1adc16c607cbf7dce39
2014-05-08 10:10:24 +01:00
Selim Gurun
7466e3bbbd am e3fc3073: am 8c2d70f5: Merge "Add a stub for forgotten callback to fix master-gpl."
* commit 'e3fc3073826b4fdfa0d1be17fe0c79ccf211ad7d':
  Add a stub for forgotten callback to fix master-gpl.
2014-04-25 01:15:36 +00:00
Selim Gurun
8c2d70f5e8 Merge "Add a stub for forgotten callback to fix master-gpl." 2014-04-25 01:08:48 +00:00
Selim Gurun
4e48f40b03 Add a stub for forgotten callback to fix master-gpl.
Change-Id: I375dba89403d09dc39f696de04e0811633ecc803
2014-04-24 18:04:04 -07:00
Selim Gurun
a697268442 am f7a19173: am adad989b: Merge "Add a stub to fix master-gpl"
* commit 'f7a191731f6c840eed9283652648f267589502c2':
  Add a stub to fix master-gpl
2014-04-25 00:47:23 +00:00
Selim Gurun
adad989b6a Merge "Add a stub to fix master-gpl" 2014-04-25 00:39:10 +00:00
Selim Gurun
85b89bf7a3 Add a stub to fix master-gpl
Change-Id: I4cadd3a6e33843ccac4ef2eacbe508e40628367c
2014-04-24 17:31:07 -07:00
Jonathan Dixon
efe1b2402a DO NOT MERGE: Fix build after checkThread fix merge to master
Follow up to Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024 - this
method did not exist in klp-dev branch.

Change-Id: Ie64dd3b2357e0abefb4c7d3492f02d23d347f89f
(cherry picked from commit b212b9f2ba)

Cherry pick to klp-dev as part of Bug: 13246014
2014-03-03 18:48:00 +00:00
Primiano Tucci
f4e2723244 DO NOT MERGE: Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
(cherry pick of 2442675002)

Cherry pick to klp-dev as part of Bug: 13246014

Conflicts:
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewFactoryProvider.java
(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: I8471ee5cfaac2ff72704c2391a1961f441aaa1e6
2014-03-03 18:01:53 +00:00
Selim Gurun
355ed4ac43 Revert "Adding freeMemoryForTests static method to WebView."
This reverts commit c6a2a6e20f.

Change-Id: If9e1b3420ee239ab3166850e853d5949821f99e1
2014-01-23 22:13:40 +00:00
Selim Gurun
c6a2a6e20f Adding freeMemoryForTests static method to WebView.
This is going to be used by pagecycler tests.
Bug: b/10629847

(cherry picked from commit 54daaf1cffddad6366fac2ccfceb1e042dd8e90e)

Change-Id: Ie16a94baa15f868d60f3837290dcc8045aea31a9
2014-01-23 11:21:00 -08:00
Jonathan Dixon
74fc73f62b Restore 4 classes that were accidentally deleted
Bug 11291911

These deleted classes were previously public APIs and so need to remain
in the build (but hidden) in order to keep existing apps working.
(Partially reverts Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d)

Change-Id: I28e53b056f41e66645136f5e18fba2ff55a65fe5
2013-10-18 17:10:34 -07:00
Torne (Richard Coles)
94c0057d67 Delete the old WebView.
Delete all the Java classes used only by the old WebView implementation,
and also sections of common classes that were only needed for the old
WebView.

Bug: 10427705
Change-Id: I02549a71104b35d86d99058c71f43e054730ec7d
2013-10-15 11:18:51 +01:00
Torne (Richard Coles)
d892afc88d Remove support for switching WebView.
WebViewFactory remains as an abstraction layer, but will now always
creates Chromium WebView instances.

Bug: 10427705
Change-Id: I045e43eb35462567fecd29d04e7b61902baef547
2013-10-15 11:18:50 +01:00
Jonathan Dixon
517771bc6c Do not require WebView usage to come from main thread
So long as all usage is from a single thread per instance it is OK if
it's a non-main thread.
(But note that for apps targeting JB MR2 this was enforced to be the
main thread anyway).

Bug 10937207

Change-Id: Ibc2496d5cef97b4685e001086f712fcaac231024
2013-10-09 12:03:07 -07:00
Jonathan Dixon
be706eb1c1 Hide Experimental WebView from dev settings DO NOT MERGE
Bug 10427705

The persist.webview system property is no longer needed, so removed too.

Change-Id: I8f02736469464b52636f3d59ec8537d11766d39f
2013-10-08 17:59:13 +01:00
Jonathan Dixon
050c552f09 Fix CookieSyncManager for WebViewClassic
Add a workaround to ensure that the WebViewDatabase and JniUtil can
still be initialized as side effect of making a CookieSyncManager

This was collateral damage from the fixes for Bug 10932261

Change-Id: If5ba65a7822d5b0afc14139dd84125058bf96897
2013-10-04 14:23:47 +01:00
Jonathan Dixon
eb9e801424 Decouple construction of WebView, CookieSyncManager, WebViewDatabase
Bug 10932261

Most of this flow exists purely to get the Context from
CookieSyncManager.createInstance over to WebViewDatabaseClassic. Make
that depenency more explicit (with a TODO to remove it) and this allows
a much simpler CookieSyncManager implementation for the normal case.
Note after this patch, CookieSyncManager.getInstance() is technically fine
to call without a prior call to createInstance, but retaining the
ordering requirement as a convenience for anyone developing on new OS
but still supporting the older versions.
(Note that CookieSyncManager instance is not required for correct
operation of either existing webview, so these changes only impact
the public API contract of object lifetimes, not the underlying
implementation)

Change-Id: I51fdd6622704f1c749277fee6df2f84ac4c704d2
2013-10-03 17:53:33 +01:00
Martin Kosiba
4e31b8046d Merge "Update WebView documentation section about zoom." into klp-dev 2013-09-24 09:49:22 +00:00
Jonathan Dixon
6c025eaf29 Merge "WebView: add an API method to control web contents debugging" into klp-dev 2013-09-21 03:41:33 +00:00
Martin Kosiba
0d147d9b89 Update WebView documentation section about zoom.
This makes it clear that pinch-zoom and wrap_content don't go well
together.

BUG: 10598456
Change-Id: I748b454197353fcbe5c2621719934a121745d4ce
2013-09-20 11:33:42 -07:00
Jonathan Dixon
df3859ebeb Fix obsolete API reference
Bug 10361803

exportToPdf use-case not supported in K so removing that dangling
reference from the javadoc

Change-Id: Ia0fe3aa9ed5150639d1f72341c89568a0a7e1c7d
2013-09-18 12:51:47 -07:00
Jonathan Dixon
5545d083d3 Update APIs for the Chromium WebView
Bug: 10361803
Bug: 8565831

Several obsolete APIs now deprecated.
TEXT_AUTOSIZING can now be unhidden.

Change-Id: Ib0afa4bb010f35816d3b9dd3695e8997f0ff0793
2013-09-17 20:47:10 -07:00
Jonathan Dixon
dc1573595c Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
Bug 10769282

Reverting temporary patch required for factory rom.

This reverts commit 292fd0351be8f414cbe32a7eb322bd18158685d9.
2013-09-16 03:09:43 +00:00
Jonathan Dixon
3d458ab916 Hide Experimental WebView from dev settings DO NOT MERGE
Bug 10427705

The persist.webview system property is no longer needed, so removed too.

Change-Id: I99bbf2e9b9ec42f282339c72509fd99b18594ebf
2013-09-16 03:08:41 +00:00
Selim Gurun
a5c86c644b Publish Print Api for Webview
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64
2013-09-11 14:42:50 -07:00
Mikhail Naganov
057989eddc WebView: add an API method to control web contents debugging
This adds static (as this is for the whole process) method
for controlling the web debugging state.

Please note that the implementation only makes sense for
Chromium WebView, and it's a no-op in WebViewClassic.

BUG=8691809

Change-Id: I815b4d69ad9ee814ca4cec1da81490b63ba2da68
2013-09-11 12:39:35 -07:00
Mikhail Naganov
498a5f5488 Merge "Add more docs for WebView's setInitialScale and setLoadWithOverviewMode" into klp-dev 2013-09-06 14:36:29 +00:00
Mikhail Naganov
003033665f Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
BUG=10588746

Change-Id: Ibbccd688de9841cc780b933f414a8435c79b51b3
2013-09-05 18:13:07 +01:00
Chet Haase
e8222dddaf Change build version from KEY_LIME_PIE to KITKAT
Issue #10631619 Change build version to KitKat

Change-Id: I6ad13f6169ad74204078d36929479998b498ad8b
2013-09-05 08:44:33 -07:00
Jonathan Dixon
69f9f9305c Add tracing to WebView API methods and callbacks
Bug: 10488419

This is useful for debugging numerous SxS issues.

Change-Id: I5d0d2e253499741c5f9454582988c99e42dc0a81
2013-08-30 15:07:25 -07:00
Selim Gurun
51e4c4c13b Merge "DO NOT MERGE Printing API changes for supporting better page layout" into klp-dev 2013-08-30 17:09:23 +00:00
Selim Gurun
030d8b0d1b DO NOT MERGE Printing API changes for supporting better page layout
Bug: 10507857
Change-Id: I3120ebfd11716259b9a83312b95a6a3f98a23d89
2013-08-30 08:30:52 -07:00
Jonathan Dixon
9f9fbc9605 Fix for 10530176 - CookieSyncManager must be created by WebView c'tor
WebViewClassic created the CookieSyncManager instane as a side effect of
starting up its internal WebCoreThread. As this forms part of th API
contract (app doesn't need to call CookieSyncManager.createInstance if
it already made a WebView instance) promote this logic up to the API
layer.

Change-Id: I0e92d97be987dfef90162ad379c79b066aae34e0
2013-08-28 20:29:39 -07:00
Jonathan Dixon
b7d5cbc007 Reset the Experimental WebView property per build
In order to increase test coverage, reset to the default value everytime
the build ID changes.

Bug: 10427705
Change-Id: I75e301d26ee0ca52265c5f7fe48661787b596168
2013-08-21 16:51:29 -07:00
Selim Gurun
fc3f4ee8a0 Added the callback signal.
Bug:10190508

Change-Id: I52b327e0724938e1de7ce7550d26563364ff1589
2013-08-20 15:18:31 -07:00
Ben Murdoch
851004ade0 Update WebView.postUrl documentation.
Clarify format of the 'data' parameter.

Bug: 10188709
Change-Id: Ib0f7553153916ed7b5cc611da5eb481979bf3f93
2013-08-16 16:43:22 +01:00
Kristian Monsen
4c73749614 Merge "Change the exception msg" into klp-dev 2013-08-13 01:35:29 +00:00
Selim Gurun
1eb8b726d3 Change the exception msg
Change the exception msg to better identify the webview version.

Change-Id: I64c9a433144f9aa0362ad6c9217da92acbb655bc
2013-08-12 18:29:33 -07:00
Selim Gurun
1232c51eed Merge "Add the API to support webview printing" into klp-dev 2013-08-12 18:27:38 +00:00
Selim Gurun
2167c0be56 Add the API to support webview printing
Bug: 10190508
Change-Id: I47fc46bb1ea632876048b29621843f781c47aab7
2013-08-12 10:55:39 -07:00
Martin Kosiba
9a68f82f37 Add super_onDrawVerticalScrollBar to WebView.PrivateAccess. DO NOT MERGE
Cherry pick of master I210dbab01c8b8d1eeff316a23c5d011e2e6c2a74

This exposes the super_onDrawVerticalScrollBar method which will
be called by the WebViewChromium implementation.

Change-Id: I3fe348633c163514e67b7712f1e9a086dee3d338
2013-08-12 13:15:20 +01:00
Elliott Hughes
89a8250e24 am 710f3e2c: am 60ae2617: Merge "If frameworks wants ASCII casing, it should explicity ask for it."
* commit '710f3e2cc6bc2cdc2f2cddb2190823ea31efd52a':
  If frameworks wants ASCII casing, it should explicity ask for it.
2013-08-02 17:58:33 -07:00
Elliott Hughes
cb64d43062 If frameworks wants ASCII casing, it should explicity ask for it.
http://elliotth.blogspot.com/2012/01/beware-convenience-methods.html

Bug: https://code.google.com/p/android/issues/detail?id=58359
Change-Id: Iaab02e718a7be7bda22e626dca05d79bfd2a8fc4
2013-08-02 15:12:32 -07:00
Ben Murdoch
9c059d1ef0 Merge "Revert "Revert "Flag-flip: set chromium to be the default WebView""" 2013-08-01 18:14:33 +00:00
Ben Murdoch
74c8f51220 Revert "Revert "Flag-flip: set chromium to be the default WebView""
Turn the flag back on.

This reverts commit c9f10b6be9.

Change-Id: I1a77bdf7f59a6868fd8ab30687062f34fc914bc6
2013-08-01 12:14:53 +00:00
Ben Murdoch
46fc6a6e3b Merge "Revert "Flag-flip: set chromium to be the default WebView"" 2013-07-31 11:46:36 +00:00