diff options
| author | 2011-06-01 09:50:21 -0700 | |
|---|---|---|
| committer | 2011-06-01 09:50:21 -0700 | |
| commit | 2b876a31e2a8a424b6e0c51e7a403cf64fe22f0f (patch) | |
| tree | afac619ac1801c2b47bbd928db4ef5d5bbb1fd9e | |
| parent | ddae89368129397c8df55bcdef9fcf36e4ff5fa5 (diff) | |
| parent | f5992953e410a7ce4028e17f50474679b30d2a2a (diff) | |
am f5992953: docs: fix typos
* commit 'f5992953e410a7ce4028e17f50474679b30d2a2a':
docs: fix typos
| -rw-r--r-- | docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd index bd542bd292f3..cfed7428a04d 100644 --- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd +++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd @@ -10,8 +10,8 @@ parent.link=activities.html <li>All activities belong to a task</li> <li>A task contains a collection of activities in the order in which the user interacts with them</li> - <li>Tasks can move to the background and retain the state of each activity in order for the user -to perform other tasks without loosing their work</li> + <li>Tasks can move to the background and retain the state of each activity in order for users +to perform other tasks without losing their work</li> </ul> <h2>In this document</h2> @@ -301,7 +301,7 @@ activity at the top of the back stack is <em>not</em> an existing instance of th and D on top (the stack is A-B-C-D; D is on top). An intent arrives for an activity of type D. If D has the default {@code "standard"} launch mode, a new instance of the class is launched and the stack becomes A-B-C-D-D. However, if D's launch mode is {@code "singleTop"}, the existing instance -of D is deliverd the intent through {@link +of D receives the intent through {@link android.app.Activity#onNewIntent onNewIntent()}, because it's at the top of the stack—the stack remains A-B-C-D. However, if an intent arrives for an activity of type B, then a new instance of B is added to the stack, even if its launch mode is {@code "singleTop"}.</p> @@ -358,7 +358,7 @@ discussed more.</p> <p class="note"><strong>Note:</strong> The behaviors that you specify for your activity with the <a href="{@docRoot}guide/topics/manifest/activity-element.html#lmode">{@code launchMode}</a> attribute -can be overriden by flags included with the intent that start your activity, as discussed in the +can be overridden by flags included with the intent that start your activity, as discussed in the next section.</p> |