diff options
| author | Grace Kloba <klobag@google.com> | 2009-12-07 10:11:28 -0800 |
|---|---|---|
| committer | Grace Kloba <klobag@google.com> | 2009-12-07 12:36:05 -0800 |
| commit | bd5c823e28d907d85b8d0867133343ccda014451 (patch) | |
| tree | 2f5d747a413982166a2fbf9646705f9249944e61 /core/java/android/webkit/FrameLoader.java | |
| parent | 8c7ab034692eea550b97bebd7746e1a82735bbbd (diff) | |
| download | frameworks_base-bd5c823e28d907d85b8d0867133343ccda014451.zip frameworks_base-bd5c823e28d907d85b8d0867133343ccda014451.tar.gz frameworks_base-bd5c823e28d907d85b8d0867133343ccda014451.tar.bz2 | |
Add "res" support for WebView.
http://b/issue?id=2296839
Diffstat (limited to 'core/java/android/webkit/FrameLoader.java')
| -rw-r--r-- | core/java/android/webkit/FrameLoader.java | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/core/java/android/webkit/FrameLoader.java b/core/java/android/webkit/FrameLoader.java index c3dac6e..51f60c3 100644 --- a/core/java/android/webkit/FrameLoader.java +++ b/core/java/android/webkit/FrameLoader.java @@ -142,11 +142,15 @@ class FrameLoader { } if (URLUtil.isAssetUrl(url)) { FileLoader.requestUrl(url, loadListener, loadListener.getContext(), - true, settings.getAllowFileAccess()); + FileLoader.TYPE_ASSET, true); + return true; + } else if (URLUtil.isResourceUrl(url)) { + FileLoader.requestUrl(url, loadListener, loadListener.getContext(), + FileLoader.TYPE_RES, true); return true; } else if (URLUtil.isFileUrl(url)) { FileLoader.requestUrl(url, loadListener, loadListener.getContext(), - false, settings.getAllowFileAccess()); + FileLoader.TYPE_FILE, settings.getAllowFileAccess()); return true; } else if (URLUtil.isContentUrl(url)) { // Send the raw url to the ContentLoader because it will do a |