summaryrefslogtreecommitdiffstats
path: root/core/java
diff options
context:
space:
mode:
authorAndroid (Google) Code Review <android-gerrit@google.com>2009-06-01 15:22:18 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2009-06-01 15:22:18 -0700
commit2ba3223cc9a4deb2980ba3c15a9b25c5652166a8 (patch)
tree424e01c663fd82b64f5ea398e565e4bfd95420a7 /core/java
parentc17f16e33a0fca7efa10e758a526cd8d5d3a31f3 (diff)
parent8cb6617107475c8b579f3bfbef24825c86ce32c5 (diff)
downloadframeworks_base-2ba3223cc9a4deb2980ba3c15a9b25c5652166a8.zip
frameworks_base-2ba3223cc9a4deb2980ba3c15a9b25c5652166a8.tar.gz
frameworks_base-2ba3223cc9a4deb2980ba3c15a9b25c5652166a8.tar.bz2
Merge change 2855 into donut
* changes: Add a new method to load html data into the WebView.
Diffstat (limited to 'core/java')
-rw-r--r--core/java/com/google/android/util/GoogleWebContentHelper.java9
1 files changed, 8 insertions, 1 deletions
diff --git a/core/java/com/google/android/util/GoogleWebContentHelper.java b/core/java/com/google/android/util/GoogleWebContentHelper.java
index 2911420..3cdf855 100644
--- a/core/java/com/google/android/util/GoogleWebContentHelper.java
+++ b/core/java/com/google/android/util/GoogleWebContentHelper.java
@@ -130,7 +130,14 @@ public class GoogleWebContentHelper {
mWebView.loadUrl(mSecureUrl);
return this;
}
-
+
+ public GoogleWebContentHelper loadDataWithFailUrl(String base, String data,
+ String mimeType, String encoding, String failUrl) {
+ ensureViews();
+ mWebView.loadDataWithBaseURL(base, data, mimeType, encoding, failUrl);
+ return this;
+ }
+
/**
* Helper to handle the back key. Returns true if the back key was handled,
* otherwise returns false.