summaryrefslogtreecommitdiffstats
path: root/docs/html/guide/components
diff options
context:
space:
mode:
authorScott Kennedy <skennedy@google.com>2013-01-11 22:31:43 -0800
committerScott Kennedy <skennedy@google.com>2013-01-11 23:44:11 -0800
commit7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8 (patch)
treea78e3e87fc9b51fd0df8baa26d4415f4124492ba /docs/html/guide/components
parent0bb4dade30d3413cc7951c5d2c0ee761a93ae468 (diff)
downloadframeworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.zip
frameworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.tar.gz
frameworks_base-7ed189e457b16c06b0425bd28aeeb1df5c8ff5b8.tar.bz2
docs: Fix a bunch of issues
External tracker 42609 External tracker 42607 External tracker 42604 External tracker 42600 External tracker 42574 External tracker 42450 External tracker 41050 External tracker 40995 External tracker 40970 External tracker 40935 External tracker 40507 External tracker 40481 External tracker 40435 External tracker 40406 External tracker 40297 External tracker 40281 External tracker 39978 External tracker 39929 External tracker 39803 External tracker 39715 External tracker 39441 Change-Id: If4215cef850ba8e4e8df356a68192566806e7914
Diffstat (limited to 'docs/html/guide/components')
-rw-r--r--docs/html/guide/components/activities.jd4
-rw-r--r--docs/html/guide/components/bound-services.jd4
2 files changed, 4 insertions, 4 deletions
diff --git a/docs/html/guide/components/activities.jd b/docs/html/guide/components/activities.jd
index 36f651f..2897804 100644
--- a/docs/html/guide/components/activities.jd
+++ b/docs/html/guide/components/activities.jd
@@ -691,7 +691,7 @@ restored, by default).</p>
android.app.Activity#onSaveInstanceState onSaveInstanceState()} helps save the state of the UI, if
you override the method in order to save additional state information, you should always call the
superclass implementation of {@link android.app.Activity#onSaveInstanceState onSaveInstanceState()}
-before doing any work. Likewise, you should also call the supercall implementation of {@link
+before doing any work. Likewise, you should also call the superclass implementation of {@link
android.app.Activity#onRestoreInstanceState onRestoreInstanceState()} if you override it, so the
default implementation can restore view states.</p>
@@ -773,4 +773,4 @@ android.app.Activity#onStop onStop()}.</p>
enables user multitasking, continue with the <b><a
href="{@docRoot}guide/components/tasks-and-back-stack.html">Tasks and Back
Stack</a></b> document.</p>
---> \ No newline at end of file
+-->
diff --git a/docs/html/guide/components/bound-services.jd b/docs/html/guide/components/bound-services.jd
index 8d2bba5..653c7a0 100644
--- a/docs/html/guide/components/bound-services.jd
+++ b/docs/html/guide/components/bound-services.jd
@@ -578,7 +578,7 @@ private ServiceConnection mConnection = new ServiceConnection() {
</pre>
<p>With this {@link android.content.ServiceConnection}, the client can bind to a service by passing
-this it to {@link android.content.Context#bindService bindService()}. For example:</p>
+it to {@link android.content.Context#bindService bindService()}. For example:</p>
<pre>
Intent intent = new Intent(this, LocalService.class);
@@ -667,7 +667,7 @@ Below, figure 1 illustrates the logic for this kind of lifecycle.</p>
and also allows binding.</p>
-<p>For more information about the lifecycle of an started service, see the <a
+<p>For more information about the lifecycle of a started service, see the <a
href="{@docRoot}guide/components/services.html#Lifecycle">Services</a> document.</p>