Merge "cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 docs: fix typos"

  <li>All activities belong to a task</li>

  <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

  <li>A task contains a collection of activities in the order in which the user interacts with

them</li>

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>

to perform other tasks without losing their work</li>

</ul>

</ul>

and D on top (the stack is A-B-C-D; D is on top). An intent arrives for an activity of type D.

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

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

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

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

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>

instance of B is added to the stack, even if its launch mode is {@code "singleTop"}.</p>

<p class="note"><strong>Note:</strong> The behaviors that you specify for your activity with the <a

<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

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>

next section.</p>