Commit Graph

3266 Commits

Author SHA1 Message Date
Torne (Richard Coles)
8c1db3734f Merge "Fix typo in WebSettings javadoc." 2015-03-06 17:25:49 +00:00
Torne (Richard Coles)
2b666c96e2 Fix typo in WebSettings javadoc.
We accidentally repeated the same enum value twice; fixed to mention the
three values correctly.

Change-Id: Iba6a7edd8e1a5b429728056a8f56634427758c73
2015-03-06 14:20:00 +00:00
Mikhail Naganov
25e8954573 Provide better error reporting for WebView
Add new callbacks into WebViewClient that will provide notifications
about subresource loading errors and HTTP errors received from servers.

Bug: 19313118
Change-Id: Idb47f53ef7e72cb95f3e9b89d1e238d69e896b8b
2015-03-06 10:12:14 +00:00
Ed Heyl
93cbe27804 Fix build: Revert "Add potential future APIs for postmessage"
This reverts commit 37bd8907cb.
2015-03-02 16:03:52 -08:00
Selim Gurun
61c5cf135d am 4de38166: am aef98356: am 9fc8356b: Merge "Add potential future APIs for postmessage"
* commit '4de38166c6dbc1108a64cf772abe61b6ddaa2804':
  Add potential future APIs for postmessage
2015-03-02 23:21:54 +00:00
Selim Gurun
aef983562a am 9fc8356b: Merge "Add potential future APIs for postmessage"
* commit '9fc8356baa7816a13e0c140788ccf67301cbd28d':
  Add potential future APIs for postmessage
2015-03-02 23:07:36 +00:00
Selim Gurun
37bd8907cb Add potential future APIs for postmessage
Bug: 10237116

The APIs are hidden while work is ongoing.

Change-Id: I3e2f06d6e41af276171b127f06bdd74924c2e74c
2015-03-02 14:53:01 -08:00
John Spurlock
08c7116ab9 Remove unused imports in frameworks/base.
Change-Id: I031443de83f93eb57a98863001826671b18f3b17
2015-02-28 14:47:49 -05:00
Narayan Kamath
3bdd327f85 Move apache specific portions of android.net.http to external/apache-http.
We continue to compile external/apache-http into ext.jar. This contains
a few changes apart fom the classes moving around :

- Makefile changes to build docs and api-stubs for now. A future change
  will revert these changes and remove these classes from stubs and
  docs.
- Hardcode event IDs in legacyerrorstrings to avoid a dependency between
  the frameworks and apache. These strings are on their way out and will
  never change anyway.
- Remove imports due to {@link} tags and use {@code} instead.
- Remove an accidental(?) dependency on apache commons code that's a
  part of apache-http.

bug: 18027885

Change-Id: I51cd038d846ec7d02c283a4541b10a6a9cf62ecf
2015-02-12 11:15:49 +00:00
Dianne Hackborn
a7bb6fbeab First quick implementation of auto assist data.
Introduce new AssistData class that contains all data
the framework automatically generates for assist.  Currently
populated with a very simple tree structure representing
the app's view hierarchy.

Reworked how we populate the class name for accessibility
info, so this is provided through a new method call on View
that subclasses can override.  This method is also used
to populate the class name in AssistData.

Change-Id: Ibd0acdc8354727d4291473283b5e4b70894905dc
2015-02-06 10:42:44 -08:00
Marcin Kosiba
d26b16cbdf Merge "Update docs to say onPageStarted is not called for fragment navigations." 2015-02-02 10:22:43 +00:00
Marcin Kosiba
16687cc956 Update docs to say onPageStarted is not called for fragment navigations.
BUG: 5014122
Change-Id: I264f99cb01496895f5ed77bfb3a5a45329bca53e
2015-01-27 17:35:49 +00:00
Marcin Kosiba
fbdb13e91d Update docs for WebResourceRequest.hasUserGesture.
WebResourceRequest.hasUserGesture will be false for new windows for
example. Update docs to say we sometimes say false even though
it 'should' be true.

BUG: 17963383
Change-Id: I877fc7179443647ea6c9dcf8607242874bbe9e09
2015-01-27 17:00:17 +00:00
Ignacio Solla
3fed946aee Merge "[WebView] Improve documentation around full screen mode." 2015-01-22 10:55:19 +00:00
Ignacio Solla
7a4e18f8b8 [WebView] Improve documentation around full screen mode.
onShowCustomView and onHideCustomView are only used for full screen
support so we make that more explicit now (perhaps we should consider
rename and deprecate).

In M40 the WebView will also support full screen for non <video>
elements so we also consider that use case.

Change-Id: Ie4e245defbdd3e53bff98ac73305dd5e5e46334c
2015-01-22 10:35:07 +00:00
Marcin Kosiba
3e853fb1d2 Un-break the WebView build.
This renames methods that have been renamed in
Ib9d403156c1fc4fb04f65f3c126d1277a44b3740 back to their original
names.

Change-Id: I07b2fb94b21c42c36958855d19d996f96b0ce5c4
2015-01-08 12:45:40 +00:00
Alan Viverette
2d4c476aca Merge "Fix accessibility delegation" 2015-01-08 00:07:25 +00:00
Alan Viverette
a54956a0bc Fix accessibility delegation
Ensures that delegate code is run last. Previously, calling the super
method from an accessibility delegate set on a widget would only run
code in the widget's parent. Next, the delegate code would run. Finally,
the widget's code would run. As a result, the widget code would override
any data supplied by the delegate.

By moving all overridden code to internal methods, we ensure that the
call chain for super includes the widget's parent code followed by the
widget's code. The delegate code will always run last.

BUG: 17641433
Change-Id: Ib9d403156c1fc4fb04f65f3c126d1277a44b3740
2015-01-07 16:05:02 -08:00
Ben Murdoch
bc20686f92 am 6a3e7015: am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
* commit '6a3e70159cbbd3c4b7df89165c280ea4f7d56fa5':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
2015-01-07 16:06:33 +00:00
Ben Murdoch
6a3e70159c am d4bc9577: am 1eee52b1: Merge "Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation." into lmp-mr1-dev
* commit 'd4bc95770ddfcb8be63fa768ac9eaf27512f8107':
  Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
2015-01-07 16:01:27 +00:00
Ben Murdoch
574fa34dd5 Add <ol> formatting to WebView#enableSlowWholeDocumentDraw documentation.
Bug:18072267
Change-Id: I21eec752ca9a0a6c0dab92f3748e687dd13961fa
2015-01-07 15:13:48 +00:00
Marcin Kosiba
84644f107d Add WebView documentation about the layout height parameter.
BUG: 12825214
Change-Id: I8e0e8b79af1a5358307de34e1b4238ec9a1d19ad
2014-12-15 11:26:16 +00:00
Paul Miller
9d67f36651 Update CookieManager documentation
The CookieManager documentation became incorrect after deprecating
CookieSyncManager. Remove the note about CookieSyncManager.

code.google.com/p/android/issues/detail?id=82052

Change-Id: I13bc52716cd71e47b67148186a69f7269e418864
2014-12-12 22:08:03 +00:00
Narayan Kamath
24009c1b87 am f1459604: am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit 'f1459604392dc0416500e149f1bafa11139dcfcc':
  Stop using ErrorStrings for apache.
2014-11-27 18:09:40 +00:00
Narayan Kamath
f145960439 am ed2c9c60: am 10a36fb7: Merge "Stop using ErrorStrings for apache."
* commit 'ed2c9c6029b18df9c25d6c98c909ac5f300d6ab1':
  Stop using ErrorStrings for apache.
2014-11-27 18:03:15 +00:00
Narayan Kamath
f1a9b1bc24 Stop using ErrorStrings for apache.
These strings only ever end up in logcat (at best), so there's no
point having them translated. Also, rename the ErrorStrings class
and move it android.webkit where the last remaining caller lives.

(congrats webview people, this is now your mess to maintain.)

Change-Id: I04dae37c34191b26a69282970318c1b782af1edf
2014-11-27 17:23:41 +00:00
Ignacio Solla
03c76e2b55 Merge "[WebView] Remove fallback call to WebViewFactoryProvider no-arg constructor." 2014-11-27 15:28:01 +00:00
Ignacio Solla
ea1d90f5da [WebView] Allow the WebView to be compiled against the system SDK.
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
2014-11-25 17:03:49 +00:00
Narayan Kamath
57616d3e55 resolved conflicts for merge of 18e3727f to master
Change-Id: I3d74db13f163ac3f23955b6c7d8469e7a8f93066
2014-11-21 11:57:07 +00:00
John Reck
18e3727f68 am 0b2dac34: Merge "Rename callDrawGLFunction" into lmp-mr1-dev
automerge: 9b5d427

* commit '9b5d427fe0e557d572657252e7b5a3fd99a74550':
  Rename callDrawGLFunction
2014-11-21 02:55:00 +00:00
John Reck
680df8d60e Rename callDrawGLFunction
Bug: 18471503
Change-Id: I00cb356ff2338da7fd07b9ba30b5b3dcbdffdb2e
2014-11-20 14:40:52 -08:00
Ignacio Solla
e7cf27b664 [WebView] Interface to access hidden APIs. (DO NOT MERGE)
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
(cherry picked from commits 94ef789f0c
 and 53f2569487)
2014-11-19 21:47:13 +00:00
Jeff Sharkey
2d55c4e2e8 am b536c7a6: am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev automerge: 47d2c97
* commit 'b536c7a69340b85ef70197bbc4e443205110e2a5':
  Block loading WebView in privileged processes.
2014-11-14 21:55:52 +00:00
Jeff Sharkey
b536c7a693 am 27936ad3: Merge "Block loading WebView in privileged processes." into lmp-mr1-dev
automerge: 47d2c97

* commit '47d2c97e7084a676fe2b4d96683912279046b28c':
  Block loading WebView in privileged processes.
2014-11-14 21:47:17 +00:00
Jeff Sharkey
27936ad3a6 Merge "Block loading WebView in privileged processes." into lmp-mr1-dev 2014-11-14 19:24:53 +00:00
Jeff Sharkey
85844916b8 Block loading WebView in privileged processes.
WebView is very powerful, but it also has a large attack area.  To
improve security, refuse to load WebView components when running as
the root or system UIDs.

Bug: 18376908
Change-Id: I515b819033586076b1a9668023bb43ee0295d003
2014-11-14 11:02:27 -08:00
Ignacio Solla
7617704dfa am b993a4c7: am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
* commit 'b993a4c70b55344d35b0435cd3cdbb29c3a50809':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-14 00:43:27 +00:00
Ignacio Solla
b993a4c70b am f3bd15cf: am bf79cbab: Merge "[WebView] Allow the WebView to be compiled against the system SDK." into lmp-mr1-dev
* commit 'f3bd15cf80ecc748fbd232fec31fdf18d06e48a1':
  [WebView] Allow the WebView to be compiled against the system SDK.
2014-11-13 15:20:29 +00:00
Ignacio Solla
1ea39b350c [WebView] Remove fallback call to WebViewFactoryProvider no-arg constructor.
This change depends on 584201, in which the NullWebViewFactoryProvider constructor
is replaced with a version taking a WebViewDelegate as an arg.

BUG:18152150
Change-Id: I6c1e3f31a9de46dc12058328abead9c0ba2d376e
2014-11-13 01:44:27 +00:00
Ignacio Solla
d48fe73063 am 4fc66e58: am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev
* commit '4fc66e582ac25c875e3131ca055daeddc284387f':
  Fix docs build breakage
2014-11-13 00:00:15 +00:00
Ignacio Solla
84ee41f507 am fd003c70: am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev
* commit 'fd003c707e57326a463acd31c232fc9ad306ec92':
  [WebView] Interface to access hidden APIs.
2014-11-12 23:59:53 +00:00
Ignacio Solla
4fc66e582a am ba1d4cd4: am c3631b98: Merge "Fix docs build breakage" into lmp-mr1-dev
* commit 'ba1d4cd4fe65e60ba3eaef9cfbe93cb99424ef47':
  Fix docs build breakage
2014-11-12 23:49:31 +00:00
Ignacio Solla
fd003c707e am dfb25b3d: am 10ece9c9: Merge "[WebView] Interface to access hidden APIs." into lmp-mr1-dev
* commit 'dfb25b3dec64fb9537d5f34771b7f4a1812925b9':
  [WebView] Interface to access hidden APIs.
2014-11-12 23:49:13 +00:00
Ignacio Solla
451e338c51 [WebView] Allow the WebView to be compiled against the system SDK.
BUG:18152150
Change-Id: Ifd6dcac17663631058d895c61bb6e8018c5aeecc
2014-11-12 22:49:56 +00:00
Ignacio Solla
53f2569487 Fix docs build breakage
Change-Id: Id20a54d8da2b80f277e31c342fffbb3b7d0dc854
2014-11-12 21:55:47 +00:00
Ignacio Solla
94ef789f0c [WebView] Interface to access hidden APIs.
The WeView provider implementation needs access to
these APIs to implement the WebView functionality.

BUG:18152150

Change-Id: I6b41c623b1e8a776dcee8977d0d17259cb4b34f1
2014-11-10 10:31:12 +00:00
Marcin Kosiba
8609c6793a am 103817ed: am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
* commit '103817ed366fbb604a3ab078ad0a1a28f615a21a':
  Remove the default WebView text encoding resource entirely.
2014-10-13 09:59:54 +00:00
Marcin Kosiba
103817ed36 am 4c8dd87a: am 58ee8a96: am 4f3ee426: am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
* commit '4c8dd87a9e952a3ca157411b1a374c83064c9b2f':
  Remove the default WebView text encoding resource entirely.
2014-10-13 09:55:22 +00:00
Marcin Kosiba
1de5704943 am 43751757: Merge "Remove the default WebView text encoding resource entirely." into lmp-dev
* commit '437517573b53b17765eba9b0b98055915bf3a4a1':
  Remove the default WebView text encoding resource entirely.
2014-10-13 09:44:58 +00:00
Marcin Kosiba
fd1ac83f63 Remove the default WebView text encoding resource entirely.
Having the default text encoding in config.xml makes it seem like
it's something that could be changed, but upon further inspection
we can't see any good reason for anyone to ever want to change it
from UTF-8.

BUG: 17634120
Change-Id: I10a09ab1d65590c29efb10222abfa08ca52b5c84
2014-10-10 17:20:58 +01:00