diff options
Diffstat (limited to 'docs/html/guide/tutorials')
4 files changed, 14 insertions, 11 deletions
diff --git a/docs/html/guide/tutorials/hello-world.jd b/docs/html/guide/tutorials/hello-world.jd index 6e315b2..11e6497 100644 --- a/docs/html/guide/tutorials/hello-world.jd +++ b/docs/html/guide/tutorials/hello-world.jd @@ -23,9 +23,11 @@ It's particularly easy if you're using Eclipse as your IDE, because we've provid great plugin that handles your project creation and management to greatly speed-up your development cycles.</p> -<p>If you're not using Eclipse, that's okay. Familiarize yourself with -<a href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>. -You can then return to this tutorial and ignore anything about Eclipse.</p> +<p>If you are not using Eclipse, the tools provided by the Android SDK are accessible +on the command line, so you can choose your IDE or text editor. +For more information about developing with the Android SDK tools, see +the <a href="{@docRoot}guide/developing/index.html">Overview</a> +section for developing on Android.</p> <p>Before you start, you should already have the very latest SDK installed, and if you're using Eclipse, you should have installed the ADT plugin as well. If you have not installed these, see @@ -562,5 +564,6 @@ android create project \ <p>This creates the required folders and files for the project at the location defined by the <em>path</em>.</p> - <p>For more information on how to use the SDK tools to create and build projects, please read -<a href="{@docRoot}guide/developing/other-ide.html">Developing in Other IDEs</a>.</p> + <p>For more information on how to use the SDK tools to create and build projects on the command line, read +<a href="{@docRoot}guide/developing/projects/index.html">Creating and Managing Projects on the Command Line</a> and +<a href="{@docRoot}guide/developing/building/building-cmdline.html">Building and Running Apps on the Command Line</a>.</p> diff --git a/docs/html/guide/tutorials/notepad/notepad-ex2.jd b/docs/html/guide/tutorials/notepad/notepad-ex2.jd index a945a62..854731f 100644 --- a/docs/html/guide/tutorials/notepad/notepad-ex2.jd +++ b/docs/html/guide/tutorials/notepad/notepad-ex2.jd @@ -87,8 +87,8 @@ Open the Notepadv2 class.</p> menu callback used for the options menu. Here, we add just one line, which will add a menu item to delete a note. Call <code>menu.add()</code> like so: <pre> -public boolean onCreateContextMenu(Menu menu, View v - ContextMenuInfo menuInfo) { +public void onCreateContextMenu(Menu menu, View v, + ContextMenu.ContextMenuInfo menuInfo) { super.onCreateContextMenu(menu, v, menuInfo); menu.add(0, DELETE_ID, 0, R.string.menu_delete); }</pre> diff --git a/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd b/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd index 0d59b56..34f7063 100644 --- a/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd +++ b/docs/html/guide/tutorials/notepad/notepad-extra-credit.jd @@ -65,6 +65,6 @@ when.</p> <p>The Android Eclipse plugin not only offers excellent debugging support for your application development, but also superb profiling support. You can also -try using <a href="{@docRoot}guide/developing/tools/traceview.html">Traceview</a> to profile your application. If your application is running too slow, this can help you +try using <a href="{@docRoot}guide/developing/debugging/debugging-tracing.html">Traceview</a> to profile your application. If your application is running too slow, this can help you find the bottlenecks and fix them.</p> diff --git a/docs/html/guide/tutorials/views/hello-webview.jd b/docs/html/guide/tutorials/views/hello-webview.jd index c4388ea..a927b04 100644 --- a/docs/html/guide/tutorials/views/hello-webview.jd +++ b/docs/html/guide/tutorials/views/hello-webview.jd @@ -12,8 +12,8 @@ we'll create a simple Activity that can view web pages.</p> <pre> <?xml version="1.0" encoding="utf-8"?> <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android" - android:layout_width="wrap_content" - android:layout_height="wrap_content" + android:layout_width="fill_parent" + android:layout_height="fill_parent" android:orientation="vertical"> <WebView @@ -69,7 +69,7 @@ private class HelloWebViewClient extends WebViewClient { <li>Now, in the <code>onCreate()</code> method, set an instance of the <code>HelloWebViewClient</code> as our WebViewClient: - <pre>webview.setWebViewClient(new WebViewClientDemo());</pre> + <pre>webview.setWebViewClient(new HelloWebViewClient());</pre> <p>This line should immediately follow the initialization of our WebView object.</p> <p>What we've done is create a WebViewClient that will load any URL selected in our |