Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
128,438 Commits 3 Branches 0 Tags
73203ebf976c403e40deabc15beb5ef01ac20cb0
Commit Graph

3086 Commits

Author SHA1 Message Date
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
John Reck
34dbce14e8 Switch WebView to onDetachedFromWindowInternal 
Change-Id: I1036f48f3c98492421430c3894f937884fb4c63e
 2014-03-06 15:54:54 -08: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
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
Torne (Richard Coles)
92dd5ada8a Resolved conflicts for merge of db931a3b to master 
Change-Id: I5d71df1e2272b8fc35e5f1e0346284704b9d62ff
 2013-10-15 13:48:58 +01:00
Torne (Richard Coles)
db931a3b2b am a1ba29ac: am d892afc8: Remove support for switching WebView. 
* commit 'a1ba29acc4a6709f74fb7fefdcdb66adc71c849a':
  Remove support for switching WebView.
 2013-10-15 03:41: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
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