diff --git a/docs/html/images/screens_support/avds-config.png b/docs/html/images/screens_support/avds-config.png index 97bd5f6d0b4ff..e60944722c329 100644 Binary files a/docs/html/images/screens_support/avds-config.png and b/docs/html/images/screens_support/avds-config.png differ diff --git a/docs/html/images/training/firstapp/adt-firstapp-setup.png b/docs/html/images/training/firstapp/adt-firstapp-setup.png index bf95285969274..05e147dfb40d3 100644 Binary files a/docs/html/images/training/firstapp/adt-firstapp-setup.png and b/docs/html/images/training/firstapp/adt-firstapp-setup.png differ diff --git a/docs/html/images/training/firstapp/adt-new-activity.png b/docs/html/images/training/firstapp/adt-new-activity.png index c396793655c7b..2c32dcc8055a4 100644 Binary files a/docs/html/images/training/firstapp/adt-new-activity.png and b/docs/html/images/training/firstapp/adt-new-activity.png differ diff --git a/docs/html/images/training/firstapp/edittext_gravity.png b/docs/html/images/training/firstapp/edittext_gravity.png index f78e67671c11a..bc4f7ee8f4390 100644 Binary files a/docs/html/images/training/firstapp/edittext_gravity.png and b/docs/html/images/training/firstapp/edittext_gravity.png differ diff --git a/docs/html/images/training/firstapp/edittext_wrap.png b/docs/html/images/training/firstapp/edittext_wrap.png index 156776d776994..fe56731a38c91 100644 Binary files a/docs/html/images/training/firstapp/edittext_wrap.png and b/docs/html/images/training/firstapp/edittext_wrap.png differ diff --git a/docs/html/images/training/firstapp/firstapp.png b/docs/html/images/training/firstapp/firstapp.png index d69cd2008fd5a..581e00048ce7c 100644 Binary files a/docs/html/images/training/firstapp/firstapp.png and b/docs/html/images/training/firstapp/firstapp.png differ diff --git a/docs/html/training/basics/firstapp/building-ui.jd b/docs/html/training/basics/firstapp/building-ui.jd index 2615bee81feb3..179b3ac445a24 100644 --- a/docs/html/training/basics/firstapp/building-ui.jd +++ b/docs/html/training/basics/firstapp/building-ui.jd @@ -75,16 +75,16 @@ content of the text field to another activity.

Create a Linear Layout

-

Open the activity_main.xml file from the res/layout/ +

Open the fragment_main.xml file from the res/layout/ directory.

Note: In Eclipse, when you open a layout file, you’re first shown the Graphical Layout editor. This is an editor that helps you build layouts using WYSIWYG tools. For this -lesson, you’re going to work directly with the XML, so click the activity_main.xml tab at +lesson, you’re going to work directly with the XML, so click the fragment_main.xml tab at the bottom of the screen to open the XML editor.

The BlankActivity template you chose when you created this project includes the -activity_main.xml file with a {@link +fragment_main.xml file with a {@link android.widget.RelativeLayout} root view and a {@link android.widget.TextView} child view.

First, delete the {@link android.widget.TextView <TextView>} element and change the {@link @@ -95,7 +95,6 @@ android:orientation} attribute and set it to "horizontal". The result looks like this:

-<?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
diff --git a/docs/html/training/basics/firstapp/creating-project.jd b/docs/html/training/basics/firstapp/creating-project.jd
index 9516e378afd47..50485dbe8c446 100644
--- a/docs/html/training/basics/firstapp/creating-project.jd
+++ b/docs/html/training/basics/firstapp/creating-project.jd
@@ -120,8 +120,8 @@ devices.
     Finish.
 
 
-

Your Android project is now set up with some default files and you’re ready to begin -building the app. Continue to the next lesson.

+

Your Android project is now a basic "Hello World" app that contains some default files. +To run the app, continue to the next lesson.

@@ -155,8 +155,8 @@ and replace projects.

-

Your Android project is now set up with several default configurations and you’re ready to begin -building the app. Continue to the next lesson.

+

Your Android project is now a basic "Hello World" app that contains some default files. +To run the app, continue to the next lesson.

Tip: Add the platform-tools/ as well as the tools/ directory to your PATH environment variable.

diff --git a/docs/html/training/basics/firstapp/running-app.jd b/docs/html/training/basics/firstapp/running-app.jd index 999d399f3d50a..23cedba1e8b90 100644 --- a/docs/html/training/basics/firstapp/running-app.jd +++ b/docs/html/training/basics/firstapp/running-app.jd @@ -62,7 +62,7 @@ href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#target">{@code andro attributes. For your first app, it should look like this:

 <manifest xmlns:android="http://schemas.android.com/apk/res/android" ... >
-    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="17" />
+    <uses-sdk android:minSdkVersion="8" android:targetSdkVersion="19" />
     ...
 </manifest>
 
diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd index 712eabc424c8a..9aa25a375707e 100644 --- a/docs/html/training/basics/firstapp/starting-activity.jd +++ b/docs/html/training/basics/firstapp/starting-activity.jd @@ -45,7 +45,7 @@ starts a new activity when the user clicks the Send button.

Respond to the Send Button

-

To respond to the button's on-click event, open the activity_main.xml +

To respond to the button's on-click event, open the fragment_main.xml layout file and add the {@code android:onClick} attribute to the {@link android.widget.Button <Button>} element:

@@ -73,14 +73,6 @@ public void sendMessage(View view) { }
-

This requires that you import the {@link android.view.View} class:

-
-import android.view.View;
-
- -

Tip: In Eclipse, press Ctrl + Shift + O to import missing classes -(Cmd + Shift + O on Mac).

-

In order for the system to match this method to the method name given to {@code android:onClick}, the signature must be exactly as shown. Specifically, the method must:

@@ -111,6 +103,14 @@ an activity called {@code DisplayMessageActivity}:

Intent intent = new Intent(this, DisplayMessageActivity.class); +

This requires that you import the {@link android.content.Intent} class:

+
+import android.content.Intent;
+
+ +

Tip: In Eclipse, press Ctrl + Shift + O to import missing classes +(Cmd + Shift + O on Mac).

+

The constructor used here takes two parameters: