diff options
| author | Amith Yamasani <yamasani@google.com> | 2013-01-02 10:10:43 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-01-02 10:10:43 -0800 |
| commit | b2e5c5951348b78f6bae28320db8b15528f444a9 (patch) | |
| tree | 24bb6ac07a845cd74560d0099a8dcf9edbcb7b5d | |
| parent | 360b4d9418efc245e47c2241d867a7acdd5c0f61 (diff) | |
| parent | 4c7f809dd5c934b86b0450e59941998aeb7fb96e (diff) | |
| download | frameworks_base-b2e5c5951348b78f6bae28320db8b15528f444a9.zip frameworks_base-b2e5c5951348b78f6bae28320db8b15528f444a9.tar.gz frameworks_base-b2e5c5951348b78f6bae28320db8b15528f444a9.tar.bz2 | |
am 4c7f809d: am ff0cb373: am 554ed0f0: Merge "Fixed typo in Recreating an Activity documentation"
* commit '4c7f809dd5c934b86b0450e59941998aeb7fb96e':
Fixed typo in Recreating an Activity documentation
| -rw-r--r-- | docs/html/training/basics/activity-lifecycle/recreating.jd | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/docs/html/training/basics/activity-lifecycle/recreating.jd b/docs/html/training/basics/activity-lifecycle/recreating.jd index 1b88e19..1a65e71 100644 --- a/docs/html/training/basics/activity-lifecycle/recreating.jd +++ b/docs/html/training/basics/activity-lifecycle/recreating.jd @@ -39,7 +39,7 @@ resources so the system must shut down background processes to recover memory.</ <p>When your activity is destroyed because the user presses <em>Back</em> or the activity finishes itself, the system's concept of that {@link android.app.Activity} instance is gone forever because the behavior indicates the activity is no longer needed. However, if the system destroys -the activity due to system constraints (rather than normal app behavior), then althought the actual +the activity due to system constraints (rather than normal app behavior), then although the actual {@link android.app.Activity} instance is gone, the system remembers that it existed such that if the user navigates back to it, the system creates a new instance of the activity using a set of saved data that describes the state of the activity when it was destroyed. The saved data that the |