summaryrefslogtreecommitdiffstats
path: root/docs/html/google
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2013-09-26 16:20:41 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-09-26 16:20:41 -0700
commit194925f9e894d35991920edbaa0681c1aea48120 (patch)
treedc7877329e8047359810ae8b1415810b48a6f1d9 /docs/html/google
parentce57e1a6f373c4f1c39b048adc1f2bbe6232be0e (diff)
parenta8f519ff9cb38e97db34f5a7bac95a9e09ed5ade (diff)
downloadframeworks_base-194925f9e894d35991920edbaa0681c1aea48120.zip
frameworks_base-194925f9e894d35991920edbaa0681c1aea48120.tar.gz
frameworks_base-194925f9e894d35991920edbaa0681c1aea48120.tar.bz2
am a8f519ff: add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
* commit 'a8f519ff9cb38e97db34f5a7bac95a9e09ed5ade': add Wallet Instant Buy and Google Cloud Platform to the Google services landing page.
Diffstat (limited to 'docs/html/google')
-rw-r--r--docs/html/google/index.jd26
1 files changed, 25 insertions, 1 deletions
diff --git a/docs/html/google/index.jd b/docs/html/google/index.jd
index 4020cf4..ce30bce 100644
--- a/docs/html/google/index.jd
+++ b/docs/html/google/index.jd
@@ -39,6 +39,7 @@ cloud messaging.</p>
+
<div style="margin-top:10px">
<div class="col-6 normal-links" style="margin-left:0">
@@ -48,7 +49,7 @@ cloud messaging.</p>
</div>
<h4><a href="{@docRoot}google/play-services/maps.html"
>Google Maps</a></h4>
- <p>The power of Google Maps is available to your app
+ <p>Include the power of Google Maps in your app
with an embeddable map view. You can customize the map with
markers and overlays, control the user's perspective, draw lines
and shapes, and much more.</p>
@@ -68,6 +69,17 @@ cloud messaging.</p>
<div class="landing-cell">
<div class="cell-icon">
+ <img src="{@docRoot}images/google/cloud-platform.png" width="40" >
+ </div>
+ <h4><a class="external-link" href="https://cloud.google.com/solutions/mobile"
+ >Google Cloud Platform</a></h4>
+ <p>Build and host the backend for your Android app at Google-scale. With an infrastructure
+ that is managed automatically, you can focus on your app. Then, scale to support
+ millions of users.</p>
+</div>
+
+<div class="landing-cell">
+ <div class="cell-icon">
<img src="{@docRoot}images/google/gcm-cloud.png" width="40" >
</div>
<h4><a href="{@docRoot}google/gcm/index.html"
@@ -98,6 +110,18 @@ cloud messaging.</p>
<div class="landing-cell">
<div class="cell-icon">
+ <img src="{@docRoot}images/google/wallet.png" width="40" />
+ </div>
+ <h4><a class="external-link" href="https://developers.google.com/commerce/wallet/instant-buy/"
+ >Google Wallet Instant Buy</a></h4>
+ <p>Provide fast and easy checkout in your app when selling physical goods and services.
+ Increase conversions by streamlining your purchase flow and reducing the amount of
+ information your customers need to enter.
+ </p>
+</div>
+
+<div class="landing-cell">
+ <div class="cell-icon">
<img src="{@docRoot}images/google/analytics.png" width="40" />
</div>
<h4><a class="external-link"