Merge "docs: revisions to gps landing pages" into jb-mr1-dev

4 files changed, 124 insertions, 93 deletions

diff --git a/docs/html/google/play-services/maps.jd b/docs/html/google/play-services/maps.jd
index eea17e9..85a745d 100644
--- a/docs/html/google/play-services/maps.jd
+++ b/docs/html/google/play-services/maps.jd
@@ -1,73 +1,86 @@
 page.title=Google Maps
-page.landing=true
-page.landing.intro=Add Google maps to your Android apps and let your users explore the world. Give your users all of the benefits of the Google Maps, but with the customizations that you need for your app and users.
-page.landing.link=https://developers.google.com/maps/documentation/android/
-page.landing.link.text=developers.google.com/maps
-page.landing.image=images/gps-maps.png
+header.hide=1
 
 @jd:body
 
+
+<div class="landing-banner">
+        
+<div class="col-6">
+  <img src="{@docRoot}images/google/gps-maps.png" alt="">
+</div>
+<div class="col-6">
+
+  <h1 itemprop="name" style="margin-bottom:0;">Google Maps</h1>
+  <p itemprop="description">Allow your users explore the world with rich maps provided by
+  Google. Identify locations with <b>custom markers</b>, augment the map data
+  with <b>image overlays</b>, embed <b>one or more maps</b> as fragments,
+  and much more.</p>
+  <p>The <a
+href="{@docRoot}google/play-services/reference/com/google/android/gms/maps/package-summary.html"
+>Google Maps Android API reference</a> is available here on developer.android.com, but for more
+information about adding maps to your app, visit:</p>
+  <p><a class="external-link"
+href="https://developers.google.com/maps/documentation/android/">developers.google.com/maps</a></p>
+</div>
+</div>
+
+
+
 <div class="landing-docs">
-  <div class="col-6">
+  <div class="col-6 normal-links">
     <h3 style="clear:left">Key Developer Features</h3>
-    <a href="https://developers.google.com/maps/documentation/android/map">
-    <h4>Bring Maps to your Mobile Apps</h4>
-    The Google Maps APIs let you embed Google Maps into an Activity with a simple XML snippet
-    in the form of a fragment. With MapFragment, you can take advantage of exciting features such as 3D maps;
-    indoor, satellite, terrain, and hybrid maps; and vector-based tiles for efficient caching and drawing.
-    </a>
+    <h4>Add Maps in a fragment</h4>
+    <p>With version 2 of the Google Maps Android API, you can embed maps into an activity
+    as a fragment with a simple XML snippet. The new Maps offer exciting features such as 3D maps;
+    indoor, satellite, terrain, and hybrid maps;
+    vector-based tiles for efficient caching and drawing; animated transitions; and much more.
+    <a class="external-link" href="https://developers.google.com/maps/documentation/android/map">Add
+    a map object</a>.</p>
     
-    <a href="https://developers.google.com/maps/documentation/android/marker">
-    <h4>Highlight important places and routes</h4>
-    <p>
-    Overlay markers onto your maps to highlight places your users are interested
-    in. You can also define custom colors or icons for your map markers to
-    coincide with the look and feel of your app.</p>
-
-    <p>In addition, you can draw polylines, a set of connected line segments on a map
-    and polygons, a set of polylines in a closed loop.</p>
+    <h4>Customize the map</h4>
+    <p>Add markers onto the map to indicate special points of interest for your users.
+    You can define custom colors or icons for your map markers to
+    match your app's look and feel. To further enhance the app, draw polylines
+    and polygons to indicate paths or regions, or provide complete image overlays.
+    <a class="external-link" href="https://developers.google.com/maps/documentation/android/marker">Draw
+    markers</a>.</p>
     </a>
-
-    <a href="https://developers.google.com/maps/documentation/android/views">
-    <h4>Change views and perspectives</h4>
-    Give your users a different view of the world with the ability to control rotation, tilting,
-    zooming, and panning properties of the maps you are displaying. Show 3D views of maps,
-    zoom in on terrain maps, allow users to swipe across areas, and much more.
-    </a>
-
+    
+    <h4>Control the user's view</h4>
+    <p>Give your users a different view of the world with the ability to control the rotation, tilt,
+    zoom, and pan properties of the "camera" perspective of the map.
+    <a class="external-link" href="https://developers.google.com/maps/documentation/android/views">Change
+    the view</a>.</p>
   </div>
 
+
   <div class="col-6 normal-links">
     <h3 style="clear:left">Getting Started</h3>
-    <h4>Configure Maps</h4>
+    <h4>1. Get the Google Play services SDK</h4>
     <p>The Google Maps Android APIs are part of the Google Play services platform.</p>
     <p>To use Google Maps, <a href="{@docRoot}google/play-services/download.html">download and configure</a>
-      the Google Play services SDK and see the <a href="https://developers.google.com/maps/documentation/android/start#installing_the_google_maps_android_v2_api">
-      Getting Started guide</a> on how to configure Google Maps for your app.
+      the Google Play services SDK from the SDK Manager. Then see the <a class="external-link"
+      href="https://developers.google.com/maps/documentation/android/start#installing_the_google_maps_android_v2_api">
+      Getting Started guide</a> to get your API key for Maps and set up your app.
     </p>
             
-    <h4>Run the sample</h4>
-    <p>
-      The Google Maps sample is located in <code>&lt;android-sdk&gt;/extras/google-play-services/samples/maps</code>
-      and shows you how to use the major components of the Google Maps Android APIs.
+    <h4>2. Run the sample</h4>
+    <p>Once you've installed the Google Play services package, the Google Maps sample is located in
+      <code>&lt;android-sdk&gt;/extras/google-play-services/samples/maps</code> and shows you
+      how to use the major components of the Google Maps Android APIs.
     </p>
     
-    <h4>Visit the Google Maps developer site</h4>
-    <p>
-      For instructions on how to fully integrate Google+ into your app, with code snippets, visit the
-      <a href="https://developers.google.com/maps/documentation/android/intro">Google Maps developer documentation</a>
-      located at developers.google.com.
-    </p>
-    
-    <h4>See the reference documentation</h4>
-    <p>
-      The <a href="{@docRoot}google/play-services/reference/com/google/android/gms/maps/package-summary.html">Google Maps API reference</a>
-      is provided for you on this site and is also available at <a href="https://developers.google.com/maps/documentation/android/reference/com/google/android/gms/maps/package-summary">developers.google.com</a> if you
-      prefer to read them there.</p>
-    <p>
-      In addition, the entire <a href="{@docRoot}google/play-services/reference/packages.html">Google Play
-      services platform reference</a> is hosted on this site for your convenience.
+    <h4>3. Read the documentation</h4>
+    <p>For quick access while developing your Android apps, the
+      <a href="{@docRoot}google/play-services/reference/com/google/android/gms/maps/package-summary.html">Google Maps
+      Android API reference</a> is available here on developer.android.com.</p>
+    <p>Extended documentation for the Google Maps Android APIs is provided with the rest of the
+    Google Maps developer documents at <a class="external-link"
+    href="https://developers.google.com/maps/documentation/android/">developers.google.com/maps</a>.
     </p>
   </div>
+
+
   </div>
 </div>
\ No newline at end of file
diff --git a/docs/html/google/play-services/plus.jd b/docs/html/google/play-services/plus.jd
index 7742318..571360b 100644
--- a/docs/html/google/play-services/plus.jd
+++ b/docs/html/google/play-services/plus.jd
@@ -1,65 +1,83 @@
 page.title=Google+
-page.landing=true
-page.landing.intro=Create an engaging social experience and connect with more users by integrating G+ into your app.
-page.landing.link=https://developers.google.com/+/mobile/android/
-page.landing.link.text=developers.google.com/+
-page.landing.image=images/gps-plus.png
+header.hide=1
 
 @jd:body
 
+
+<div class="landing-banner">
+        
+<div class="col-6">
+  <img src="{@docRoot}images/google/gps-googleplus.png" alt="">
+</div>
+<div class="col-6">
+
+  <h1 itemprop="name" style="margin-bottom:0;">Google+</h1>
+  <p itemprop="description">Create an engaging social experience
+  by integrating Google+ features in your app. You can <b>authenticate users</b> and allow them to
+  <b>sign in</b>, add +1 buttons so users can <b>recommend your app content</b>,
+  and allow users to <b>share rich content</b> with Google+.</p>
+  
+  <p>The <a
+href="{@docRoot}google/play-services/reference/com/google/android/gms/plus/package-summary.html"
+>Google+ Android API reference</a> is available here on developer.android.com, but for more
+information about integrating Google+, visit:</p>
+<p><a class="external-link"
+href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a></p>
+</div>
+</div>
+
 <div class="landing-docs">
-  <div class="col-6">
+  <div class="col-6 normal-links">
     <h3 style="clear:left">Key Developer Features</h3>
 
-    <a href="https://developers.google.com/+/mobile/android/share">
-      <h4>Share to Google+</h4>
-      Display a Share dialog that lets your users share rich content from your app, including text,
-      photos, URL attachments, and location, into the Google+ stream.
-    </a>
+      <h4>Sign in with Google+</h4>
+      <p>Allow users to easily and securely sign in to your app using their Google+ credentials.
+      This allows you to know who they are on Google+ and to build a more personalized experience in
+      your app. <a href="https://developers.google.com/+/mobile/android/sign-in"
+      class="external-link">Add sign in</a>.</p>
 
-    <a href="https://developers.google.com/+/mobile/android/recommend">
+      <h4>Share to Google+</h4>
+      <p>Display a Share dialog that lets your users share rich content from your app,
+      including text, photos, URL attachments, and location, into the Google+ stream.
+      <a href="https://developers.google.com/+/mobile/android/share"
+      class="external-link">Add sharing with Google+</a>.</p>
+       
       <h4>Recommend content</h4>
-      Add a native +1 button so users can recommend content from your app. When users +1, they can
-      also share content with their circles. These endorsements can give your app more
-      credibility and help it grow faster.
-    </a>
-
-    <a href="https://developers.google.com/+/mobile/android/sign-in">
-      <h4>Sign in with Google+</h4>
-      Allow users to easily and securely sign in to your app using their Google+ credentials.
-      This allows you to know who they are on Google+ and to build a more personalized experience in your app.
-    </a>
-    <a href="https://developers.google.com/+/mobile/android/write-moments">
+      <p>Add a native +1 button so users can recommend content from your app. When users +1, they
+      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>
-       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>
+     <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>
 
+
   <div class="col-6 normal-links">
     <h3 style="clear:left">Getting Started</h3>
-    <h4>Get the Google Play services SDK</h4>
+    <h4>1. Get the Google Play services SDK</h4>
     <p>The Google+ Android APIs are part of the Google Play services platform.</p>
-    <p><a href="{@docRoot}google/play-services/download.html">Download and configure</a>
-      the SDK to begin integrating Google+ into your app.
+    <p>To get started, <a href="{@docRoot}google/play-services/download.html">download and configure</a>
+      the Google Play services SDK from the SDK Manager.
     </p>
             
-    <h4>Run the sample</h4>
-    <p>
-      The Google+ sample is located in <code>&lt;android-sdk&gt;/extras/google-play-services/samples/plus</code> and shows you
+    <h4>2. Run the sample</h4>
+    <p>Once you've installed the Google Play services package, the Google+ sample is located in
+    <code>&lt;android-sdk&gt;/extras/google-play-services/samples/plus</code> and shows you
       how to use the major components of the Google+ Android APIs.
     </p>
     
-    <h4>Visit the Google+ developer site</h4>
-    <p>For instructions on how to fully integrate Google+ into your app, with code snippets, visit the
-      <a href="https://developers.google.com/+/mobile/android/">Google+ developer documentation</a> located at
-      developers.google.com.
-    </p>
+    <h4>3. Read the documentation</h4>
+    <p>For quick access while developing your Android apps, the
+    <a href="{@docRoot}google/play-services/reference/com/google/android/gms/plus/package-summary.html">Google+
+    API reference</a> is available here on developer.android.com.</p>
+    <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>
     
-    <h4>See the reference documentation</h4>
-    <p>The <a href="{@docRoot}google/play-services/reference/com/google/android/gms/plus/package-summary.html">Google+ API reference</a>
-      as well as the entire <a href="{@docRoot}google/play-services/reference/packages.html">Google Play services platform reference</a>
-      is provided for you on this site.
-    </p>
   </div>
 </div>
\ No newline at end of file
diff --git a/docs/html/images/google/gps-googleplus.png b/docs/html/images/google/gps-googleplus.png
new file mode 100644
index 0000000..383445b
--- /dev/null
+++ b/docs/html/images/google/gps-googleplus.png
diff --git a/docs/html/images/google/gps-maps.png b/docs/html/images/google/gps-maps.png
new file mode 100644
index 0000000..2500f14
--- /dev/null
+++ b/docs/html/images/google/gps-maps.png