summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/about/versions/jelly-bean.jd6
-rw-r--r--docs/html/distribute/googleplay/about/monetizing.jd10
-rw-r--r--docs/html/distribute/googleplay/publish/preparing.jd6
-rw-r--r--docs/html/guide/google/gcm/c2dm.jd2
-rw-r--r--docs/html/images/gp-details-ww-purchase.pngbin59564 -> 60506 bytes
-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
8 files changed, 18 insertions, 12 deletions
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index 18b3ff6..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>
@@ -330,7 +330,7 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the
<p>GCM handles all the details of <strong>queuing messages and delivering them</strong> efficiently to the targeted Android devices. It supports message <strong>multicasting</strong> and can reach up to 1000 connected devices simultaneously with a single request. It also supports message <strong>payloads</strong>, which means that in addition to sending tickle messages to an app on the device, developers can send up to 4K of data. </p>
-<p>Google Cloud Messaging is completely <strong>free for all developers</strong> and sign-up is easy. See the <a href="http://developers.google.com/android/gcm/index.html">Google Cloud Messaging</a> page for registration, downloads, and documentation.</p>
+<p>Google Cloud Messaging is completely <strong>free for all developers</strong> and sign-up is easy. See the <a href="{@docRoot}guide/google/gcm/index.html">Google Cloud Messaging</a> page for registration, downloads, and documentation.</p>
<h3>App Encryption</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/distribute/googleplay/about/monetizing.jd b/docs/html/distribute/googleplay/about/monetizing.jd
index 8cd605e..d40f615 100644
--- a/docs/html/distribute/googleplay/about/monetizing.jd
+++ b/docs/html/distribute/googleplay/about/monetizing.jd
@@ -41,8 +41,8 @@ manages the application download.</p>
<h3 id="payment-methods">Convenient payment options</h3>
-<p>Users can purchase your products on Google Play using convenient
-payment methods&mdash;credit cards and Direct Carrier Billing.</p>
+<p>Users can purchase your products on Google Play using several convenient
+payment methods&mdash;credit cards, Direct Carrier Billing, and Google Play balance..</p>
<p><span style="font-weight:500">Credit card</span> is the most common method of payment. Users can pay using any credit card
that they’ve registered in Google Play. To make it easy for users to get started,
@@ -54,6 +54,7 @@ registration is offered as a part of initial device setup process.</p>
<ul>
<li>Credit Card</li>
<li>Direct Carrier Billing</li>
+<li>Google Play balance (stored value)</li>
</ul>
</div>
</div>
@@ -66,6 +67,11 @@ million users in key markets around the world can purchase
your products through Direct Carrier Billing. Many more will get the option in
the months ahead.</p>
+<p><span style="font-weight:500">Google Play balance</span> is a stored account
+balance in Google Play. Users can increase their balance through promotions and
+offers in the store, and they can use their balanace to make purchases of apps,
+games, or other content.
+
<p>The payment methods available to users worldwide may vary, based on
location, carrier network, and other factors.</p>
diff --git a/docs/html/distribute/googleplay/publish/preparing.jd b/docs/html/distribute/googleplay/publish/preparing.jd
index 8c6990e..ab8fadf 100644
--- a/docs/html/distribute/googleplay/publish/preparing.jd
+++ b/docs/html/distribute/googleplay/publish/preparing.jd
@@ -203,15 +203,15 @@ Android devices once it is published. </p>
<p>To get a better understanding of the current device penetration of Android
platform versions and screen sizes across all Android devices, see the <a
-href="{@docRoot}guide/topics/resources/localization.html">Device Dashboard</a>
+href="{@docRoot}about/dashboards/index.html">Device Dashboard</a>
charts.</p>
<table>
<tr>
<td><p>Related resources:</p>
<ul style="margin-top:-.5em;">
-<li><strong><a href="{@docRoot}guide/topics/resources/localization.html">Device Dashboard</a></strong> &mdash; A chart showing global percentages of devices by Android version, screen size, and level of OpenGL ES support.</li>
-<li><strong><a href="{@docRoot}guide/topics/resources/localization.html">Android API Levels</a></strong> &mdash; A definition of API Levels and a list of which Android platform versions they are associated with. </li>
+<li><strong><a href="{@docRoot}about/dashboards/index.html">Device Dashboard</a></strong> &mdash; A chart showing global percentages of devices by Android version, screen size, and level of OpenGL ES support.</li>
+<li><strong><a href="{@docRoot}guide/topics/manifest/uses-sdk-element.html#ApiLevels">Android API Levels</a></strong> &mdash; A definition of API Levels and a list of which Android platform versions they are associated with. </li>
</ul>
</td>
</tr>
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/images/gp-details-ww-purchase.png b/docs/html/images/gp-details-ww-purchase.png
index 46df443..628fa6b 100644
--- a/docs/html/images/gp-details-ww-purchase.png
+++ b/docs/html/images/gp-details-ww-purchase.png
Binary files differ
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>