diff options
| author | Scott Main <smain@google.com> | 2012-08-13 19:12:13 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2012-08-13 19:12:13 -0700 |
| commit | 183bf116978e3c44292c9ead2bceb47e972624a1 (patch) | |
| tree | 9c612f9b9c61fcfb3661a1022c3dd414b5ecb7c2 /docs/html/training/basics | |
| parent | 3e504ac71715a1b152494c9765f41d13bc605b75 (diff) | |
| download | frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.zip frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.tar.gz frameworks_base-183bf116978e3c44292c9ead2bceb47e972624a1.tar.bz2 | |
docs: misc bug fixes from external issues
Change-Id: I380b65341200c0519a93e2f8969f70f64aec0264
Diffstat (limited to 'docs/html/training/basics')
| -rw-r--r-- | docs/html/training/basics/activity-lifecycle/starting.jd | 2 | ||||
| -rw-r--r-- | docs/html/training/basics/firstapp/starting-activity.jd | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd index 1a4bc2d..dd17304 100644 --- a/docs/html/training/basics/activity-lifecycle/starting.jd +++ b/docs/html/training/basics/activity-lifecycle/starting.jd @@ -112,7 +112,7 @@ methods.</p> </table> --> -<p>As you'll learn in the following lessons, there are several situtations in which an activity +<p>As you'll learn in the following lessons, there are several situations in which an activity transitions between different states that are illustrated in figure 1. However, only three of these states can be static. That is, the activity can exist in one of only three states for an extended period of time:</p> diff --git a/docs/html/training/basics/firstapp/starting-activity.jd b/docs/html/training/basics/firstapp/starting-activity.jd index 4d0a84a..3dafcfa 100644 --- a/docs/html/training/basics/firstapp/starting-activity.jd +++ b/docs/html/training/basics/firstapp/starting-activity.jd @@ -285,8 +285,8 @@ href="{@docRoot}tools/extras/support-library.html#SettingUp">setting up the Supp <p>The app is now runnable because the {@link android.content.Intent} in the first activity now resolves to the {@code DisplayMessageActivity} class. If you run the app now, -clicking the Send button starts the -second activity, but it doesn't show anything yet.</p> +clicking the Send button starts the second activity, but it's still using the default +"Hello world" layout.</p> <h2 id="ReceiveIntent">Receive the Intent</h2> |