diff options
author | Andy McFadden <fadden@android.com> | 2011-04-12 12:02:36 -0700 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2011-04-12 12:02:36 -0700 |
commit | b00be001602b84420e02d36d6e6481b22eab2aa3 (patch) | |
tree | e88b24a074d4d422d02401606280385952af0c4a | |
parent | a4f39a6edda1df7fa2f1daee2f9a2d9a08fb94e1 (diff) | |
parent | 338d12102bad10546d88fb13373cad0ed1b0a231 (diff) | |
download | frameworks_base-b00be001602b84420e02d36d6e6481b22eab2aa3.zip frameworks_base-b00be001602b84420e02d36d6e6481b22eab2aa3.tar.gz frameworks_base-b00be001602b84420e02d36d6e6481b22eab2aa3.tar.bz2 |
Merge "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 bd542bd..f22e5b2 100644 --- a/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd +++ b/docs/html/guide/topics/fundamentals/tasks-and-back-stack.jd @@ -11,7 +11,7 @@ parent.link=activities.html <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> +to perform other tasks without losing their work</li> </ul> <h2>In this document</h2> @@ -181,7 +181,7 @@ system memory. When this happens, information about the activity state is lost. system still knows that the activity has a place in the back stack, but when the activity is brought to the top of the stack the system must recreate it (rather than resume it). In order to -avoid loosing the user's work, you should proactively retain it by implementing the {@link +avoid losing the user's work, you should proactively retain it by implementing the {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()} callback methods in your activity.</p> @@ -201,7 +201,7 @@ the normal behavior. Perhaps you want an activity in your application to begin a started (instead of being placed within the current task); or, when you start an activity, you want to bring forward an existing instance of it (instead of creating a new instance on top of the back stack); or, you want your back stack to be cleared of all -activitiesstart an activity except for the root activity when the user leaves the task.</p> +activities except for the root activity when the user leaves the task.</p> <p>You can do these things and more, with attributes in the <a href="{@docRoot}guide/topics/manifest/activity-element.html">{@code @@ -566,4 +566,4 @@ activate other application components and publish the intents to which your comp respond, continue with the <b><a href="{@docRoot}guide/topics/intents/intents-filters.html">Intents and Intent Filters</a></b> document.</p> --->
\ No newline at end of file +--> |