Doc change: Update landing pages for Google Play Services.
Change-Id: I7cfc64928e7a2b195ed52febc6f7b652d85e9c56
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 3e3b12d0..d89934f 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -266,6 +266,9 @@
- from: /training/cloudsync/aesync.html
to: /google/gcm/index.html
+- from: /training/basics/location/...
+ to: /training/location/...
+
# -------------------- MISC ----------------------
- from: /shareables/...
diff --git a/docs/html/google/google_toc.cs b/docs/html/google/google_toc.cs
index ff2d27a..fa9b9c9 100644
--- a/docs/html/google/google_toc.cs
+++ b/docs/html/google/google_toc.cs
@@ -27,23 +27,24 @@
<li><a href="<?cs var:toroot?>google/play-services/setup.html">
<span class="en">Setup</span></a>
</li>
-
- <li><a href="<?cs var:toroot?>google/play-services/auth.html">
- <span class="en">Authorization</span></a>
+ <li><a href="<?cs var:toroot?>google/play-services/games.html">
+ <span class="en">Games</span></a>
</li>
-
<li><a href="<?cs var:toroot?>google/play-services/plus.html">
<span class="en">Google+</span></a>
</li>
-
<li><a href="<?cs var:toroot?>google/play-services/maps.html">
<span class="en">Google Maps</span></a>
</li>
-
- <li><a href="<?cs var:toroot?>google/play-services/games.html">
- <span class="en">Games</span></a>
+ <li><a href="<?cs var:toroot?>google/play-services/location.html">
+ <span class="en">Location</span></a>
</li>
-
+ <li><a href="<?cs var:toroot?>google/play-services/gcm.html">
+ <span class="en">GCM</span></a>
+ </li>
+ <li><a href="<?cs var:toroot?>google/play-services/auth.html">
+ <span class="en">Authorization</span></a>
+ </li>
<li id="gms-tree-list" class="nav-section">
<div class="nav-section-header">
<a href="<?cs var:toroot ?>reference/gms-packages.html">
diff --git a/docs/html/google/play-services/gcm.jd b/docs/html/google/play-services/gcm.jd
new file mode 100644
index 0000000..67b55ea
--- /dev/null
+++ b/docs/html/google/play-services/gcm.jd
@@ -0,0 +1,69 @@
+page.title=GCM Extensions for Android
+page.tags="cloud","push","messaging"
+header.hide=1
+@jd:body
+
+<div class="landing-banner">
+
+<div class="col-6">
+ <img src="" alt="">
+</div>
+<div class="col-6">
+
+ <h1 itemprop="name" style="margin-bottom:0;">GCM Extensions for Android</h1>
+ <p itemprop="description">
+GCM extension APIs make it easier to take advantage of enhanced messaging capabilities in your apps, and they can help you simplify your implementation of Google Cloud Messaging.</p>
+
+<p>You can use GCM extensions in any new or existing GCM implementation to build powerful multi-device messaging and presence features for your users.</p>
+
+</div>
+</div>
+
+
+<div class="landing-docs">
+ <div class="col-6 normal-links">
+ <h3 style="clear:left">Key Developer Features</h3>
+
+ <h4>Faster, easier GCM setup</h4>
+ <p>Streamlined registration makes it simple and fast to add GCM support to your Android app. <a href="{@docRoot}google/play-services/gcm/gs.html">Learn more »</a></p>
+
+
+ <h4>Bidirectional messaging over XMPP</h4>
+ <p>GCM's Cloud Connection Service (CCS) lets you communicate with Android devices over a persistent XMPP connection. Communication is asynchronous and bidirectional, and you can use the service in tandem with existing GCM APIs. You can use <a href="https://services.google.com/fb/forms/gcm/">this form</a> to sign up for CCS. <a href="{@docRoot}google/gcm/ccs.html">Learn more »</a></p>
+
+ <!-- <p>To get started, sign up using <a href="https://services.google.com/fb/forms/gcm/">this form</a> and then learn how to <a href="{@docRoot}google/gcm/ccs.html">send XMPP messages</a>.</p> -->
+
+ <h4>Seamless multi-device messaging</h4>
+ <p>New user notifications let you send a single message simultaneously to all of a user's Android devices. </p>
+
+ <p>GCM lets you map all of a user's multiple devices to a single notification key, which you can then reference as the target for messages that you are sending to that user.
+ <a href="{@docRoot}google/gcm/notifications.html">Learn more »</a></p>
+ </a>
+
+
+ </div>
+
+
+ <div class="col-6 normal-links">
+ <h3 style="clear:left">Getting Started</h3>
+ <h4>1. Get the Google Play services SDK</h4>
+ <p>The GCM Extension APIs are part of the Google Play services platform. To use the APIs, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>.
+ </p>
+
+ <h4>2. Create a Google APIs project</h4>
+
+ <p>To use GCM, you need to set up a Google APIs project and get an application key. If you are already using GCM, you can use your existing project and key. <a href="{@docRoot}google/play-services/gcm/gs.html#google_apis">Learn more »</a></p>
+
+ <h4>3. Set up GCM in your app</h4>
+
+ <p>To send and receive messages over GCM, you need to update the manifest and add code to register with GCM and handle messages. See <a href="{@docRoot}google/play-services/gcm/gs.html#manifest">Get Started</a> for details.
+ </p>
+
+ <h4>4. Integrate GCM with your backend servers</h4>
+
+ <p>A complete GCM implementation requires a server-side implementation, in addition to the client implementation in your app. For complete information, make sure to read the <a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging documentation</a>.
+
+ </div>
+
+</div>
diff --git a/docs/html/google/play-services/location.jd b/docs/html/google/play-services/location.jd
new file mode 100644
index 0000000..430aaeb
--- /dev/null
+++ b/docs/html/google/play-services/location.jd
@@ -0,0 +1,89 @@
+page.title=Location APIs
+page.tags="location","geofence", "geofencing", "activity recognition", "activity detection", "gps"
+header.hide=1
+@jd:body
+
+
+ <div class="landing-banner">
+
+<div class="col-6">
+ <img src="{@docRoot}images/google/gps-location.png" alt="Location APIs Logo">
+</div>
+
+<div class="col-6">
+
+<h1 itemprop="name" style="margin-bottom:0;">Location APIs</h1>
+<p itemprop="description">
+ The location APIs make it easy for you to build location-aware applications, without needing to
+ focus on the details of the underlying location technology. They also let you minimize
+ power consumption by using all of the capabilities of the device hardware.
+</p>
+
+<p>
+ To get started, first <a href="{@docRoot}google/play-services/setup.html">set up</a>
+ the Google Play services SDK. You can learn how to use the APIs in the training
+ class <a href="{@docRoot}training/basics/location/index.html">Making Your App Location Aware</a>,
+ and details are available in the <a href="{@docRoot}reference/com/google/android/location/package-summary.html">Location API reference</a>. To look at a code example, <a href="">download the sample app</a>.
+</p>
+</div>
+</div>
+<div class="landing-docs">
+ <h3 style="clear:left">Key Developer Features</h3>
+ <div class="layout-content-row">
+ <div class="layout-content-col span-6">
+
+
+
+<h4 style="font-weight:bold">Fused location provider</h4>
+<ul>
+ <li>
+ <em>Simple APIs</em>: Lets you specify high-level needs like "high accuracy" or "low power", instead of
+ having to worry about location providers.
+ </li>
+ <li>
+ <em>Always-on location</em>: Gives your apps immediate access to the best, most recent location.
+ </li>
+ <li>
+ <em>Power-efficiency</em>: Minimizes your app's use of power. Based on all incoming location requests and available sensors, fused location provider chooses the most efficient way to meet those needs.
+ </li>
+ <li>
+ <em>Versatility</em>: Meets a wide range of needs, from foreground uses that need highly accurate
+ location to background uses that need periodic location updates with negligible power impact.
+ </li>
+
+</ul>
+
+<h4 style="font-weight:bold">Geofencing APIs</h4>
+<ul>
+ <li>
+ <em>Simple but powerful APIs</em>: Allows batch addition and removal of geofences. Ability to manage
+ multiple geofences at the same time. Ability to filter alerts for both entry and exit or
+ entry only or exit only.
+ </li>
+ <li>
+ <em>Optimized for battery</em>: Adjusts location updates based on user’s proximity to the geofence
+ and user’s modality (still, walking, driving, and so on).
+ </li>
+</ul>
+</div>
+
+<div class="layout-content-col span-6">
+<h4 style="font-weight:bold">Activity recognition</h4>
+<ul>
+ <li>
+ Uses low-power sensors to recognize the user's current physical activity, such as walking,
+ cycling, or driving, or remaining still.
+ </li>
+ <li>
+ Great for adding movement awareness to location awareness. Apps can adjust the amount of
+ location awareness they provide, based on the current user movement. For example, a
+ navigation app can request more frequent updates when the user is driving.
+ </li>
+ <li>
+ Features for advanced applications: For advanced applications that want to do their own
+ post-processing, this API also makes available confidence values for each of the activities.
+ It also includes two activities that indicate unreliable measurements: unknown and tilt.
+ </li>
+</ul>
+</div>
+</div>
\ No newline at end of file
diff --git a/docs/html/images/google/gps-location.png b/docs/html/images/google/gps-location.png
new file mode 100644
index 0000000..c9acda1
--- /dev/null
+++ b/docs/html/images/google/gps-location.png
Binary files differ
