summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-11-30 20:11:04 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2012-11-30 20:11:04 -0800
commit76277df27c4d4df39321c400bd5adece32a59b58 (patch)
treed75f2e7db70840a2905acdc9b19e43f45375c04c
parentc566b43d02596cba437e9a2723e9f989297cca72 (diff)
parent5f7b668c966a886d5893ff89af59785fab9523f9 (diff)
downloadframeworks_base-76277df27c4d4df39321c400bd5adece32a59b58.zip
frameworks_base-76277df27c4d4df39321c400bd5adece32a59b58.tar.gz
frameworks_base-76277df27c4d4df39321c400bd5adece32a59b58.tar.bz2
am 5f7b668c: misc changes for landing pages
* commit '5f7b668c966a886d5893ff89af59785fab9523f9': misc changes for landing pages
-rw-r--r--docs/html/google/gcm/index.jd37
-rw-r--r--docs/html/google/google_toc.cs4
-rw-r--r--docs/html/google/play-services/maps.jd2
-rw-r--r--docs/html/google/play-services/plus.jd9
-rwxr-xr-xdocs/html/google/play/billing/index.jd48
-rw-r--r--docs/html/images/google/gps-googleplus.pngbin16547 -> 24000 bytes
6 files changed, 42 insertions, 58 deletions
diff --git a/docs/html/google/gcm/index.jd b/docs/html/google/gcm/index.jd
index 5038125..320bd5b 100644
--- a/docs/html/google/gcm/index.jd
+++ b/docs/html/google/gcm/index.jd
@@ -1,13 +1,34 @@
page.title=Google Cloud Messaging for Android
+header.hide=1
@jd:body
-<p><img src="{@docRoot}images/gcm/gcm-logo.png" /></p>
-<p>Google Cloud Messaging for Android (GCM) is a service that helps developers send data from servers to their Android applications on Android devices. This could be a lightweight message telling the Android application that there is new data to be fetched from the server (for instance, a movie uploaded by a friend), or it could be a message containing up to 4kb of payload data (so apps like instant messaging can consume the message directly). The GCM service handles all aspects of queueing of messages and delivery to the target Android application running on the target device.</p>
-
-<p>GCM is completely free no matter how big your messaging needs are, and there are no quotas.</p>
-
-<p>To learn more about GCM, you can join the <a href="https://groups.google.com/forum/?fromgroups#!forum/android-gcm">android-gcm group</a> and read the following documents:</p>
+<div class="landing-banner">
+
+<div class="col-5" style="min-height:100px">
+ <img src="{@docRoot}images/gcm/gcm-logo.png" />
+</div>
+<div class="col-7">
+
+ <h1 itemprop="name" style="margin-bottom:0;">Google Cloud Messaging for Android</h1>
+ <p itemprop="description">
+ Google Cloud Messaging for Android (GCM) is a service that allows you to send data
+from your server to your users' Android-powered device. This could be a lightweight
+message telling your app there is new data to be fetched from the
+server (for instance, a movie uploaded by a friend), or it could be a message containing
+up to 4kb of payload data (so apps like instant messaging can consume the message directly).
+</p>
+</div>
+</div>
+
+<p class="clear:both">
+The GCM service handles all aspects of queueing of messages and delivery to the target Android
+application running on the target device.
+GCM is completely free no matter how big your messaging needs are, and there are no quotas.</p>
+
+<p>To learn more about GCM, you can join the <a
+href="https://groups.google.com/forum/?fromgroups#!forum/android-gcm">android-gcm group</a>
+and read the following documents:</p>
<dl>
<dt><strong><a href="{@docRoot}google/gcm/gs.html">Getting Started</a></strong></dt>
@@ -20,9 +41,9 @@ page.title=Google Cloud Messaging for Android
<dd>Read this document to get a more in-depth understanding of key GCM features.</dd>
<dt><a href="{@docRoot}google/gcm/c2dm.html"><strong>Migration</strong></a></dt>
<dd>Read this document if you are a C2DM developer moving to GCM.</dd>
+ <dt><a href="{@docRoot}reference/gcm-packages.html"><strong>API Reference</strong></a></dt>
+ <dd>Helper libraries for client and server development.</dd>
</dl>
-<p>GCM also provides helper libraries for <a href="{@docRoot}google/gcm/client-javadoc/index.html"><strong>client</strong></a> and <a href="{@docRoot}google/gcm/server-javadoc/index.html"><strong>server</strong></a> development.</p>
-
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index cc46d3b..22942dd 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -63,13 +63,13 @@
<span class="en">Security and Design</span></a>
</li>
<li><a href="<?cs var:toroot?>google/play/billing/billing_testing.html">
- <span class="en">Testing <br/>In-app Billing</span></a>
+ <span class="en">Testing In-app Billing</span></a>
</li>
<li><a href="<?cs var:toroot?>google/play/billing/billing_admin.html">
<span class="en">Administering In-app Billing</span></a>
</li>
<li><a href="<?cs var:toroot?>google/play/billing/billing_reference.html">
- <span class="en">In-app Billing Reference</span></a>
+ <span class="en">Reference</span></a>
</li>
</ul>
</li>
diff --git a/docs/html/google/play-services/maps.jd b/docs/html/google/play-services/maps.jd
index 9013c75..2d4b8f6 100644
--- a/docs/html/google/play-services/maps.jd
+++ b/docs/html/google/play-services/maps.jd
@@ -79,7 +79,7 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
Google Maps developer documents at <a class="external-link"
href="https://developers.google.com/maps/documentation/android/">developers.google.com/maps</a>.
</p>
- <p>Be sure to read the <a href="https://devsite.googleplex.com/maps/terms">Google Maps
+ <p>Also read the <a href="https://devsite.googleplex.com/maps/terms">Google Maps
API Terms of Service</a>.</p>
</div>
diff --git a/docs/html/google/play-services/plus.jd b/docs/html/google/play-services/plus.jd
index 6ea2c13..1810843 100644
--- a/docs/html/google/play-services/plus.jd
+++ b/docs/html/google/play-services/plus.jd
@@ -47,13 +47,6 @@ href="https://developers.google.com/+/mobile/android/">developers.google.com/+</
can also share content with their circles. These endorsements can give your app more
credibility and help it grow faster. <a class="external-link"
href="https://developers.google.com/+/mobile/android/recommend">Add the +1 button</a>.</p>
-
- <h4>Save moments</h4>
- <p>Save user actions from your app such as check-ins, reviews, video views, comments,
- and more, to your users' private Google+ history. From there, users can share these
- moments with others. <a class="external-link"
- href="https://developers.google.com/+/mobile/android/write-moments">Save user
- moments</a>.</p>
</div>
@@ -78,7 +71,7 @@ href="https://developers.google.com/+/mobile/android/">developers.google.com/+</
<p>Extended documentation for the Google+ Android APIs is provided with the rest of the
Google+ developer documents at <a class="external-link"
href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a>.</p>
- <p>Be sure to read the <a href="https://developers.google.com/+/terms">Google+ Platform
+ <p>Also read the <a href="https://developers.google.com/+/terms">Google+ Platform
Terms of Service</a>.</p>
</div>
</div> \ No newline at end of file
diff --git a/docs/html/google/play/billing/index.jd b/docs/html/google/play/billing/index.jd
index 80ba2d4..f229696 100755
--- a/docs/html/google/play/billing/index.jd
+++ b/docs/html/google/play/billing/index.jd
@@ -1,45 +1,11 @@
-page.title=In-app Billing
+page.title=Google Play In-app Billing
@jd:body
-<div id="qv-wrapper">
-<div id="qv">
-
- <h2>Topics</h2>
- <ol>
- <li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
- Billing</a></li>
- <li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
- Billing</a></li>
- <li><a href="{@docRoot}google/play/billing/billing_subscriptions.html">Subscriptions</a></li>
- <li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
- Design</a></li> <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
- Billing</a></li>
- <li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
- Billing</a></li>
- </ol>
- <h2>Reference</h2>
- <ol>
- <li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
- Reference</a></li>
- </ol>
- <h2>Downloads</h2>
- <ol>
- <li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
- Application</a></li>
- </ol>
-</div>
-</div>
-
<p>In-app Billing is a Google Play service that lets you sell digital content from inside
your applications. You can use the service to sell a wide range of content, including downloadable
content such as media files or photos, virtual content such as game levels or potions, premium services
and features, and more. You can use In-app Billing to sell products as</p>
-<ul>
-<li>Standard in-app products (one-time billing), or</li>
-<li>Subscriptions, (recurring, automated billing)</li>
-</ul>
-
<div class="sidebox-wrapper">
<div class="sidebox">
<p><strong>Free trials for subscriptions</strong> <span class="new" style="font-size:.78em;">New!</span></p>
@@ -47,6 +13,11 @@ and features, and more. You can use In-app Billing to sell products as</p>
</div>
</div>
+<ul>
+<li>Standard in-app products (one-time billing), or</li>
+<li>Subscriptions, (recurring, automated billing)</li>
+</ul>
+
<p>When you use the in-app billing service to sell an item,
whether it's an in-app product or a subscription, Google Play
handles all checkout details so your application never has to directly process
@@ -84,8 +55,8 @@ obfuscate the sample code before you use it in a production application. For mor
applications, read the following documents:</p>
<dl>
- <dt><strong><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
- Billing</a></strong></dt>
+ <dt><strong><a href="{@docRoot}google/play/billing/billing_overview.html">In-app
+ Billing Overview</a></strong></dt>
<dd>Learn how the service works and what a typical in-app billing implementation looks
like.</dd>
<dt><strong><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing
@@ -106,8 +77,7 @@ applications, read the following documents:</p>
<dt><strong><a href="{@docRoot}google/play/billing/billing_admin.html">Administering
In-app Billing</a></strong></dt>
<dd>Learn how to set up your product list, register test accounts, and handle refunds.</dd>
- <dt><strong><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
- Reference</a></strong></dt>
+ <dt><strong><a href="{@docRoot}google/play/billing/billing_reference.html">Reference</a></strong></dt>
<dd>Get detailed information about Google Play response codes and the in-app billing
interface.</dd>
</dl>
diff --git a/docs/html/images/google/gps-googleplus.png b/docs/html/images/google/gps-googleplus.png
index e91747a..b7a51ec 100644
--- a/docs/html/images/google/gps-googleplus.png
+++ b/docs/html/images/google/gps-googleplus.png
Binary files differ