summaryrefslogtreecommitdiffstats
path: root/docs
diff options
context:
space:
mode:
authorQuddus Chong <quddusc@google.com>2012-04-24 09:45:08 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-04-24 09:45:08 -0700
commit1313213a91007ea1fb1382cbaf335714281d490f (patch)
tree7960ff5e6bba0ffb9dc0493e6a420066c027f6d4 /docs
parent77e42defdd72e3ce3d872774cd0975422a571f66 (diff)
parent5c84720322afaae4f4a7e0ea6ad71c309df7eb80 (diff)
downloadframeworks_base-1313213a91007ea1fb1382cbaf335714281d490f.zip
frameworks_base-1313213a91007ea1fb1382cbaf335714281d490f.tar.gz
frameworks_base-1313213a91007ea1fb1382cbaf335714281d490f.tar.bz2
am 5c847203: am 4fd13fda: docs: Fixed typos.
* commit '5c84720322afaae4f4a7e0ea6ad71c309df7eb80': docs: Fixed typos.
Diffstat (limited to 'docs')
-rw-r--r--docs/html/training/basics/activity-lifecycle/starting.jd6
1 files changed, 3 insertions, 3 deletions
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd
index d3266ae..1d328c7 100644
--- a/docs/html/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html/training/basics/activity-lifecycle/starting.jd
@@ -79,9 +79,9 @@ ensures your app behaves well in several ways, including that it:</p>
while using your app.</li>
<li>Does not consume valuable system resources when the user is not actively using
it.</li>
- <li>Does not loose the user's progress if they leave your app and return to it at a
+ <li>Does not lose the user's progress if they leave your app and return to it at a
later time.</li>
- <li>Does not crash of loose the user's progress when the screen rotates between
+ <li>Does not crash or lose the user's progress when the screen rotates between
landscape and portrait orientation.</li>
</ul>
@@ -257,7 +257,7 @@ activity until they switch to a different activity.</p>
<h2 id="Destroy">Destroy the Activity</h2>
<p>While the activity's first lifecycle callback is {@link android.app.Activity#onCreate
-onCreate()}, it's very last callback is {@link android.app.Activity#onDestroy}. The system calls
+onCreate()}, its very last callback is {@link android.app.Activity#onDestroy}. The system calls
this method on your activity as the final
signal that your activity instance is being completely removed from the system memory.</p>