summaryrefslogtreecommitdiffstats
path: root/docs/html/google/play-services
diff options
context:
space:
mode:
Diffstat (limited to 'docs/html/google/play-services')
-rw-r--r--docs/html/google/play-services/ads.jd17
-rw-r--r--docs/html/google/play-services/cast.jd92
-rw-r--r--docs/html/google/play-services/drive.jd141
-rw-r--r--docs/html/google/play-services/games.jd24
-rw-r--r--docs/html/google/play-services/id.jd4
-rw-r--r--docs/html/google/play-services/index.jd128
-rw-r--r--docs/html/google/play-services/maps.jd36
-rw-r--r--docs/html/google/play-services/plus.jd8
-rw-r--r--docs/html/google/play-services/setup.jd226
-rw-r--r--docs/html/google/play-services/wallet.jd17
10 files changed, 539 insertions, 154 deletions
diff --git a/docs/html/google/play-services/ads.jd b/docs/html/google/play-services/ads.jd
index c666ce9..18579c7 100644
--- a/docs/html/google/play-services/ads.jd
+++ b/docs/html/google/play-services/ads.jd
@@ -41,12 +41,17 @@ header.hide=1
APK. </p>
<h4>Monetize your apps</h4>
- <p>Connect with over a million Google advertisers and show relevant ads in your
- app. Users engage with the ads, you make money.
+ <p>Connect with over a million Google advertisers and show relevant ads in your app. Users
+ engage with the ads, you make money. The Google Mobile Ads SDK fully supports AdMob,
+ DoubleClick for Publishers, DoubleClick Ad Exchange, and Search Ads for Mobile Apps.
<br>
<a href="http://www.google.com/ads/admob/monetize.html" class="external-link">Learn more
and sign up</a>.</p>
+ <h4>Location-based ads</h4>
+ <p>You can use the publisher-provided location API to provide Google with the location when
+ requesting ads. Location-based ads can improve your app monetization.</p>
+
<h4>Innovative ads</h4>
<p>Choose from a range of ads across mobile devices and tablets, including interactive
ad units.</p>
@@ -60,8 +65,8 @@ header.hide=1
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The Google Mobile Ads APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK.</p>
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>.</p>
<h4>2. Run the sample</h4>
<p>Once you've installed the Google Play services package, the Google Mobile Ads sample is located
@@ -79,7 +84,5 @@ header.hide=1
<p>Detailed documentation for Google Mobile Ads for Android is available with the rest of the Google
Mobile Ads developer documents at <a href="https://developers.google.com/mobile-ads-sdk"
class="external-link">developers.google.com/mobile-ads-sdk</a>. </p>
- <p class="note"><strong>Note</strong>: The SDK doesn’t currently support DFP, Ad Exchange or Search
- Ads for Mobile Apps but support is coming soon.</p>
</div>
-</div> \ No newline at end of file
+</div>
diff --git a/docs/html/google/play-services/cast.jd b/docs/html/google/play-services/cast.jd
new file mode 100644
index 0000000..656f634
--- /dev/null
+++ b/docs/html/google/play-services/cast.jd
@@ -0,0 +1,92 @@
+page.title=Google Cast Android API
+page.tags="chromecast","miracast"
+header.hide=1
+
+@jd:body
+
+
+<div class="landing-banner">
+
+<div class="col-6">
+ <img src="{@docRoot}images/google/googlecast.png" alt="">
+</div>
+<div class="col-6">
+
+ <h1 itemprop="name" style="margin-bottom:0;">Google Cast Android API</h1>
+ <p itemprop="description">Google Cast is a technology that enables multi-screen experiences, which
+ allows users to send content from mobile devices and personal computers to their TVs.
+ You can use the Google Cast Android API
+ to add casting functionality to your Android app so users can view your app content on their
+ big screens.</p>
+
+ <p>Explore the <a href="{@docRoot}reference/com/google/android/gms/cast/package-summary.html"
+ >Google Cast Android API reference</a> or visit <a
+ href="http://developers.google.com/cast/" class="external-link">developers.google.com/cast</a>
+ for more information about how to design and build your app to support Google Cast.</p>
+ <p></p>
+</div>
+</div>
+
+<div class="landing-docs">
+ <div class="col-6 normal-links">
+ <h3 style="clear:left">Key Developer Features</h3>
+
+ <h4>Add your own style to a pre-built receiver app</h4>
+ <p>Adding support for Google Cast requires that you provide a companion app on the
+ Google Cast device, known as the receiver app. If your app streams audio or video content
+ using one of several supported media types, then you can create a receiver app with your
+ own style and branding by creating nothing more than a CSS file.
+ <br/><a href="http://developers.google.com/cast/docs/styled_receiver" class="external-link"
+ >Create a Styled Media Receiver</a></p>
+
+ <h4>Build an entirely custom receiver app</h4>
+ <p>If the Styled Media Receiver does not provide the UI components required for your
+ receiver app or does not support the media types your app requires, you can build your
+ own receiver app as a web page using the JavaScript Receiver API.
+ <br/><a href="http://developers.google.com/cast/docs/styled_receiver" class="external-link"
+ >Create a Custom Receiver</a></p>
+
+ <h4>Add playback controls to your app</h4>
+ <p>To allow users to control playback on the receiver app, you can add a
+ controller interface to your app on Android, iOS, and Chrome. The client app on these devices
+ is known as the sender app and can perform a variety of actions using the Google Cast APIs
+ such as start and pause playback and control the volume on the Google Cast device.
+ <br/><a href="http://developers.google.com/cast/docs/sender_apps" class="external-link"
+ >Create a Sender App</a></p>
+ </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 Google Cast Android APIs are part of the Google Play services platform.</p>
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a> on your development machine and be sure your test device has
+ Google Play services 4.2 (or higher) installed.</p>
+
+ <h4>2. Register your app</h4>
+ <p>Before you can develop and test apps on your own Google Cast device,
+ you need to acquire an app ID for your API calls and register your Google Cast device
+ (such as a Chromecast) as a development device. For details, read the
+ <a href="http://developers.google.com/cast/docs/registration"
+ class="external-link">Registration</a> guide.</p>
+
+ <h4>3. Design the Android app UI</h4>
+ <p>To provide the perfect user experience when casting your content to TVs, be sure your
+ app follows all the recommendations in the <a class="external-link"
+ href="https://developers.google.com/cast/docs/design_checklist"
+ >Design Checklist</a>.</p>
+
+ <h4>4. Start developing</h4>
+ <p>Read the <a class="external-link"
+ href="https://developers.google.com/cast/docs/developers">Developer's Guide</a>
+ to learn how to implement the receiver app and how to send it commands from your Android app.
+ </p>
+
+ <p>For quick access while developing your Android app, the
+ <a href="{@docRoot}reference/com/google/android/gms/cast/package-summary.html">Google Cast
+ Android API reference</a> is available here on developer.android.com.</p>
+
+ </div>
+</div> \ No newline at end of file
diff --git a/docs/html/google/play-services/drive.jd b/docs/html/google/play-services/drive.jd
new file mode 100644
index 0000000..e9662e6
--- /dev/null
+++ b/docs/html/google/play-services/drive.jd
@@ -0,0 +1,141 @@
+page.title=Google Drive Android API
+page.tags="storage","files","cloud"
+header.hide=1
+
+@jd:body
+
+ <div class="landing-banner">
+ <div class="col-6">
+ <img src="{@docRoot}images/google/gps-drive.png" alt="">
+ </div>
+
+ <div class="col-6">
+ <h1 itemprop="name" style="margin-bottom:0;">
+ Google Drive Android API
+ </h1>
+
+ <p itemprop="description">
+ Give your users access to their files, wherever they are, on any device.
+ The Google Drive Android API makes it easier than ever to use Drive to
+ store and sync user’s files between their mobile devices and the cloud.
+ Simply use Drive like local file storage and the API will handle the
+ syncing for you.
+ </p>
+
+ <p>
+ Explore the <a href=
+ "{@docRoot}reference/com/google/android/gms/drive/package-summary.html">Google
+ Drive Android API reference</a> or visit <a href=
+ "http://developers.google.com/drive/android">developers.google.com/drive/android</a>
+ for more information about integrating Google Drive into your app.
+ </p>
+ </div>
+ </div>
+
+ <div class="landing-docs">
+ <div class="col-6 normal-links">
+ <h3 style="clear:left">
+ Key Developer Features
+ </h3>
+
+ <h4>
+ Automatic syncing
+ </h4>
+
+ <p>
+ The Google Drive Android API uses the local device storage to create,
+ edit, and open files, then syncs them automatically when the device
+ is connected to the Internet. If a user requests a file that isn’t
+ already cached on the device, the Drive service downloads the file
+ the next time the device connects.<br>
+ <a href="http://developers.google.com/drive/android/files" class=
+ "external-link">Open a file</a>
+ </p>
+
+ <h4>
+ User interface components
+ </h4>
+
+ <p>
+ Building your own user interface for selecting or creating files is a
+ thing of the past. The Drive API includes activity builders for two
+ of the most common user activities: opening files and creating
+ files.<br>
+ <a href="http://developers.google.com/drive/android/create-file"
+ class="external-link">Create a file</a>
+ </p>
+
+ <h4>
+ Easily search for files
+ </h4>
+
+ <p>
+ The query builder allows you to easily construct a query by joining
+ together multiple parameters and filtering based on metadata. This
+ allows you to easily display only relevant files, such as files
+ shared with the user or files with a specific MIME type.<br>
+ <a class="external-link" href=
+ "http://developers.google.com/drive/android/queries">Query for a
+ file</a>
+ </p>
+ </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 Google Drive Android API is part of the Google Play services
+ platform.
+ </p>
+
+ <p>
+ To get started, <a href=
+ "{@docRoot}google/play-services/setup.html">set up the Google Play
+ services SDK</a>.
+ </p>
+
+ <h4>
+ 2. Run the sample
+ </h4>
+
+ <p>
+ Once you’ve set up the Google Play services SDK, you can run the
+ Google Drive sample located in
+ <code>&lt;android-sdk&gt;/extras/google-play-services/samples/drive</code>.
+ However, before you can run the sample, you need to register your app
+ in the Google Developers Console.
+ </p>
+
+ <p>
+ See <a class="external-link" href=
+ "http://developers.google.com/drive/android/get-started">Getting
+ Started guide</a> to learn how to get up and running with the Google
+ Drive Android API.
+ </p>
+
+ <h4>
+ 3. Read the documentation
+ </h4>
+
+ <p>
+ For quick access while developing your Android apps, the <a href=
+ "{@docRoot}reference/com/google/android/gms/drive/package-summary.html">
+ Google Drive API reference</a> is available here on
+ developer.android.com.
+ </p>
+
+ <p>
+ Detailed documentation for the Google Drive Android API is available
+ with the rest of the Google Drive Platform documentation at <a class=
+ "external-link" href=
+ "https://developers.google.com/drive/android">developers.google.com/drive</a>.
+ </p>
+ </div>
+ </div>
+ \ No newline at end of file
diff --git a/docs/html/google/play-services/games.jd b/docs/html/google/play-services/games.jd
index ccd6866..94f6715 100644
--- a/docs/html/google/play-services/games.jd
+++ b/docs/html/google/play-services/games.jd
@@ -17,9 +17,10 @@ header.hide=1
Let players sign in using their Google+ identities and share their gaming experience with
friends.
</p>
- <p>Visit <a class="external-link"
- href="https://developers.google.com/games/services/">developers.google.com/games/services</a>
- for more information about integrating game services into your app.
+ <p>Explore the <a href="{@docRoot}reference/com/google/android/gms/games/package-summary.html">Google
+Play Games Android API reference</a> or visit <a class="external-link" href=
+"https://developers.google.com/games/services/">developers.google.com/games/services</a> for more
+information about integrating game services into your app.
</p>
</div>
</div>
@@ -49,12 +50,13 @@ header.hide=1
class="external-link" href="https://developers.google.com/games/services/android/cloudsave">Save
game data to the cloud</a></p>
- <h4>Create real-time multiplayer games</h4>
- <p>Make your game more dynamic by letting multiple players compete or cooperate simultaneously.
- You can use Google Play game services to invite game participants or auto-match players
- anonymously, and exchange data between game clients. <br /><a class="external-link"
- href="https://developers.google.com/games/services/android/multiplayer">Develop real-time
- multiplayer games</a></p>
+ <h4>Create real-time and turn-based multiplayer games</h4>
+ <p>Make your game more dynamic with simultaneous or asynchronous gameplay.
+ Use the multiplayer APIs to send match invitations, auto-match players
+ anonymously, and exchange data between game clients. <br />Develop <a class="external-link"
+ href="https://developers.google.com/games/services/android/multiplayer">real-time
+ multiplayer</a> and <a class="external-link"
+ href="https://developers.google.com/games/services/android/turnbasedMultiplayer">turn-based multiplayer</a> games</p>
</div>
@@ -62,8 +64,8 @@ header.hide=1
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>Google Play game services is part of the Google Play services platform.</p>
- <p>To use game services, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. Then, see the <a class="external-link"
+ <p>To use game services, <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/games/services/android/quickstart">
Getting Started guide</a> to set up your app.
</p>
diff --git a/docs/html/google/play-services/id.jd b/docs/html/google/play-services/id.jd
index 664c6e6..466dfef 100644
--- a/docs/html/google/play-services/id.jd
+++ b/docs/html/google/play-services/id.jd
@@ -41,8 +41,8 @@ href="{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary.
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The advertising ID APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. </p>
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>. </p>
<h4>2. Read the docs and example code</h4>
<p>Once you've installed the Google Play services package, review the <a href="#get_started">overview</a>
diff --git a/docs/html/google/play-services/index.jd b/docs/html/google/play-services/index.jd
index 82167bc..eec4f5a 100644
--- a/docs/html/google/play-services/index.jd
+++ b/docs/html/google/play-services/index.jd
@@ -4,17 +4,15 @@ header.hide=1
@jd:body
<div class="landing-banner">
-
+
<div class="col-6">
<img src="/images/google/gps.png" alt="">
</div>
<div class="col-6">
<h1 itemprop="name" style="margin-bottom:0;">Google Play Services</h1>
- <p itemprop="description">
- </p>
-
- <p>Give your apps more features to attract users on a wider range of devices.
+ <p itemprop="description">Give your apps more features to attract users
+ on a wider range of devices.
With Google Play services, your app can take advantage
of the latest, Google-powered features such as Maps, Google+, and more,
with automatic platform updates distributed as an APK through
@@ -25,7 +23,6 @@ header.hide=1
</div>
</div>
-
<div class="layout-content-row">
<div class="layout-content-col span-4">
@@ -47,8 +44,8 @@ each service that let you implement the functionality you want easier and faster
<div class="layout-content-col span-4">
<h4>Automatic Updates</h4>
-<p>Devices running Android 2.2 and newer and that have the Google Play Store
-app automatically receive updates to Google Play services. Enhance
+<p>Devices running Android 2.3 or higher that have the Google Play Store
+app will automatically receive updates to Google Play services. Enhance
your app with the most recent version of Google Play services without worrying
about your users' Android version.</p>
@@ -60,6 +57,107 @@ about your users' Android version.</p>
</div>
+<h2 style="margin-top:0" id="newfeatures">New Features</h2>
+
+<div class="toggle-content opened">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
+ alt=""/>Google Play services, Version 4.4</a> <em>(May 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+<dl>
+<dt>Highlights in Version 4.4</dt>
+
+<dd>
+<p>For a summary of the feature highlights in Google Play services 4.4, see the
+announcement <a href="http://android-developers.blogspot.com/2014/05/google-play-services-44.html" class="external-link">blog post</a>.</p>
+<ul>
+ <li><strong>Maps</strong> - New features for Street View and enhanced control of
+ Indoor Maps.
+ <ul>
+ <li><a href="http://developers.google.com/maps/documentation/android/streetview.html" class="external-link">Street View developer guide</a> - Add Street View to your app and programmatically control
+ the user’s experience.
+ <li><a href="http://developers.google.com/maps/documentation/android/map.html#indoor_maps" class="external-link">Indoor Maps developer guide</a> - Customize the level picker
+ and specify the active level of a building.</a>
+ </ul>
+ </li>
+
+ <li><strong>Activity recognition</strong> - The Location API has been updated with new activity detectors for running and walking.
+ <ul>
+ <li><a href="{@docRoot}reference/com/google/android/gms/location/DetectedActivity.html"><code>DetectedActivity</code> class reference</a>
+ </ul>
+ </li>
+
+ <li><strong>Mobile Ads</strong> - The new in-app purchase APIs allow
+ publishers to display in-app purchase ads, which enables users to purchase
+ advertised items directly.
+ <ul>
+ <li><a href="https://developers.google.com/mobile-ads-sdk/docs/admob/advanced#play-inapppurchaselistener" class="external-link">In-app purchase APIs developer guide</a> -
+ Enable in-app purchases via ads by using the in-app purchase APIs.
+ <li><a href="{@docRoot}reference/com/google/android/gms/ads/purchase/package-summary.html">In-app purchase API reference</a>
+ </ul>
+ </li>
+
+ <li><strong>Wallet Fragment</strong> - The new Wallet Fragment API allows you
+ to easily integrate Google Wallet Instant Buy with an existing app.
+ <ul>
+ <li><a href="http://developers.google.com/wallet/instant-buy/android/tutorial.html#about_walletfragment" class="external-link">About Wallet Fragment</a> - Tutorial showing how to
+ use wallet fragment to handle user events and to automate key parts of the purchase lifecycle.
+ <li><a href="http://developers.google.com/wallet/instant-buy/diagrams.html#detailed_api_process_flow" class="external-link">Detailed API process flow</a></a>
+ </ul>
+ </li>
+</ul>
+</dd>
+</dl>
+
+ </div>
+</div>
+
+<div class="toggle-content closed">
+ <p><a href="#" onclick="return toggleContent(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
+ alt=""/>Google Play services, Version 4.3</a> <em>(March 2014)</em>
+ </p>
+
+ <div class="toggle-content-toggleme">
+<dl>
+<dt>Highlights in Version 4.3</dt>
+<dd>
+<p>For a summary of the feature highlights in Google Play services 4.3, see the
+announcement <a href="http://android-developers.blogspot.com/2014/03/google-play-services-43.html" class="external-link">blog post</a>.</p>
+<ul>
+<li><strong>Play Games</strong> - The new Game Gifts API enables games to send virtual in-game requests to anyone in a player’s circles or through player search.
+ <ul>
+ <li><a href="http://developers.google.com/games/services/android/giftRequests.html" class="external-link">Developing Game Gifts in Android</a></li>
+ <li><a href="{@docRoot}reference/com/google/android/gms/games/request/package-summary.html">Game Gifts API reference</a></li>
+ </ul>
+</li>
+<li><strong>Analytics</strong> - Google Analytics and Tag Manager are now part of Google Play services.
+ <ul>
+ <li><a href="http://developers.google.com/analytics/devguides/collection/android/v4/" class="external-link">Getting Started with the Analytics API in Android</a></li>
+ <li><a href="/reference/com/google/android/gms/analytics/package-summary.html">Analytics API reference</a></li>
+ <li><a href="http://developers.google.com/tag-manager/android/" class="external-link">Getting Started with the Tag Manager API in Android</a></li>
+ <li><a href="{@docRoot}reference/com/google/android/gms/tagmanager/package-summary.html">Tag Manager API reference</a></li>
+ </ul>
+</li>
+<li><strong>Drive</strong> - Change notifications, offline content, and more.
+ <ul>
+ <li><a href="http://developers.google.com/drive/android/pinning.html" class="external-link">Pinning Files</a> - Make files available offline.</li>
+ <li><a href="http://developers.google.com/drive/android/events.html" class="external-link">Listening for Change Events</a> - Receive notifications for change events asynchronously.</li>
+ <li><a href="http://developers.google.com/drive/android/appfolder.html" class="external-link">Storing Application Data</a> - Store application data in a special hidden folder.</li>
+ </ul>
+</li>
+<li><strong>Address</strong> - Let your users provide complete addresses in a single click.
+ <ul>
+ <li><a href="{@docRoot}reference/com/google/android/gms/identity/intents/package-summary.html">Address API reference</a> </li>
+ </ul>
+</li>
+</ul>
+</dd>
+</dl>
+ </div>
+</div>
<h2>How It Works</h2>
@@ -71,7 +169,7 @@ about your users' Android version.</p>
you to resolve any issues at runtime, such as a missing, disabled, or out-of-date
Google Play services APK. The client library has a light footprint if you use
<a href="/tools/help/proguard.html">ProGuard</a> as part of your build process, so it won't have
- an adverse impact on your app's file size.
+ an adverse impact on your app's file size.
</p>
<p>
If you want to access added features or products, you can upgrade to a new version of the
@@ -92,14 +190,14 @@ about your users' Android version.</p>
through the client library and the service carries out the actions on your behalf.
An easy-to-use authorization flow is also
provided to gain access to the each Google service, which provides consistency for both
- you and your users.
+ you and your users.
</p>
<p>
The Google Play services APK is delivered through the Google Play Store, so
updates to the services are not dependent on carrier or OEM system image updates. In general, devices
- running Android 2.2 (Froyo) or later and have the Google Play Store app installed receive updates within a
+ running Android 2.3 (Gingerbread) or later and have the Google Play Store app installed receive updates within a
few days. This allows you to use the newest APIs in Google Play services and reach most of the
- devices in the Android ecosystem (devices older than Android 2.2 or devices without the Google
+ devices in the Android ecosystem (devices older than Android 2.3 or devices without the Google
Play Store app are not supported).
</p>
</div>
@@ -120,8 +218,4 @@ of the client library are delivered through the Android SDK Manager. This makes
easy for you to focus on what's important: your users' experience.</p>
<p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a> the SDK and check out
-the various products in the Google Play services platform now!</p>
-
-
-
-
+the various products in the Google Play services platform now!</p> \ No newline at end of file
diff --git a/docs/html/google/play-services/maps.jd b/docs/html/google/play-services/maps.jd
index 965444a..881c484 100644
--- a/docs/html/google/play-services/maps.jd
+++ b/docs/html/google/play-services/maps.jd
@@ -1,4 +1,4 @@
-page.title=Google Maps Android API
+page.title=Google Maps Android API v2
page.tags="mapview","location"
header.hide=1
@@ -12,17 +12,16 @@ 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>The <a
+ <p>Explore 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, 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>
+>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>
</div>
@@ -32,7 +31,7 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
<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.
@@ -53,15 +52,22 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
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>
+
+ <h4>Add Street View to your app</h4>
+ <p>Embed Street View into an activity and let your users explore the world
+ through panoramic 360-degree views. Programmatically control the zoom and
+ orientation (tilt and bearing) of the Street View camera, and animate the
+ camera movements over a given duration.
+ <a class="external-link" href="https://developers.google.com/maps/documentation/android/streetview">Add Street View</a>.</p>
</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 Google Maps Android APIs are part of the Google Play services platform.</p>
- <p>To use Google Maps, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. Then see the <a class="external-link"
+ <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">
Getting Started guide</a> to get your API key for Maps and set up your app.
</p>
@@ -70,7 +76,7 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
<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>
@@ -80,12 +86,12 @@ href="https://developers.google.com/maps/documentation/android/">developers.goog
<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>
</div>
-</div> \ No newline at end of file
+</div>
diff --git a/docs/html/google/play-services/plus.jd b/docs/html/google/play-services/plus.jd
index e126dad..95c9e0e 100644
--- a/docs/html/google/play-services/plus.jd
+++ b/docs/html/google/play-services/plus.jd
@@ -17,8 +17,8 @@ header.hide=1
with the same credentials they use on Google every day. Once a user signs in with Google,
you can create more engaging experiences and drive usage of your app.</p>
- <p>Check out the <a href="{@docRoot}reference/com/google/android/gms/plus/package-summary.html"
->Google+ Android API reference</a> and visit <a class="external-link"
+ <p>Explore the <a href="{@docRoot}reference/com/google/android/gms/plus/package-summary.html"
+>Google+ Android API reference</a> or visit <a class="external-link"
href="https://developers.google.com/+/mobile/android/">developers.google.com/+</a> for more
information about integrating Google+ into your app.</p>
</div>
@@ -61,8 +61,8 @@ information about integrating Google+ into your app.</p>
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The Google+ Android APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK.
+ <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up
+ the Google Play services SDK</a>.
</p>
<h4>2. Run the sample</h4>
diff --git a/docs/html/google/play-services/setup.jd b/docs/html/google/play-services/setup.jd
index 6553c18..744e191 100644
--- a/docs/html/google/play-services/setup.jd
+++ b/docs/html/google/play-services/setup.jd
@@ -1,6 +1,24 @@
page.title=Set Up Google Play Services SDK
@jd:body
+
+
+<div id="qv-wrapper">
+<div id="qv">
+
+<h2>In this document</h2>
+<ol>
+ <li><a href="#Install">Install the Google Play Services SDK</a></li>
+ <li><a href="#Setup">Set Up a Project that Uses Google Play Services</a></li>
+ <li><a href="#Proguard">Create a Proguard Exception</a></li>
+ <li><a href="#ensure">Ensure Devices Have the Google Play services APK</a></li>
+</ol>
+
+
+</div>
+</div>
+
+
<p>To develop an app using the <a href="{@docRoot}reference/gms-packages.html">Google
Play services APIs</a>, you must download the Google Play services SDK
@@ -10,7 +28,7 @@ The download includes the client library and code samples.</p>
<p>To test your app when using the Google Play services SDK, you must use either:</p>
<ul>
<li>A compatible Android
- device that runs Android 2.2 or higher and includes Google Play Store.</li>
+ device that runs Android 2.3 or higher and includes Google Play Store.</li>
<li>The Android emulator with an <a href="{@docRoot}tools/devices/index.html">AVD</a>
that runs the Google APIs platform based on Android 4.2.2 or higher.</li>
</ul>
@@ -24,9 +42,12 @@ both phones and tablets.</p>
<p>To install the Google Play services SDK for development:</p>
<ol>
- <li>Launch the SDK Manager.
+ <li>Launch the SDK Manager in one of the following ways:
<ul>
- <li>From Eclipse (with <a href="{@docRoot}tools/help/adt.html">ADT</a>),
+ <li>In Android Studio, click <strong>SDK Manager</strong>
+<img src="{@docRoot}images/tools/sdk-manager-studio.png" style="vertical-align:bottom;margin:0;height:19px" />
+in the toolbar.</li>
+ <li>In Eclipse (with <a href="{@docRoot}tools/help/adt.html">ADT</a>),
select <strong>Window</strong> &gt; <strong>Android SDK Manager</strong>.</li>
<li>On Windows, double-click the <code>SDK Manager.exe</code> file at the root of the Android
SDK directory.</li>
@@ -36,19 +57,25 @@ both phones and tablets.</p>
</li>
<li>Install the Google Play services SDK.
<p>Scroll to the bottom of the package list, expand <b>Extras</b>, select
- <b>Google Play services</b>, and install it.</p>
+ <b>Google Play services</b>, and install it. If you're using Android Studio, also install
+ <b>Google Repository</b> (it provides the Maven repository used for Gradle builds).</p>
<p>The Google Play services SDK is saved in your Android SDK environment at
<code>&lt;android-sdk&gt;/extras/google/google_play_services/</code>.</p>
+
+<p class="note"><strong>Note:</strong> Google Play services 4.0.30 (released
+November 2013) and newer versions require Android 2.3 or higher. If your app supports Android 2.2,
+you can continue development with the Google Play services SDK, but must instead install
+<b>Google Play services for Froyo</b> from the SDK Manager.</p>
+
</li>
<li>Install a compatible version of the Google APIs platform.
<p>If you want to test your app on the emulator, expand the directory for <b>Android 4.2.2
(API 17)</b> or a higher version, select <b>Google APIs</b>, and install it. Then create a
new <a href="{@docRoot}tools/devices/index.html">AVD</a> with Google APIs as
the platform target.</p>
- <p class="note"><strong>Note:</strong> Only Android 4.2.2 and higher versions of the
- Google APIs platform include Google Play services.</p>
</li>
<li>Make a copy of the Google Play services library project.
+ <p class="note"><strong>Note:</strong> If you are using Android Studio, skip this step.</p>
<p>Copy the library project at
<code>&lt;android-sdk&gt;/extras/google/google_play_services/libproject/google-play-services_lib/</code>
to the location where you maintain your Android app projects.
@@ -60,23 +87,82 @@ both phones and tablets.</p>
-<h2 id="Setup">Set Up a Project with the Library</h2>
+<h2 id="Setup">Set Up a Project that Uses Google Play Services</h2>
-<p>To set up a project to use the Google Play services SDK:</p>
+<p><b>Using Android Studio:</b></p>
<ol>
- <li>Reference the library project in your Android project.
- <p>See the
- <a href="{@docRoot}tools/projects/projects-eclipse.html#ReferencingLibraryProject">Referencing a Library Project for Eclipse</a>
- or <a href="{@docRoot}tools/projects/projects-cmdline.html#ReferencingLibraryProject">Referencing a Library Project on the Command Line</a>
- for more information on how to do this.</p>
- <p class="note"><strong>Note:</strong>
- You should be referencing a copy of the library that you copied to your development
- workspace&mdash;you should not reference the library directly from the Android SDK directory.</p>
+ <li>Open the <code>build.gradle</code> file inside your application module directory.
+ <p class="note"><strong>Note:</strong> Android Studio projects contain a top-level
+ <code>build.gradle</code> file and a <code>build.gradle</code> file for each module.
+ Be sure to edit the file for your application module. See
+ <a href="{@docRoot}sdk/installing/studio-build.html">Building Your Project with
+ Gradle</a> for more information about Gradle.</p></li>
+ <li>Add a new build rule under <code>dependencies</code> for the latest version of
+<code>play-services</code>. For example:
+<pre class="no-pretty-print">
+apply plugin: 'android'
+...
+
+dependencies {
+ compile 'com.android.support:appcompat-v7:+'
+ <strong>compile 'com.google.android.gms:play-services:4.4.52'</strong>
+}
+</pre>
+<p>Be sure you update this version number each time Google Play services is updated.</p>
</li>
- <li>If you are using <a href="{@docRoot}tools/help/proguard.html">ProGuard</a>, add the following
- lines in the <code>&lt;project_directory&gt;/proguard-project.txt</code> file
- to prevent ProGuard from stripping away required classes:
+ <li>Save the changes and click <strong>Sync Project with Gradle Files</strong>
+<img src="{@docRoot}images/tools/sync-project.png" style="vertical-align:bottom;margin:0;height:19px" />
+in the toolbar.
+ </li>
+ <li>Open your app's manifest file and add the following tag as a child of the <a
+href="{@docRoot}guide/topics/manifest/application-element.html">{@code &lt;application>}</a>
+element:
+<pre>
+&lt;meta-data android:name="com.google.android.gms.version"
+ android:value="&#64;integer/google_play_services_version" />
+</pre>
+ </li>
+</ol>
+
+<p>You can now begin developing features with the
+<a href="{@docRoot}reference/gms-packages.html">Google Play services APIs</a>.</p>
+
+
+<p><b>Using Eclipse or another IDE:</b></p>
+
+<p>To make the Google Play services APIs available to your app, you must reference the library
+project you created in step 4 of the <a href="#Install">installation instructions</a>.</p>
+<p>See the <a href="{@docRoot}tools/projects/projects-eclipse.html#ReferencingLibraryProject"
+>Referencing a Library Project for Eclipse</a> or <a
+href="{@docRoot}tools/projects/projects-cmdline.html#ReferencingLibraryProject">Referencing a
+Library Project on the Command Line</a> for more information on how to do this.</p>
+
+<p class="note"><strong>Note:</strong>
+You should be referencing a copy of the library that you copied to your development
+workspace&mdash;you should not reference the library directly from the Android SDK directory.</p>
+
+<p>After you've added the Google Play services library as a dependency for your app project,
+open your app's manifest file and add the following tag as a child of the <a
+href="{@docRoot}guide/topics/manifest/application-element.html">{@code &lt;application>}</a>
+element:
+<pre>
+&lt;meta-data android:name="com.google.android.gms.version"
+ android:value="&#64;integer/google_play_services_version" />
+</pre>
+
+
+<p>Once you've set up your project to reference the library project,
+you can begin developing features with the
+<a href="{@docRoot}reference/gms-packages.html">Google Play services APIs</a>.</p>
+
+
+
+<h2 id="Proguard">Create a Proguard Exception</h2>
+
+<p>To prevent <a href="{@docRoot}tools/help/proguard.html">ProGuard</a> from stripping away
+required classes, add the following lines in the
+<code>&lt;project_directory&gt;/proguard-project.txt</code> file:
<pre>
-keep class * extends java.util.ListResourceBundle {
protected Object[][] getContents();
@@ -88,27 +174,28 @@ both phones and tablets.</p>
-keepnames &#64;com.google.android.gms.common.annotation.KeepName class *
-keepclassmembernames class * {
- &#64;ccom.google.android.gms.common.annotation.KeepName *;
+ &#64;com.google.android.gms.common.annotation.KeepName *;
}
-keepnames class * implements android.os.Parcelable {
public static final ** CREATOR;
}
</pre>
-</ol>
-
-<p>Once you have the Google Play services library project added to your app project,
-you can begin developing features with the
-<a href="{@docRoot}reference/gms-packages.html">Google Play services APIs</a>.</p>
+<p class="note"><strong>Note:</strong> When using Android Studio, you must add Proguard
+to your <code>gradle.build</code> file's build types. For more information, see the
+<a href="http://tools.android.com/tech-docs/new-build-system/user-guide#TOC-Running-ProGuard"
+>Gradle Plugin User Guide</a>.
+</ol>
<h2 id="ensure">Ensure Devices Have the Google Play services APK</h2>
<p>As described in the <a href="{@docRoot}google/play-services/index.html">Google Play services
introduction</a>, Google Play delivers service updates for users on
-Android 2.2 through the Google Play Store app. However, updates might not reach
-all users immediately.</p>
+Android 2.3 and higher through the Google Play Store app. However, updates might not reach
+all users immediately, so your app should verify the version available before attempting to
+perform API transactions.</p>
<p class="caution">
<strong>Important:</strong>
@@ -118,77 +205,36 @@ all users immediately.</p>
{@link android.app.Activity#onResume onResume()} method of the main activity.
</p>
-<p>Here are four scenarios that describe the possible state of the Google Play services APK on
-a user's device:</p>
-<ol>
- <li>
- A recent version of the Google Play Store app is installed, and the most recent Google Play
- services APK has been downloaded.
- </li>
- <li>
- A recent version of the Google Play Store app is installed, but the most recent Google Play
- services APK has <em>not</em> been downloaded.
- </li>
- <li>
- An old version of the Google Play Store app, which does not proactively download Google Play
- services updates, is present.
- </li>
- <li>
- The Google Play services APK is missing or disabled on the device, which might happen if the
- user explicitly uninstalls or disables it.
- </li>
-</ol>
-<p>
- Case 1 is the success scenario and is the most common. However, because the other scenarios can
- still happen, you must handle them every time your app connects to a Google Play service to
- ensure that the Google Play services APK is present, up-to-date, and enabled.
-</p>
-<p>
- To help you, the Google Play services client library has utility methods to
- determine whether or not the Google Play services APK is recent enough to support the
- version of the client library you are using. If not, the client library sends users to the
- Google Play Store to download the recent version of the Google Play services APK.
-</p>
-
-<p class="note">
-<b>Note:</b>
- The Google Play services APK is not visible by searching the Google Play Store. The client
- library provides a deep link into the Google Play Store when it detects that the device has a
- missing or incompatible Google Play services APK.
-</p>
+<p>The Google Play services library includes utility methods that help you determine whether or not
+the Google Play services version on the device supports the version of the client library you are
+using. If the version on the device is too old, the system will take the user to Google Play Store
+in order to install the recent version of the Google Play services.</p>
-<p>
- It is up to you choose the appropriate place in your app to do the following steps to check for
- a valid Google Play services APK. For example, if Google Play services is required for your app,
- you might want to do it when your app first launches. On the other hand, if Google Play services
- is an optional part of your app, you can do these checks if the user navigates to that portion
- of your app:
-</p>
+<p>Because each app uses Google Play services differently, it's up to you decide the appropriate
+place in your app to check verify the Google Play services version. For example, if Google Play
+services is required for your app at all times, you might want to do it when your app first
+launches. On the other hand, if Google Play services is an optional part of your app, you can check
+the version only once the user navigates to that portion of your app.</p>
-<ol>
- <li>
- Query for the status of Google Play services on the device with the
-<a href="{@docRoot}reference/com/google/android/gms/common/GooglePlayServicesUtil.html#isGooglePlayServicesAvailable(android.content.Context)"
->{@code isGooglePlayServicesAvailable()}</a> method, which returns a result code.
- </li>
- <li>
- If the result code is
+<p>To verify the Google Play services version, call <a href="{@docRoot}reference/com/google/android/gms/common/GooglePlayServicesUtil.html#isGooglePlayServicesAvailable(android.content.Context)"
+>{@code isGooglePlayServicesAvailable()}</a>. If the result code is
<a href="{@docRoot}reference/com/google/android/gms/common/ConnectionResult.html#SUCCESS"
>{@code SUCCESS}</a>,
- then the Google Play services APK is up-to-date, and you can proceed as normal.
- </li>
- <li>
- If the result code is
+ then the Google Play services APK is up-to-date and you can continue to make a connection.
+If, however, the result code is
<a href="{@docRoot}reference/com/google/android/gms/common/ConnectionResult.html#SERVICE_MISSING"
>{@code SERVICE_MISSING}</a>,
<a href="{@docRoot}reference/com/google/android/gms/common/ConnectionResult.html#SERVICE_VERSION_UPDATE_REQUIRED"
>{@code SERVICE_VERSION_UPDATE_REQUIRED}</a>,
or
<a href="{@docRoot}reference/com/google/android/gms/common/ConnectionResult.html#SERVICE_DISABLED"
->{@code SERVICE_DISABLED}</a>, then
+>{@code SERVICE_DISABLED}</a>, then the user needs to install an update. So,
call <a href="{@docRoot}reference/com/google/android/gms/common/GooglePlayServicesUtil.html#getErrorDialog(int, android.app.Activity, int)"
- >{@code getErrorDialog()}</a>
- to display an error message to the user, which allows the user to download the APK
- from the Google Play Store or enable it in the device's system settings.
- </li>
-</ol> \ No newline at end of file
+ >{@code GooglePlayServicesUtil.getErrorDialog()}</a> and pass it the result error code.
+This returns a {@link android.app.Dialog} you should show, which provides an appropriate message
+about the error and provides an action
+that takes the user to Google Play Store to install the update.</p>
+
+
+<p>To then begin a connection to Google Play services, read <a
+href="{@docRoot}google/auth/api-client.html">Accessing Google Play Services APIs</a>.</p>
diff --git a/docs/html/google/play-services/wallet.jd b/docs/html/google/play-services/wallet.jd
index b9b98d9..edd4947 100644
--- a/docs/html/google/play-services/wallet.jd
+++ b/docs/html/google/play-services/wallet.jd
@@ -11,10 +11,11 @@ header.hide=1
services from your app. Transactions are monitored for fraud 24/7. Keep your existing
payments infrastructure and integrate Google Wallet quickly, easily and free of charge.</p>
- <p><a class="external-link" href="http://getinstantbuy.withgoogle.com/">Apply for
- production access</a> before launching Instant Buy in your app. We recommend applying
- before starting development. Note that Instant Buy is currently only available to
- US-based merchants. </p>
+ <p>To ensure that your app content is consistent with the requirements for
+ Instant Buy access, <a class="external-link" href="https://support.google.com/wallet/business/contact/interest">apply for content review</a> before
+ starting development. Note that Instant Buy is currently only
+ available to US-based merchants. Once you've completed integration, you can
+ apply for production access by <a class="external-link" href="https://support.google.com/wallet/business/contact/ui_review">submitting your sandbox integration for review</a>.</p>
<p>Check out the <a
href="{@docRoot}reference/com/google/android/gms/wallet/package-summary.html">Instant
@@ -61,8 +62,8 @@ header.hide=1
<h3 style="clear:left">Getting Started</h3>
<h4>1. Get the Google Play services SDK</h4>
<p>The Google Wallet Android APIs are part of the Google Play services platform.</p>
- <p>To get started, <a href="{@docRoot}google/play-services/setup.html">set up</a>
- the Google Play services SDK. Then see the <a class="external-link"
+ <p>To get started, <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/commerce/wallet/instant-buy/android/tutorial">tutorial</a>
to learn how to set up your app.
</p>
@@ -71,8 +72,8 @@ header.hide=1
sample located in <code>&lt;android-sdk&gt;/extras/google-play-services/samples/wallet</code>.
The sample shows you how to use the major components of the Instant Buy API.</p>
<p>The <a
- class="external-link" href="https://developers.google.com/commerce/wallet/instant-buy/android/quickstart">Quick
- Start guide</a> provides directions on how to get the Wallet sample up and running</p>
+ class="external-link" href="https://developers.google.com/wallet/instant-buy/android/tutorial">Instant Buy Android API tutorial</a>
+ provides directions on how to get the Wallet sample up and running.</p>
<h4>3. Read the documentation</h4>
<p>For quick access while developing your Android apps, the <a
href="{@docRoot}reference/com/google/android/gms/wallet/package-summary.html">Google Wallet