summaryrefslogtreecommitdiffstats
path: root/docs/html/training/basics
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2012-06-29 18:10:29 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-29 18:10:29 -0700
commit27ad058a941e742bc519b76d3a7940f31f988f1f (patch)
treeb36ad34580b22d6fbcd7bab13d09932c210caeb3 /docs/html/training/basics
parent2612de14d2dcfd5a6eedf882cf5cd9ac3e6fb73a (diff)
parent4605a039ec7d51f1fc109f6399f928c2cfe1ce1e (diff)
downloadframeworks_base-27ad058a941e742bc519b76d3a7940f31f988f1f.zip
frameworks_base-27ad058a941e742bc519b76d3a7940f31f988f1f.tar.gz
frameworks_base-27ad058a941e742bc519b76d3a7940f31f988f1f.tar.bz2
Merge "Fix Minor typos" into jb-dev
Diffstat (limited to 'docs/html/training/basics')
-rw-r--r--docs/html/training/basics/activity-lifecycle/pausing.jd2
-rw-r--r--docs/html/training/basics/activity-lifecycle/starting.jd2
2 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/training/basics/activity-lifecycle/pausing.jd b/docs/html/training/basics/activity-lifecycle/pausing.jd
index fa88beb..f656fce 100644
--- a/docs/html/training/basics/activity-lifecycle/pausing.jd
+++ b/docs/html/training/basics/activity-lifecycle/pausing.jd
@@ -126,7 +126,7 @@ including when it's created for the first time. As such, you should implement {@
android.app.Activity#onResume()} to initialize components that you release during {@link
android.app.Activity#onPause()} and perform any other initializations that must occur each time the
activity enters the Resumed state (such as begin animations and initialize components only used
-while the actiivty has user focus).</p>
+while the activity has user focus).</p>
<p>The following example of {@link android.app.Activity#onResume()} is the counterpart to
the {@link android.app.Activity#onPause()} example above, so it initializes the camera that's
diff --git a/docs/html/training/basics/activity-lifecycle/starting.jd b/docs/html/training/basics/activity-lifecycle/starting.jd
index c32968b..1a4bc2d 100644
--- a/docs/html/training/basics/activity-lifecycle/starting.jd
+++ b/docs/html/training/basics/activity-lifecycle/starting.jd
@@ -285,6 +285,6 @@ android.app.Activity#onStop} in all situations except one: when you call {@link
android.app.Activity#finish()} from within the {@link android.app.Activity#onCreate onCreate()}
method. In some cases, such as when your activity operates as a temporary decision maker to
launch another activity, you might call {@link android.app.Activity#finish()} from within {@link
-android.app.Activity#onCreate onCreate()} to destory the activity. In this case, the system
+android.app.Activity#onCreate onCreate()} to destroy the activity. In this case, the system
immediately calls {@link android.app.Activity#onDestroy} without calling any of the other
lifecycle methods.</p>