diff options
| author | Scott Main <smain@google.com> | 2011-06-01 09:46:04 -0700 |
|---|---|---|
| committer | Scott Main <smain@google.com> | 2011-06-20 17:55:59 -0700 |
| commit | 68e5ea897387df6737f8dd5e698140a5d8d97d96 (patch) | |
| tree | 2856cfa7f33c1dabf235a87e097a0ab1b2551340 /docs/html/guide/topics/fundamentals | |
| parent | 47d6ef5143adbb7c9e119aec8d28a4a4df35618c (diff) | |
| download | frameworks_base-68e5ea897387df6737f8dd5e698140a5d8d97d96.zip frameworks_base-68e5ea897387df6737f8dd5e698140a5d8d97d96.tar.gz frameworks_base-68e5ea897387df6737f8dd5e698140a5d8d97d96.tar.bz2 | |
cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90
docs: fix typos
Change-Id: I1e821f9455ee9fcb01d345226f3b606621fdcd8e
Diffstat (limited to 'docs/html/guide/topics/fundamentals')
| -rw-r--r-- | docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd | 6 |
1 files changed, 3 insertions, 3 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 072488c..216420c 100644 --- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd +++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd @@ -10,7 +10,7 @@ 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 + <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> @@ -306,7 +306,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> @@ -363,7 +363,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> |