Skip to content

Commit 76277df

Browse files
scottamainAndroid Git Automerger
authored andcommitted
am 5f7b668: misc changes for landing pages
* commit '5f7b668c966a886d5893ff89af59785fab9523f9': misc changes for landing pages
2 parents c566b43 + 5f7b668 commit 76277df

File tree

6 files changed

+42
-58
lines changed

6 files changed

+42
-58
lines changed

docs/html/google/gcm/index.jd

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,34 @@
11
page.title=Google Cloud Messaging for Android
2+
header.hide=1
23
@jd:body
34

45

5-
<p><img src="{@docRoot}images/gcm/gcm-logo.png" /></p>
6-
<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>
7-
8-
<p>GCM is completely free no matter how big your messaging needs are, and there are no quotas.</p>
9-
10-
<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>
6+
<div class="landing-banner">
7+
8+
<div class="col-5" style="min-height:100px">
9+
<img src="{@docRoot}images/gcm/gcm-logo.png" />
10+
</div>
11+
<div class="col-7">
12+
13+
<h1 itemprop="name" style="margin-bottom:0;">Google Cloud Messaging for Android</h1>
14+
<p itemprop="description">
15+
Google Cloud Messaging for Android (GCM) is a service that allows you to send data
16+
from your server to your users' Android-powered device. This could be a lightweight
17+
message telling your app there is new data to be fetched from the
18+
server (for instance, a movie uploaded by a friend), or it could be a message containing
19+
up to 4kb of payload data (so apps like instant messaging can consume the message directly).
20+
</p>
21+
</div>
22+
</div>
23+
24+
<p class="clear:both">
25+
The GCM service handles all aspects of queueing of messages and delivery to the target Android
26+
application running on the target device.
27+
GCM is completely free no matter how big your messaging needs are, and there are no quotas.</p>
28+
29+
<p>To learn more about GCM, you can join the <a
30+
href="https://groups.google.com/forum/?fromgroups#!forum/android-gcm">android-gcm group</a>
31+
and read the following documents:</p>
1132

1233
<dl>
1334
<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
2041
<dd>Read this document to get a more in-depth understanding of key GCM features.</dd>
2142
<dt><a href="{@docRoot}google/gcm/c2dm.html"><strong>Migration</strong></a></dt>
2243
<dd>Read this document if you are a C2DM developer moving to GCM.</dd>
44+
<dt><a href="{@docRoot}reference/gcm-packages.html"><strong>API Reference</strong></a></dt>
45+
<dd>Helper libraries for client and server development.</dd>
2346
</dl>
2447

25-
<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>
26-
2748

2849

docs/html/google/google_toc.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,13 +63,13 @@ localized titles are added in the language order specified below.
6363
<span class="en">Security and Design</span></a>
6464
</li>
6565
<li><a href="<?cs var:toroot?>google/play/billing/billing_testing.html">
66-
<span class="en">Testing <br/>In-app Billing</span></a>
66+
<span class="en">Testing In-app Billing</span></a>
6767
</li>
6868
<li><a href="<?cs var:toroot?>google/play/billing/billing_admin.html">
6969
<span class="en">Administering In-app Billing</span></a>
7070
</li>
7171
<li><a href="<?cs var:toroot?>google/play/billing/billing_reference.html">
72-
<span class="en">In-app Billing Reference</span></a>
72+
<span class="en">Reference</span></a>
7373
</li>
7474
</ul>
7575
</li>

docs/html/google/play-services/maps.jd

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -79,7 +79,7 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
7979
Google Maps developer documents at <a class="external-link"
8080
href="https://developers.google.com/maps/documentation/android/">developers.google.com/maps</a>.
8181
</p>
82-
<p>Be sure to read the <a href="https://devsite.googleplex.com/maps/terms">Google Maps
82+
<p>Also read the <a href="https://devsite.googleplex.com/maps/terms">Google Maps
8383
API Terms of Service</a>.</p>
8484
</div>
8585

docs/html/google/play-services/plus.jd

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,6 @@ href="https://developers.google.com/+/mobile/android/">developers.google.com/+</
4747
can also share content with their circles. These endorsements can give your app more
4848
credibility and help it grow faster. <a class="external-link"
4949
href="https://developers.google.com/+/mobile/android/recommend">Add the +1 button</a>.</p>
50-
51-
<h4>Save moments</h4>
52-
<p>Save user actions from your app such as check-ins, reviews, video views, comments,
53-
and more, to your users' private Google+ history. From there, users can share these
54-
moments with others. <a class="external-link"
55-
href="https://developers.google.com/+/mobile/android/write-moments">Save user
56-
moments</a>.</p>
5750
</div>
5851

5952

@@ -78,7 +71,7 @@ href="https://developers.google.com/+/mobile/android/">developers.google.com/+</
7871
<p>Extended documentation for the Google+ Android APIs is provided with the rest of the
7972
Google+ developer documents at <a class="external-link"
8073
href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a>.</p>
81-
<p>Be sure to read the <a href="https://developers.google.com/+/terms">Google+ Platform
74+
<p>Also read the <a href="https://developers.google.com/+/terms">Google+ Platform
8275
Terms of Service</a>.</p>
8376
</div>
8477
</div>

docs/html/google/play/billing/index.jd

Lines changed: 9 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,52 +1,23 @@
1-
page.title=In-app Billing
1+
page.title=Google Play In-app Billing
22
@jd:body
33

4-
<div id="qv-wrapper">
5-
<div id="qv">
6-
7-
<h2>Topics</h2>
8-
<ol>
9-
<li><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
10-
Billing</a></li>
11-
<li><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing In-app
12-
Billing</a></li>
13-
<li><a href="{@docRoot}google/play/billing/billing_subscriptions.html">Subscriptions</a></li>
14-
<li><a href="{@docRoot}google/play/billing/billing_best_practices.html">Security and
15-
Design</a></li> <li><a href="{@docRoot}google/play/billing/billing_testing.html">Testing In-app
16-
Billing</a></li>
17-
<li><a href="{@docRoot}google/play/billing/billing_admin.html">Administering In-app
18-
Billing</a></li>
19-
</ol>
20-
<h2>Reference</h2>
21-
<ol>
22-
<li><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
23-
Reference</a></li>
24-
</ol>
25-
<h2>Downloads</h2>
26-
<ol>
27-
<li><a href="{@docRoot}google/play/billing/billing_integrate.html#billing-download">Sample
28-
Application</a></li>
29-
</ol>
30-
</div>
31-
</div>
32-
334
<p>In-app Billing is a Google Play service that lets you sell digital content from inside
345
your applications. You can use the service to sell a wide range of content, including downloadable
356
content such as media files or photos, virtual content such as game levels or potions, premium services
367
and features, and more. You can use In-app Billing to sell products as</p>
378

38-
<ul>
39-
<li>Standard in-app products (one-time billing), or</li>
40-
<li>Subscriptions, (recurring, automated billing)</li>
41-
</ul>
42-
439
<div class="sidebox-wrapper">
4410
<div class="sidebox">
4511
<p><strong>Free trials for subscriptions</strong> <span class="new" style="font-size:.78em;">New!</span></p>
4612
<p>You can now offer users a configurable <a href="{@docRoot}google/play/billing/billing_subscriptions.html#trials">free trial period</a> for your in-app subscriptions. You can set up trials with a simple change in the Developer Console&mdash;no change to your app code is needed.
4713
</div>
4814
</div>
4915

16+
<ul>
17+
<li>Standard in-app products (one-time billing), or</li>
18+
<li>Subscriptions, (recurring, automated billing)</li>
19+
</ul>
20+
5021
<p>When you use the in-app billing service to sell an item,
5122
whether it's an in-app product or a subscription, Google Play
5223
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
8455
applications, read the following documents:</p>
8556

8657
<dl>
87-
<dt><strong><a href="{@docRoot}google/play/billing/billing_overview.html">Overview of In-app
88-
Billing</a></strong></dt>
58+
<dt><strong><a href="{@docRoot}google/play/billing/billing_overview.html">In-app
59+
Billing Overview</a></strong></dt>
8960
<dd>Learn how the service works and what a typical in-app billing implementation looks
9061
like.</dd>
9162
<dt><strong><a href="{@docRoot}google/play/billing/billing_integrate.html">Implementing
@@ -106,8 +77,7 @@ applications, read the following documents:</p>
10677
<dt><strong><a href="{@docRoot}google/play/billing/billing_admin.html">Administering
10778
In-app Billing</a></strong></dt>
10879
<dd>Learn how to set up your product list, register test accounts, and handle refunds.</dd>
109-
<dt><strong><a href="{@docRoot}google/play/billing/billing_reference.html">In-app Billing
110-
Reference</a></strong></dt>
80+
<dt><strong><a href="{@docRoot}google/play/billing/billing_reference.html">Reference</a></strong></dt>
11181
<dd>Get detailed information about Google Play response codes and the in-app billing
11282
interface.</dd>
11383
</dl>
7.28 KB
Loading

0 commit comments

Comments
 (0)