Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 141b3b9c authored by Robert Ly's avatar Robert Ly Committed by Android (Google) Code Review
Browse files

Merge "resolved conflicts for merge of 99c3605c to master"

parents c5dc0d0c b4590b45

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

+8 −8
Original line number Diff line number Diff line 
page.title=Google Maps Android API

page.title=Google Maps Android API v2

page.tags=mapview,location

header.hide=1
@@ -12,14 +12,14 @@ header.hide=1 
</div>

<div class="col-6">



  <h1 itemprop="name" style="margin-bottom:0;">Google Maps Android API</h1>

  <h1 itemprop="name" style="margin-bottom:0;">Google Maps Android API v2</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>Explore the <a

href="{@docRoot}reference/com/google/android/gms/maps/package-summary.html"

>Google Maps Android API reference</a> or visit <a class="external-link"

>Google Maps Android API v2 reference</a> or visit <a class="external-link"

href="https://developers.google.com/maps/documentation/android/">developers.google.com/maps</a>

for more information about adding maps to your app.</p>

</div>
@@ -31,7 +31,7 @@ for more information about adding maps to your app.</p> 
  <div class="col-6 normal-links">

    <h3 style="clear:left">Key Developer Features</h3>

    <h4>Add maps to your app</h4>

    <p>With version 2 of the Google Maps Android API, you can embed maps into an activity

    <p>With Google Maps Android API v2, 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.
@@ -58,7 +58,7 @@ for more information about adding maps to your app.</p> 
  <div class="col-6 normal-links">

    <h3 style="clear:left">Getting Started</h3>

    <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>Google Maps Android API v2 is part of the Google Play services platform.</p>

    <p>To use Google Maps, <a href="{@docRoot}google/play-services/setup.html">set up

      the Google Play services SDK</a>. Then see the <a class="external-link"

      href="https://developers.google.com/maps/documentation/android/start#installing_the_google_maps_android_v2_api">
@@ -69,7 +69,7 @@ for more information about adding maps to your app.</p> 
    

    <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.

      how to use the major components of Google Maps Android API v2.

    </p>

    

    <h4>3. Read the documentation</h4>
@@ -79,9 +79,9 @@ for more information about adding maps to your app.</p> 
    

    <p>For quick access while developing your Android apps, the

      <a href="{@docRoot}reference/com/google/android/gms/maps/package-summary.html">Google Maps

      Android API reference</a> is available here on developer.android.com.</p>

      Android API v2 reference</a> is available here on developer.android.com.</p>



    <p>Detailed documentation for the Google Maps Android APIs is available with the rest of the

    <p>Detailed documentation for Google Maps Android API v2 is available 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>