summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorSiva Velusamy <vsiva@google.com>2012-06-29 16:49:49 -0700
committerSiva Velusamy <vsiva@google.com>2012-06-29 17:49:55 -0700
commit4605a039ec7d51f1fc109f6399f928c2cfe1ce1e (patch)
tree3a51e05c45d96616739f6959f04e71c26cc4f414 /docs/html
parente02e5d8d5874d9b247b3dff9153b7c9802f60130 (diff)
downloadframeworks_base-4605a039ec7d51f1fc109f6399f928c2cfe1ce1e.zip
frameworks_base-4605a039ec7d51f1fc109f6399f928c2cfe1ce1e.tar.gz
frameworks_base-4605a039ec7d51f1fc109f6399f928c2cfe1ce1e.tar.bz2
Fix Minor typos
Change-Id: I6d0581b7f3dcf1aad7ef3a622a750b8cbba221d5
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/about/versions/jelly-bean.jd4
-rw-r--r--docs/html/guide/google/gcm/c2dm.jd2
-rw-r--r--docs/html/tools/index.jd2
-rw-r--r--docs/html/training/basics/activity-lifecycle/pausing.jd2
-rw-r--r--docs/html/training/basics/activity-lifecycle/starting.jd2
5 files changed, 6 insertions, 6 deletions
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index 2ba22ce..cec1857 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -224,7 +224,7 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the
<p>Apps can take advantage of vsync timing for free, through Android’s <strong>animation framework</strong>. The animation framework now uses vsync timing to automatically handle synchronization across animators.</p>
-<p>For specialized uses, apps can access vsync timing through APIs exposed by a new Choreographer class. Apps can request invalidation on the next vsync frame &mdash; a good way to schedule animation when the app is not using the animation framework. For more advanced uses, apps can post a calllback that the Choreographer class will run on the next frame. </p>
+<p>For specialized uses, apps can access vsync timing through APIs exposed by a new Choreographer class. Apps can request invalidation on the next vsync frame &mdash; a good way to schedule animation when the app is not using the animation framework. For more advanced uses, apps can post a callback that the Choreographer class will run on the next frame. </p>
<h3>New animation actions and transition types</h3>
@@ -348,4 +348,4 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the
<p>Because your app only contains the small client library, you can take advantage of these services without a big increase in download size and storage footprint. Also, Google Play will <strong>deliver regular updates</strong> to the services, without developers needing to publish app updates to take advantage of them.</p>
-<p>For more information about the APIs included in Google Play Services, see the <a href="http://developers.google.com/android/google-play-services/index.html">Google Play Services</a> developer page.</p> \ No newline at end of file
+<p>For more information about the APIs included in Google Play Services, see the <a href="http://developers.google.com/android/google-play-services/index.html">Google Play Services</a> developer page.</p>
diff --git a/docs/html/guide/google/gcm/c2dm.jd b/docs/html/guide/google/gcm/c2dm.jd
index fd1bb0c..91c6ac5 100644
--- a/docs/html/guide/google/gcm/c2dm.jd
+++ b/docs/html/guide/google/gcm/c2dm.jd
@@ -51,7 +51,7 @@ page.title=Migration
<dd>To use the GCM service, you need to obtain a Simple API Key from Google APIs console page. For more information, see <a href="gs.html">Getting Started</a>. Note that GCM <em>only</em> accepts Simple API Key&mdash;using ClientLogin or OAuth2 tokens will not work.
</dd>
<dt><strong>Sender ID</strong></dt>
-<dd>In C2DM, the Sender ID is an email address. In GCM, the Sender ID is a project ID that you acquire from the API console, as described in <a href="https://devsite.googleplex.com/android/gcm/gs.html#create-proj">Getting Started</a>. </dd>
+<dd>In C2DM, the Sender ID is an email address. In GCM, the Sender ID is a project ID that you acquire from the API console, as described in <a href="gs.html#create-proj">Getting Started</a>. </dd>
<dt><strong>JSON format</strong></dt>
<dd>GCM HTTP requests support JSON format in addition to plain text. For more information, see the <a href="gcm.html#send-msg">Architectural Overview</a>.</dd>
diff --git a/docs/html/tools/index.jd b/docs/html/tools/index.jd
index ab7d9a6..3fc9bfe 100644
--- a/docs/html/tools/index.jd
+++ b/docs/html/tools/index.jd
@@ -66,7 +66,7 @@ page.title=Developer Tools
<h3>Powerful Debugging</h3>
<ul>
- <li>Full Java debugger with on-device debugging and Android-specidic tools</li>
+ <li>Full Java debugger with on-device debugging and Android-specific tools</li>
<li>Built-in memory analysis, performance/CPU profiling, OpenGL ES tracing.</li>
<li>Graphical tools for debugging and optimizing UI, runtime inspecton of UI structure and performance.</li>
<li>Runtime graphical analysis of your app's network bandwidth usage.</li>
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>