Skip to content

Commit aae1713

Browse files
author
Robert Ly
committed
docs: update gms toc and landing pages
Change-Id: I2d55026d492356b70de2071c96786b6dadb5938a
1 parent 64e4ed8 commit aae1713

File tree

20 files changed

+534
-452
lines changed

20 files changed

+534
-452
lines changed

docs/html/google/google_toc.cs

Lines changed: 15 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -18,21 +18,14 @@ localized titles are added in the language order specified below.
1818
<span class="en">Google Play services</span></a>
1919
</div>
2020
<ul>
21-
<li><a href="<?cs var:toroot?>google/play-services/overview.html">
22-
<span class="en">Overview</span></a>
21+
<li><a href="<?cs var:toroot?>google/play-services/setup.html">
22+
<span class="en">Setup</span></a>
2323
</li>
2424

25-
<li><a href="<?cs var:toroot?>google/play-services/download.html">
26-
<span class="en">Downloading and Configuring</span></a>
27-
</li>
2825
<li><a href="<?cs var:toroot?>google/play-services/auth.html">
2926
<span class="en">Authentication</span></a>
3027
</li>
3128

32-
<li><a href="<?cs var:toroot?>google/play-services/analytics.html">
33-
<span class="en">Analytics</span></a>
34-
</li>
35-
3629
<li><a href="<?cs var:toroot?>google/play-services/plus.html">
3730
<span class="en">Google+</span></a>
3831
</li>
@@ -41,9 +34,19 @@ localized titles are added in the language order specified below.
4134
<span class="en">Maps</span></a>
4235
</li>
4336

44-
<li id="tree-list">
45-
<a href="<?cs var:toroot?>google/play-services/reference/packages.html">
46-
<span class="en">Reference</span></a>
37+
<li id="tree-list" class="nav-section">
38+
<div class="nav-section-header">
39+
<a href="<?cs var:toroot?>google/play-services/reference/packages.html">
40+
<span class="en">Reference</span></a>
41+
</div>
42+
<ul>
43+
<li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/auth/package-summary.html">auth</a></li>
44+
<li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/common/package-summary.html">common</a></li>
45+
<li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/maps/package-summary.html">maps</a></li>
46+
<li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/maps.model/package-summary.html">maps.model</a></li>
47+
<li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/panorama/package-summary.html">panorama</a></li>
48+
<li><a href="<?cs var:toroot ?>google/play-services/reference/com/google/android/gms/plus/package-summary.html">plus</a></li>
49+
</ul>
4750
</li>
4851
</ul>
4952
</li>
Lines changed: 97 additions & 49 deletions
Original file line numberDiff line numberDiff line change
@@ -1,37 +1,41 @@
1-
page.title=Google Maps
2-
page.landing=true
3-
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.
4-
page.landing.link=https://developers.google.com/maps/documentation/android/
5-
page.landing.link.text=developers.google.com/maps
6-
page.landing.image=images/gps.png
1+
page.title=Google Play services
2+
header.hide=1
73

84
@jd:body
9-
<img src="{@docRoot}images/gps.png" style="float:right;" />
105

11-
<p>
12-
Google Play services is a platform delivered through the Google Play Store that
13-
lets you integrate Google products into your Android apps.
14-
The Google Play services framework consists of a services component
15-
that runs on the device and a thin client library that you package with your app.
16-
</p>
6+
<div class="landing-banner">
7+
8+
<div class="col-6">
9+
<img src="/images/google/gps.png" alt="">
10+
</div>
11+
<div class="col-6">
1712

13+
<h1 itemprop="name" style="margin-bottom:0;">Google Play services</h1>
14+
<p itemprop="description">
15+
</p>
1816

19-
<p>
20-
<a class="next-page-link topic-start-link"
21-
href="{@docRoot}google/play-services/overview.html">
22-
OVERVIEW</a>
23-
</p>
17+
<p>Give your apps more features to attract users on a wider range of devices.
18+
With Google Play services, your app can take advantage
19+
of the latest, Google-powered features such as Maps, Google+, and more.
20+
with automatic platform updates distributed as an APK through
21+
the Google Play store. This makes it faster for your users to receive updates
22+
and easier for you to integrate the newest that Google has to offer.
23+
</p>
2424

25-
<div class="vspace size-1">&nbsp;</div>
25+
<p><a class="next-page-link topic-start-link"
26+
href="/google/play-services/download.html">Setup</a></p>
2627

27-
<div class="layout-content-row">
28+
</div>
29+
</div>
30+
31+
32+
<div class="layout-content-row">
2833
<div class="layout-content-col span-4">
2934

3035
<h4>Google Technology</h4>
31-
<p>Add exciting and useful Google features such as Maps, Google+, Analytics, and more
32-
to your Android apps. Easy-to-use client libraries are provided for the products in Google
33-
Play services, so you can implement the functionality you want faster. New features
34-
and products are continuously being added, so make sure to check back often.</p>
36+
<p>Google Play services provides you with easy access to Google services and is tightly
37+
integrated with the Android OS. Easy-to-use client libraries are provided for
38+
each service that let you implement the functionality you want easier and faster.</p>
3539

3640
</div>
3741
<div class="layout-content-col span-4">
@@ -40,37 +44,81 @@ and products are continuously being added, so make sure to check back often.</p>
4044
<p>All products in Google Play services share a common authentication API
4145
that leverages the existing Google accounts on the device. You and your
4246
users have a consistent and safe way to grant and receive OAuth2 authentication
43-
to Google services. Even services that are not bundled in Google Play services
44-
can take advantage of the authentication APIs as long as they accept OAuth2
45-
tokens associated with a Google account.</p>
47+
to Google services.</p>
4648

4749
</div>
4850
<div class="layout-content-col span-4">
4951

5052
<h4>Automatic Updates</h4>
51-
<p>Devices running Android 2.2 and newer and that have the Google Play Store app installed
52-
automatically receive updates to Google Play services. New products, features, and fixes are
53-
automatically pushed to a wide range of devices, old and new. You can now enhance your app with the most
54-
up-to-date version of Google Play services without worrying about your users' Android platform version.</p>
53+
<p>Devices running Android 2.2 and newer and that have the Google Play Store
54+
app automatically receive updates to Google Play services. Enhance
55+
your app with the most recent version of Google Play services without worrying
56+
about your users' Android version.</p>
57+
58+
</div>
59+
</div>
60+
61+
62+
<h2>How It Works</h2>
5563

64+
<h4 id="client-lib">The Google Play services client library</h4>
65+
<p>
66+
The client library contains the interfaces to the individual Google
67+
services and allows you to obtain authorization from users to authenticate
68+
to these services with their credentials. It also contains APIs that allow
69+
you to resolve any issues at runtime, such as a missing, disabled, or out-of-date
70+
Google Play services APK. The client library has a light footprint if you use
71+
<a href="/tools/help/proguard.html">ProGuard</a> as part of your build process, so it won't have
72+
an adverse impact on your app's file size.
73+
</p>
74+
<p>
75+
If you want to access added features or products, you can upgrade to a new version of the
76+
client library as they are released. However, upgrading is not
77+
necessary if you don't care about new features or bug fixes.
78+
We anticipate more Google services to be continuously added, so be on the lookout for
79+
these updates.
80+
</p>
81+
82+
<div class="vspace size-2">&nbsp;</div>
83+
84+
<div class="layout-content-row">
85+
<div class="layout-content-col span-6">
86+
<h4 id="apk">The Google Play services APK</h4>
87+
<p>
88+
The Google Play services APK contains the individual Google services and runs
89+
as a background service in the Android OS. You interact with the background service
90+
through the client library and the service carries out the actions on your behalf.
91+
An easy-to-use authentication flow is also
92+
provided to gain access to the each Google service, which provides consistency for both
93+
you and your users.
94+
</p>
95+
<p>
96+
The Google Play services APK is delivered through the Google Play Store, so
97+
updates to the services are not dependent on carrier or OEM system image updates. In general, devices
98+
running Android 2.2 (Froyo) or later and have the Google Play Store app installed receive updates within a
99+
few days. This allows you to use the newest APIs in Google Play services and reach most of the
100+
devices in the Android ecosystem (devices older than Android 2.2 or devices without the Google
101+
Play Store app are not supported).
102+
</p>
103+
</div>
104+
105+
<div class="layout-content-col span-6">
106+
<img src="/images/play-services-diagram.png" />
107+
<p class="img-caption"><em>Updates to Google Play services include access to new APIs, features, and bug fixes.</em></p>
56108
</div>
57109
</div>
58110

59-
<h2>Services</h2>
60-
<div class="landing-docs">
61-
<a href="">
62-
<h4>Google+</h4>
63-
<p>Add social features to your app to with Google+.</p>
64-
</a>
65-
66-
<a href="">
67-
<h4>Google Analytics</h4>
68-
<p>Make sure you're reaching the right users and find ways to reach more with Google Analytics.</p>
69-
</a>
70-
71-
<a href="">
72-
<h4>Google Maps</h4>
73-
<p>Add compelling location-based features to your app to direct your users where they
74-
want to go.</p>
75-
</a>
76-
</div>
111+
<h4 id="benefits">The benefits for your app</h4>
112+
113+
<p>Google Play services gives you the freedom to use the newest APIs for popular
114+
Google services without worrying about device support. Updates to Google Play
115+
services are distributed automatically by the Google Play Store and new versions
116+
of the client library are delivered through the Android SDK Manager. This makes it
117+
easy for you to focus on what's important: your users' experience.</p>
118+
119+
<p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a> the SDK and check out
120+
the various products in the Google Play services platform now!</p>
121+
122+
123+
124+

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

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
3030
<div class="landing-docs">
3131
<div class="col-6 normal-links">
3232
<h3 style="clear:left">Key Developer Features</h3>
33-
<h4>Add Maps in a fragment</h4>
33+
<h4>Add maps to your app</h4>
3434
<p>With version 2 of the Google Maps Android API, you can embed maps into an activity
3535
as a fragment with a simple XML snippet. The new Maps offer exciting features such as 3D maps;
3636
indoor, satellite, terrain, and hybrid maps;
@@ -59,8 +59,8 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
5959
<h3 style="clear:left">Getting Started</h3>
6060
<h4>1. Get the Google Play services SDK</h4>
6161
<p>The Google Maps Android APIs are part of the Google Play services platform.</p>
62-
<p>To use Google Maps, <a href="{@docRoot}google/play-services/download.html">download and configure</a>
63-
the Google Play services SDK from the SDK Manager. Then see the <a class="external-link"
62+
<p>To use Google Maps, <a href="{@docRoot}google/play-services/setup.html">set up</a>
63+
the Google Play services SDK. Then see the <a class="external-link"
6464
href="https://developers.google.com/maps/documentation/android/start#installing_the_google_maps_android_v2_api">
6565
Getting Started guide</a> to get your API key for Maps and set up your app.
6666
</p>

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

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,8 @@ href="https://developers.google.com/+/mobile/android/">developers.google.com/+</
6161
<h3 style="clear:left">Getting Started</h3>
6262
<h4>1. Get the Google Play services SDK</h4>
6363
<p>The Google+ Android APIs are part of the Google Play services platform.</p>
64-
<p>To get started, <a href="{@docRoot}google/play-services/download.html">download and configure</a>
65-
the Google Play services SDK from the SDK Manager.
64+
<p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
65+
the Google Play services SDK.
6666
</p>
6767

6868
<h4>2. Run the sample</h4>

docs/html/google/play-services/download.jd renamed to docs/html/google/play-services/setup.jd

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
page.title=Downloading and Configuring the Google Play services SDK
1+
page.title=Setup
22
@jd:body
33

44
<div id="qv-wrapper">
@@ -24,7 +24,7 @@ page.title=Downloading and Configuring the Google Play services SDK
2424
</p>
2525

2626
<p>
27-
To download and configure the Google Play services SDK:
27+
To set up the Google Play services SDK:
2828
</p>
2929

3030
<ol>
@@ -34,19 +34,21 @@ page.title=Downloading and Configuring the Google Play services SDK
3434
</li>
3535
<li>
3636
Scroll to the bottom of the package list and select <b>Extras &gt; Google Play services</b>.
37-
The add-on is downloaded to your computer and installed in your SDK environment at
37+
The Google Play services SDK is downloaded to your computer and installed in your Android SDK environment at
3838
<code>&lt;android-sdk-folder&gt;/extras/google/google_play_services/</code>.
3939
</li>
40-
<li>
41-
Reference the Google Play services client library project located in
42-
<code>&lt;android-sdk-folder&gt;/extras/google/google_play_services/libproject/google-play-services_lib</code> as
43-
a library project for your Android project. See the
40+
<li>Copy the <code>&lt;android-sdk-folder&gt;/extras/google/google_play_services/libproject/google-play-services_lib</code>
41+
library project to a location in your project's source tree.</li>
42+
<li>If you are using Eclipse, import the library project into your workspace. Click <b>File > Import...</b>, select <b>Android > Existing
43+
Android Code into Workspace</b>, and browse to the copy of the library project to import it.</li>
44+
</li>
45+
<li>Reference the library project in your Android project. See the
4446
<a href="{@docRoot}tools/projects/projects-eclipse.html#ReferencingLibraryProject">Referencing a Library Project for Eclipse</a>
4547
or <a href="{@docRoot}tools/projects/projects-cmdline.html#ReferencingLibraryProject">Referencing a Library Project on the Command Line</a>
4648
for more information on how to do this.
4749
</li>
4850
<li>If you are using <a href="{@docRoot}tools/help/proguard.html">ProGuard</a>, add the following
49-
lines in the <code>&lt;project_directory&gt;/proguard-project.txt</code> file:
51+
lines in the <code>&lt;project_directory&gt;/proguard-project.txt</code> file
5052
to prevent ProGuard from stripping away required classes:
5153
<pre>
5254
-keep class * extends java.util.ListResourceBundle {

docs/html/images/google/gps.png

626 KB
Loading

docs/html/images/gps-analytics.png

-7.11 KB
Binary file not shown.

docs/html/images/gps-maps.png

-94.3 KB
Binary file not shown.

docs/html/images/gps-plus.png

-27.7 KB
Binary file not shown.

docs/html/images/gps-small.png

-13.7 KB
Binary file not shown.

0 commit comments

Comments
 (0)