diff --git a/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java b/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java index c816b31bc..00e19bf77 100644 --- a/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java +++ b/samples/ApiDemos/src/com/example/android/apis/view/Focus1.java @@ -37,7 +37,7 @@ public class Focus1 extends Activity { WebView webView = (WebView) findViewById(R.id.rssWebView); webView.loadData( "Can I focus?
No I cannot!.", - "text/html", "utf-8"); + "text/html", null); ListView listView = (ListView) findViewById(R.id.rssListView); listView.setAdapter(new ArrayAdapter(this, diff --git a/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java b/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java index 1cef0347d..d6a4efe6f 100644 --- a/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java +++ b/samples/ApiDemos/src/com/example/android/apis/view/WebView1.java @@ -35,38 +35,37 @@ public class WebView1 extends Activity { setContentView(R.layout.webview_1); final String mimeType = "text/html"; - final String encoding = "utf-8"; WebView wv; wv = (WebView) findViewById(R.id.wv1); - wv.loadData("Hello World! - 1", mimeType, encoding); + wv.loadData("Hello World! - 1", mimeType, null); wv = (WebView) findViewById(R.id.wv2); - wv.loadData("Hello World! - 2", mimeType, encoding); + wv.loadData("Hello World! - 2", mimeType, null); wv = (WebView) findViewById(R.id.wv3); - wv.loadData("Hello World! - 3", mimeType, encoding); + wv.loadData("Hello World! - 3", mimeType, null); wv = (WebView) findViewById(R.id.wv4); - wv.loadData("Hello World! - 4", mimeType, encoding); + wv.loadData("Hello World! - 4", mimeType, null); wv = (WebView) findViewById(R.id.wv5); - wv.loadData("Hello World! - 5", mimeType, encoding); + wv.loadData("Hello World! - 5", mimeType, null); wv = (WebView) findViewById(R.id.wv6); - wv.loadData("Hello World! - 6", mimeType, encoding); + wv.loadData("Hello World! - 6", mimeType, null); wv = (WebView) findViewById(R.id.wv7); - wv.loadData("Hello World! - 7", mimeType, encoding); + wv.loadData("Hello World! - 7", mimeType, null); wv = (WebView) findViewById(R.id.wv8); - wv.loadData("Hello World! - 8", mimeType, encoding); + wv.loadData("Hello World! - 8", mimeType, null); wv = (WebView) findViewById(R.id.wv9); - wv.loadData("Hello World! - 9", mimeType, encoding); + wv.loadData("Hello World! - 9", mimeType, null); wv = (WebView) findViewById(R.id.wv10); - wv.loadData("Hello World! - 10", mimeType, encoding); + wv.loadData("Hello World! - 10", mimeType, null); } } diff --git a/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java b/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java index 0d59bfd00..b479d955a 100644 --- a/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java +++ b/samples/MySampleRss/src/com/example/codelab/rssexample/MyRssReader5.java @@ -95,12 +95,12 @@ public class MyRssReader5 extends Activity implements OnItemSelectedListener { mLogger.warning("MyRssReader5.onItemSelected() couldn't get the content" + "from the cursor " + e.getMessage()); } - mWebView.loadData(content, "text/html", "utf-8"); + mWebView.loadData(content, "text/html", null); } //END_INCLUDE(5_4) public void onNothingSelected(AdapterView parent){ - mWebView.loadData("

No selection chosen

", "text/html", "utf-8"); + mWebView.loadData("

No selection chosen

", "text/html", null); } // Store our state before we are potentially bumped from memory.