Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
117,406 Commits 3 Branches 0 Tags
cf2d725b554d1af322e3f2139d52f08b00a47ad3
Commit Graph

3068 Commits

Author SHA1 Message Date
Jonathan Dixon
b212b9f2ba 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
 2013-10-09 17:28:13 -07:00
Jonathan Dixon
bd88529d28 am 1bb6a7dc: am a8137c0c: am b1b2789d: Merge "Do not require WebView usage to come from main thread" into klp-dev 
* commit '1bb6a7dce9df82eb65bc293b3ef387365ef59455':
  Do not require WebView usage to come from main thread
 2013-10-09 16:32:59 -07:00
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
13ca868b82 am 3bd13f3a: am 6079dbc1: am 050c552f: Fix CookieSyncManager for WebViewClassic 
* commit '3bd13f3a74a2dd47c217fda206490334747293cc':
  Fix CookieSyncManager for WebViewClassic
 2013-10-04 11:10:48 -07:00
Jonathan Dixon
4aa55c006f am 34eb4f3d: am 4730dda8: am 46507f4b: Merge "Decouple construction of WebView, CookieSyncManager, WebViewDatabase" into klp-dev 
* commit '34eb4f3d167cb0af07f772a1bfe56603ec3dd268':
  Decouple construction of WebView, CookieSyncManager, WebViewDatabase
 2013-10-04 09:11:28 -07: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
8ed79f45d6 am dc7053be: am 4e31b804: Merge "Update WebView documentation section about zoom." into klp-dev 
* commit 'dc7053be9ff1b89464063ed6a338fd29580b5abf':
  Update WebView documentation section about zoom.
 2013-09-24 10:26:10 -07: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
90102e2ccc resolved conflicts for merge of 1421827b to master 
Simple resolve: two new methods added to same class.

Conflicts:
	core/java/android/webkit/WebViewFactoryProvider.java

Change-Id: Ic8b26f2a51279348b19a9c5b30d492f67d62ca81
 2013-09-21 10:48:28 -07: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
Selim Gurun
abb6fbdfb8 Merge "Trace extra headers set by loadurl." 2013-09-21 01:17:25 +00:00
Selim Gurun
90b48b2cde Trace extra headers set by loadurl. 
When tracing webview, also trace application set headers.

Change-Id: Ie93cb1ad143072f4a34f6b18148ff21962c3a068
 2013-09-20 18:08:46 -07: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
cfdcdf9f3f am 515134e8: am c7969dea: Merge "Fix obsolete API reference" into klp-dev 
* commit '515134e88c0c1cdfb06a1ec22946554d2d98c8d2':
  Fix obsolete API reference
 2013-09-18 13:13:03 -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
322fe808e3 am b7bdf38b: am 01fc0884: Merge "Update APIs for the Chromium WebView" into klp-dev 
* commit 'b7bdf38bf1d202c844e667f3074bc43f298f11f9':
  Update APIs for the Chromium WebView
 2013-09-18 12:22:20 -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
add53aeaeb am 7bc59add: am 753c1a33: am 457f0f5e: Merge "Move helper function to webkit" 
* commit '7bc59add59412f2461213d0ff7ea59b2ac76cec0':
  Move helper function to webkit
 2013-09-12 23:41:41 -07: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
da7d642253 Publish Print Api for Webview 
Bug:10652036

Change-Id: Ibcc7e48f4e4ce1bc437c0d3fb89d3d66a90dca64

This is a cherry-pick of a5c86c644b
to prevent a automerger failure.

Conflicts:
	core/java/android/webkit/WebView.java
	core/java/android/webkit/WebViewClassic.java
	core/java/android/webkit/WebViewProvider.java
 2013-09-12 18:12:16 -07:00
Primiano Tucci
2442675002 Adding freeMemoryForTests static method to WebView. 
This is going to be used by pagecycler tests.
See: b/10629847

Change-Id: Ie3fda214e7808429d7ed63734ab301525f58513f
 2013-09-12 10:58:29 +01: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
Alan Viverette
617feb99a0 Add View constructor that supplies a default style resource 
Also updates the constructor of every class that extends View.

BUG: 10676369
Change-Id: Ifaf27bf82028d180afa4931c0e906df88d858ac3
 2013-09-09 18:09:13 -07:00
Mikhail Naganov
1b48d039d3 am 708d279a: am 498a5f54: Merge "Add more docs for WebView\'s setInitialScale and setLoadWithOverviewMode" into klp-dev 
* commit '708d279a16e2c937da1a2247195eb738906c199e':
  Add more docs for WebView's setInitialScale and setLoadWithOverviewMode
 2013-09-06 09:52:49 -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
Chet Haase
672fcd5c9a am 04f31501: am a9fa33b3: Merge "Change build version from KEY_LIME_PIE to KITKAT" into klp-dev 
* commit '04f31501602a87ae9526983f4a92e623b4d68bb3':
  Change build version from KEY_LIME_PIE to KITKAT
 2013-09-05 10:13:34 -07: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
8c6a71ffd3 resolved conflicts for merge of b5539b68 to master 
Change-Id: I946c5faeed02b5bb2577eb871e53b2e15c67ddae
 2013-09-03 12:15:55 -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
Ben Murdoch
76208b7a0e am ca34af6a: am e2acbcc0: Merge "Fix for 10530176 - CookieSyncManager must be created by WebView c\'tor" into klp-dev 
* commit 'ca34af6ad3fbbdaa0eb2932cb5b17b187a1f86ec':
  Fix for 10530176 - CookieSyncManager must be created by WebView c'tor
 2013-08-30 02:09:25 -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