From 68e5ea897387df6737f8dd5e698140a5d8d97d96 Mon Sep 17 00:00:00 2001 From: Scott Main Date: Wed, 1 Jun 2011 09:46:04 -0700 Subject: [PATCH] cherrypick from mr2 Change-Id: I59a34a84075c63715a6b4aaf6d90acead321ea90 docs: fix typos Change-Id: I1e821f9455ee9fcb01d345226f3b606621fdcd8e --- docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd | 6 +++--- 1 file 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 072488c1d6c8d..216420c4e2fcd 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
  • All activities belong to a task
  • A task contains a collection of activities in the order in which the user interacts with them
    • -
  • Tasks can move to the background and retain the state of each activity in order for the user +
  • 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
    • @@ -306,7 +306,7 @@ activity at the top of the back stack is not 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"}.

    @@ -363,7 +363,7 @@ discussed more.

    Note: The behaviors that you specify for your activity with the {@code launchMode} 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.