diff options
| author | Mitsuru Oshima <oshima@google.com> | 2009-06-16 16:34:51 -0700 |
|---|---|---|
| committer | Mitsuru Oshima <oshima@google.com> | 2009-06-16 19:21:14 -0700 |
| commit | 7944b7def8b04c3dc0cb8815a8527aba8c91b219 (patch) | |
| tree | 66194f3a1eba8943e4f5d60e1c6749f0368f9f84 /src/com/android/browser | |
| parent | 60e095c190496d42327f8ec2ef990c044d15a76f (diff) | |
| download | packages_apps_Browser-7944b7def8b04c3dc0cb8815a8527aba8c91b219.zip packages_apps_Browser-7944b7def8b04c3dc0cb8815a8527aba8c91b219.tar.gz packages_apps_Browser-7944b7def8b04c3dc0cb8815a8527aba8c91b219.tar.bz2 | |
conflict fix
Diffstat (limited to 'src/com/android/browser')
| -rw-r--r-- | src/com/android/browser/BrowserActivity.java | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/com/android/browser/BrowserActivity.java b/src/com/android/browser/BrowserActivity.java index 4168dc4..e922679 100644 --- a/src/com/android/browser/BrowserActivity.java +++ b/src/com/android/browser/BrowserActivity.java @@ -4835,7 +4835,7 @@ public class BrowserActivity extends Activity return mUrl == null || mUrl.length() == 0; } - private void loadIn(WebView webView) { + public void loadIn(WebView webView) { if (mPostData != null) { webView.postUrl(mUrl, mPostData); } else { @@ -4858,12 +4858,13 @@ public class BrowserActivity extends Activity String mMimeType; String mInlined; String mEncoding; - + @Override boolean isEmpty() { return mInlined == null || mInlined.length() == 0 || super.isEmpty(); } - void loadIn(WebView webView) { + @Override + public void loadIn(WebView webView) { webView.loadDataWithBaseURL(null, mInlined, mMimeType, mEncoding, mUrl); } } |