diff options
| author | Bart Sears <bsears@google.com> | 2011-10-13 16:25:29 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-10-13 16:25:29 -0700 |
| commit | bcfe41529b7bd9f572a2eff31375dc9fdf35b518 (patch) | |
| tree | f949c543e0e599d85fdce6d1b57861b5c614ddba /core | |
| parent | 6252a8b1167934d53fd76d5f0910d993390636ce (diff) | |
| parent | 33f962b22ec4ce30368a1b2847a868205ad6b99b (diff) | |
| download | frameworks_base-bcfe41529b7bd9f572a2eff31375dc9fdf35b518.zip frameworks_base-bcfe41529b7bd9f572a2eff31375dc9fdf35b518.tar.gz frameworks_base-bcfe41529b7bd9f572a2eff31375dc9fdf35b518.tar.bz2 | |
Merge "Improve JavaDoc for WebView.loadData()" into ics-mr0
Diffstat (limited to 'core')
| -rw-r--r-- | core/java/android/webkit/WebView.java | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/core/java/android/webkit/WebView.java b/core/java/android/webkit/WebView.java index 8da1820..1c22a0b 100644 --- a/core/java/android/webkit/WebView.java +++ b/core/java/android/webkit/WebView.java @@ -2079,10 +2079,12 @@ public class WebView extends AbsoluteLayout * <p> * The 'data' scheme URL formed by this method uses the default US-ASCII * charset. If you need need to set a different charset, you should form a - * 'data' scheme URL which specifies a charset parameter and call - * {@link #loadUrl(String)} instead. + * 'data' scheme URL which explicitly specifies a charset parameter in the + * mediatype portion of the URL and call {@link #loadUrl(String)} instead. + * Note that the charset obtained from the mediatype portion of a data URL + * always overrides that specified in the HTML or XML document itself. * @param data A String of data in the given encoding. - * @param mimeType The MIMEType of the data, e.g. 'text/html'. + * @param mimeType The MIME type of the data, e.g. 'text/html'. * @param encoding The encoding of the data. */ public void loadData(String data, String mimeType, String encoding) { |