Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
115,281 Commits 3 Branches 0 Tags
c2bf92d42a032c9dadd25904a5b0f183585dc024
Commit Graph

3046 Commits

Author SHA1 Message Date
Jonathan Dixon
1bb6a7dce9 am a8137c0c: am b1b2789d: Merge "Do not require WebView usage to come from main thread" into klp-dev 
* commit 'a8137c0c867fe07147cb86e67a20fd88dea5a3bc':
  Do not require WebView usage to come from main thread
 2013-10-09 16:29:34 -07: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
Torne (Richard Coles)
d724ff6fd7 am 0544b872: am facf26c0: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev 
* commit '0544b87249ff2f58806c2464f87afcb3c32c62e8':
  Hide Experimental WebView from dev settings DO NOT MERGE
 2013-10-08 10:22:01 -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
3bd13f3a74 am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '6079dbc1ae0fe0c8c8d642d072514e1ea94d1ac5':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 07:23:05 -07: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
34eb4f3d16 am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '4730dda880097b1c25096e323be8a527fd6e0b09':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-03 15:39:42 -07: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
dc7053be9f am 4e31b804: Merge "Update WebView documentation section about zoom." into klp-dev 
* commit '4e31b8046da047d5286532776d6d169e09d21ce5':
  Update WebView documentation section about zoom.
 2013-09-24 02:52:20 -07:00
Martin Kosiba
4e31b8046d Merge "Update WebView documentation section about zoom." into klp-dev 2013-09-24 09:49:22 +00:00
Jonathan Dixon
1421827bae am 6c025eaf: Merge "WebView: add an API method to control web contents debugging" into klp-dev 
* commit '6c025eaf29634d248bf067c2d9967e1905863f0c':
  WebView: add an API method to control web contents debugging
 2013-09-20 20:44:26 -07: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
515134e88c am c7969dea: Merge "Fix obsolete API reference" into klp-dev 
* commit 'c7969dea24f2e362f69fb2b912c8a0385f5dc617':
  Fix obsolete API reference
 2013-09-18 13:10:15 -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
b7bdf38bf1 am 01fc0884: Merge "Update APIs for the Chromium WebView" into klp-dev 
* commit '01fc088462d05478bcdf416fb02532d53e85dd6a':
  Update APIs for the Chromium WebView
 2013-09-18 12:17:58 -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
a25f350add am 7c0e2122: Merge "Revert "Hide Experimental WebView from dev settings" DO NOT MERGE" into klp-dev 
* commit '7c0e2122c0e9bcb83c082156d5f5300b7f62169b':
  Revert "Hide Experimental WebView from dev settings" DO NOT MERGE
 2013-09-15 20:34:31 -07:00
Jonathan Dixon
1dd56b656b am c39a9ca9: Merge "Hide Experimental WebView from dev settings DO NOT MERGE" into klp-dev 
* commit 'c39a9ca95d98e70fc1de8a1b3aeaf7e7075ff868':
  Hide Experimental WebView from dev settings DO NOT MERGE
 2013-09-15 20:29:55 -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
Kenny Root
7bc59add59 am 753c1a33: am 457f0f5e: Merge "Move helper function to webkit" 
* commit '753c1a3342357eed6b29c08ad8ca708755d84390':
  Move helper function to webkit
 2013-09-12 23:39:01 -07:00
Kenny Root
cb4317a5a7 Move helper function to webkit 
This particular helper function is being removed from NativeCrypto, so
move it here as it's the last user of it.

Change-Id: Iea13ba499487d838068d6156d4d1e6861d05eb36
 2013-09-12 23:00:54 -07: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
Ben Murdoch
c9f10b6be9 Revert "Flag-flip: set chromium to be the default WebView" 
We need to wait until GMail corruption fix is in.

This reverts commit 6716bd3375.

Change-Id: Ie3c335e18901d24d878f81fb76b7065520fa32e5
 2013-07-31 11:27:33 +00:00
Ben Murdoch
5b537bf320 Merge "Flag-flip: set chromium to be the default WebView" 2013-07-31 09:14:11 +00:00
Ben Murdoch
dabc6fc8a9 Merge "Unhide WebView.evaluateJavascript(..)" 2013-07-31 09:13:27 +00:00
Jonathan Dixon
6716bd3375 Flag-flip: set chromium to be the default WebView 
For now, can still be disabled in Developer Settings.

Change-Id: Id871d1e232de7b3c7be42c7734f2bb83dc526b32
 2013-07-30 20:26:52 -07:00
Jonathan Dixon
dad2c6e3fa Merge "Add some logging when the webview dev setting changes" 2013-07-30 23:29:57 +00:00