Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
114,525 Commits 3 Branches 0 Tags
e6ed04a7ec5bbb643bc912ec8fcd4d23ec486fca
Commit Graph

3046 Commits

Author SHA1 Message Date
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
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
Jonathan Dixon
cd3f03d444 am 4a079d44: am 39c9c632: Merge "Reset the Experimental WebView property per build" into klp-dev 
* commit '4a079d44c963a63e2cb497cd6454afb3a2754510':
  Reset the Experimental WebView property per build
 2013-08-21 22:07:49 -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
Jonathan Dixon
4f28d70aa3 Merge "Fix nit - use primative type and make volatile" 2013-08-21 21:58:41 +00:00
Jonathan Dixon
0d6a1451d5 Fix nit - use primative type and make volatile 
Doesn't need a boxed boolean. Technically might get read on many thread
so making it volatile too.

Change-Id: I7c96d03fe3680310e39e67f4ab59d0cfa4696d23
 2013-08-21 13:09:36 -07:00
Selim Gurun
b7a3740773 Revert "Added the callback signal." 
Change-Id: I18de018060f80f85e0534a069b2f5c6ecd2c8177
(cherry picked from commit f295ad0c50e56a358bba53ca3861f4558479da8e)
 2013-08-21 00:16:57 +00: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