Commit Graph

3122 Commits

Author SHA1 Message Date
Ben Murdoch
73f328953a am 4088970d: am 3011fc1a: Merge "Fallback to NullWebView when Chromium WebView not present." into klp-modular-dev
* commit '4088970dce354f53911f78084a32cb78af45baaf':
  Fallback to NullWebView when Chromium WebView not present.
2014-05-19 11:35:04 +00:00
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
Selim Gurun
6e1e0e2ec4 Webview Cleanup part 2
Bug: 1231013

Move classes only needed by Browser to browser package.

Change-Id: I7c8080a74a15c06040e0ac0d4b713afbfd02e2e0
2014-05-15 16:05:40 -07:00
Selim Gurun
049803a00e Merge "Cleanup remainings of old webview." 2014-05-09 21:50:31 +00:00
Mikhail Naganov
3b2f548b67 am a08771ed: am fa75ff62: am b76bc8e0: am 6940b664: Add EventLog event for logging of attempts to call java.lang.Object.getClass
* commit 'a08771edfaabab8c2f1f1d552f788c9c4a4162f9':
  Add EventLog event for logging of attempts to call java.lang.Object.getClass
2014-05-09 16:26:19 +00: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
Ben Murdoch
b2e56e34de Hide android.webkit.PermissionRequest.RESOURCE_GEOLOCATION
We haven't hooked this constant up yet, so @hide from the API until
it's ready.

Bug: 14668406
Change-Id: Ia0bb2ac1deaa0575d5ceb509997ca27f930040b0
2014-05-09 13:25:48 +01:00
Selim Gurun
2bfd9839aa Cleanup remainings of old webview.
Cleanup some code that remained from old webview.

Change-Id: I7b654a40284ff88a0a42c7407ad0b2499000f77d
2014-05-08 19:33:58 -07: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
Tao Bai
fa1fd2cb7d Public WebView permission API
BUG: 13699047
Change-Id: Ibcc8c0d4f1bba4365cb71c1991a0fcb1d7febb94
2014-05-06 21:17:54 -07:00
Selim Gurun
a83f1e3d23 Add frameworks/base changes for enabling reduction proxy
Bug:12492817

Add an experimental webview setting to developer options to enable
data reduction proxy.

Change-Id: Id73d7f5d655a7de18afff766c5c78209c92964ea
2014-05-05 17:28:04 -07:00
Selim Gurun
87a0351ddc Add an import missing
Change-Id: I99a15779bff3bae5dd78d823d1f6c7f644c98751
2014-05-02 14:52:49 -07:00
Selim Gurun
8b414fc483 Fix javadoc breakage
Change-Id: I2667bdb6b4ea76c2f81bae77ceaecb3391e4521b
2014-05-02 14:40:41 -07:00
Selim Gurun
f271c8ecd0 Unhide Client Cert APIS
Bug:12983007
Change-Id: I9ae23be110ff036ce64271841e1ba69122ce6caa
2014-05-02 14:19:16 -07:00
Selim Gurun
e1c6c3ae21 Design a static API for clearclientcertpreferences
Bug: 12983007

Change-Id: I869b4cd4c178b8fedf725f108fd2e369895543e9
2014-05-02 13:08:55 -07:00
Michael Wright
428d1e40a9 Merge "Fix WebViewClient docs" 2014-05-02 16:29:27 +00:00
Ben Murdoch
fe9fc3d1a3 Add API definition for WebSettings.allowMixedContent
Introduces an API for configuring how the WebView behaves with
regard to referencing insecure content from a secure origin.

By default, apps targeting <= KK will allow mixed content. New apps
will block all insecure content.

Bug: 13948531
Change-Id: Ie773ee144e223f78b6449da0a8564192dd9c1c5d
2014-05-02 14:17:25 +01:00
Michael Wright
1feb11f511 Fix WebViewClient docs
Change-Id: I960701a49be66fccfd03a8876779a5f7917642ea
2014-05-01 15:41:33 -07:00
Michael Wright
e02bfb6fbd Merge "Add unhandledInputEvent API to ViewRoot" 2014-05-01 21:15:29 +00:00
Michael Wright
899d70568b Add unhandledInputEvent API to ViewRoot
Update WebViewClient to use it instead, and add a new public API,
onUnhandledInputEvent. Note that WebViewClients won't receive this
call back until WebView is updated to use it.

Bug: 14279909

Change-Id: Ied49791b469849f5c4cf4471f2b26c56b03f4961
2014-04-29 15:02:34 -07:00
Kristian Monsen
10ca8088f6 Try to not start up chromium when not needed
Also thread behaviour from static methods is not easily understood.

Change-Id: Icedeef70738f35891fa9562d717b119104756ba9
2014-04-29 11:09:47 -07:00
Selim Gurun
f2d50e5536 Clarify a use case.
Clarify a use case regarding clearing client certificates.

Change-Id: Ifdfa00022bb21b26e6f62dbad585faef4f8fc3c7
2014-04-25 09:39:31 -07: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
Selim Gurun
b6aa97e0a0 Add ClientCert support
Bug: 12983007

This is to add APIs for client certificates. Keep the APIs hidden
until finalizing the design.

Change-Id: I8a1e755e2c509cf821dff7c7df0ddd5270a5f79b
2014-04-24 14:27:33 -07:00
Selim Gurun
14cd25f619 Merge "Provide an API to set print document name." 2014-04-18 14:49:25 +00:00
Ben Murdoch
6f51cd7ede Merge "Revert "Revert "Define new general permission APIs for webview.""" 2014-04-16 12:45:24 +00:00
Tao Bai
4c22b54776 Revert "Revert "Define new general permission APIs for webview.""
This reverts commit e0a7b08d36.

Change-Id: Ieba5a72524e43eb5e2fccb39647fd11e9d9494c8
2014-04-15 18:04:49 +00:00
Tao Bai
31e052bfc4 Merge "Revert "Define new general permission APIs for webview."" 2014-04-15 18:01:43 +00:00
Tao Bai
e0a7b08d36 Revert "Define new general permission APIs for webview."
This reverts commit 672b99c8f8.

Change-Id: I486b313b8cd638d5e29e2f022bba99b570a9415f
2014-04-15 17:58:02 +00:00
Tao Bai
e5b7c95b8a Merge "Define new general permission APIs for webview." 2014-04-15 17:37:12 +00:00
Mikhail Naganov
d380b2098f Add Javadoc statement regarding enumerability of methods of injected Java
objects for applications targeted to API levels after KitKat.

Bug: 12169386
Change-Id: I1c988468545e48ac0d7323b01b9c77a1f8d713f2
2014-04-11 10:04:18 +01:00
Tao Bai
672b99c8f8 Define new general permission APIs for webview.
This will give us ability to add new webview featrues which requires permission without changing API during the WebView autoupdate.
Also deprecated geolocation permission related APIs.

BUG: 13699047
Change-Id: I6a557e11eb26c6ca236d44e75600e0b265fd791c
2014-04-10 20:48:41 -07:00
Selim Gurun
23a1af6f83 Provide an API to set print document name.
Bug: 13250097

The current print api for Webview does not allow setting the
print document name, so all documents show up using a hardcoded
name (which is visible to the user). Deprecate the current API
and provide a new one that allows setting the document name.

Change-Id: I7043b78e98f25bbc0e0ef33e1d6d3b0d34401e48
2014-03-17 10:06:42 -07:00
John Reck
34dbce14e8 Switch WebView to onDetachedFromWindowInternal
Change-Id: I1036f48f3c98492421430c3894f937884fb4c63e
2014-03-06 15:54:54 -08: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
Hui Shu
c60ad9c3fb Fix postUrl to call loadUrl when url is not a network url.
Change-Id: I4be00611c220572b4e8ecea1a00409a6f5d2bb18
2014-02-05 13:32:37 -08:00
Selim Gurun
4306ae1798 Remove defunct flag
Change-Id: Ib745f225f40a9cd7bf62a93f9546bd31f1507cbf
2014-01-27 13:39:24 -08: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
John Spurlock
6090995951 Remove unused imports from frameworks/base.
Change-Id: Ia1f99bd2c1105b0b0f70aa614f1f4a67b2840906
2013-11-20 11:31:47 -05:00
Jonathan Dixon
1ec0c91f40 am 72950e65: am d47be031: am 43e533de: Merge "Restore 4 classes that were accidentally deleted" into klp-dev
* commit '72950e65c87b2956446d1e7b9dbdc02ef3841774':
  Restore 4 classes that were accidentally deleted
2013-10-18 17:42:18 -07: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)
ccd0204e9d resolved conflicts for merge of f96b93e2 to master
Change-Id: I28dbc39dde7bf5c8bb50cff0f6bc49a90c9c4dbe
2013-10-15 14:04:16 +01:00