Merge "doc change: Update Google Play Services pages for gouda." into klp-dev

docs/html/google/google_toc.cs

@@ -37,7 +37,22 @@
   </li>
   <li class="nav-section">
     <div class="nav-section-header empty"><a href="<?cs var:toroot?>google/play-services/maps.html">
-          <span class="en">Google Maps</span>
+          <span class="en">Maps</span>
+      </a></div>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header"><a href="<?cs var:toroot ?>google/play-services/ads.html">
+      <span class="en">Ads</span></a>
+    </div>
+    <ul>
+      <li><a href="<?cs var:toroot?>google/play-services/id.html">
+          <span class="en">Advertising ID</span></a>
+      </li>
+    </ul>
+  </li>
+  <li class="nav-section">
+    <div class="nav-section-header empty"><a href="<?cs var:toroot?>google/play-services/wallet.html">
+          <span class="en">Wallet</span>
       </a></div>
   </li>
   <li class="nav-section">

docs/html/google/index.jd

@@ -112,7 +112,7 @@ cloud messaging.</p>
   <div class="cell-icon">
     <img src="{@docRoot}images/google/wallet.png" width="40" />
   </div>
-    <h4><a class="external-link" href="https://developers.google.com/commerce/wallet/instant-buy/"
+    <h4><a class="external-link" href="{@docRoot}google/play-services/wallet.html"
     >Google Wallet Instant Buy</a></h4>
     <p>Provide fast and easy checkout in your app when selling physical goods and services.
     Increase conversions by streamlining your purchase flow and reducing the amount of
@@ -136,11 +136,11 @@ interaction patterns, and much more.
 
 <div class="landing-cell">
   <div class="cell-icon">
-    <img src="{@docRoot}images/google/admob-money.png" width="40" />
+    <img src="{@docRoot}images/google/google-mobile-ads.png" width="40" />
   </div>
-    <h4><a class="external-link" href="https://developers.google.com/mobile-ads-sdk/"
-    >Google AdMob Ads</a></h4>
-    <p>Display ads from AdMob offer you an alternative revenue opportunity that leverages
+    <h4><a class="external-link" href="{@docRoot}google/play-services/ads.html"
+    >Google Mobile Ads</a></h4>
+    <p>Display ads from Google Mobile Ads offer you an alternative revenue opportunity that leverages
     multiple ad networks with targeted ads and several display formats.
     </p>
 </div>

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

@@ -0,0 +1,85 @@
+page.title=Google Mobile Ads
+page.tags="Ads","monetization", "AdMob", "Google Play services"
+header.hide=1
+
+@jd:body
+
+
+<div class="landing-banner">
+        
+<div class="col-6">
+  <img src="{@docRoot}images/google/gps-ads.png" alt="">
+</div>
+<div class="col-6">
+
+<h1 itemprop="name" style="margin-bottom:0;">Google Mobile Ads</h1>
+<p itemprop="description">
+  Monetize your app with banner or interstitial ads from
+  Google's vast pool of advertisers. Integrate with top ad networks through
+  mediation to maximize your revenue from impressions. Take advantage of new
+  ad features and capabilities through Google Play services, without having to
+  add or update a library in your APK.
+</p>
+
+<p>
+  Check out the  <a href=
+  "{@docRoot}reference/gms-packages.html">Google Mobile Ads API reference</a> and visit <a class=
+  "external-link" href=
+  "http://developers.google.com/mobile-ads-sdk">developers.google.com/mobile-ads-sdk</a>
+  for more information about integrating Google Mobile Ads 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>Seamless auto-updates</h4>
+      <p>The Google Mobile Ads SDK is part of Google Play services, so you can take advantage of features
+      and capabilities in each new release of Google Play services, without needing to update your
+      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.
+      <br>
+      <a href="http://www.google.com/ads/admob/monetize.html" class="external-link">Learn more
+      and sign up</a>.</p>
+
+      <h4>Innovative ads</h4>
+      <p>Choose from a range of ads across mobile devices and tablets, including interactive
+      ad units.</p>
+
+      <h4>Flexible and powerful tools </h4>
+      <p>Filters and controls help you manage your ads. If you want to use multiple ad
+      networks, you can do that too, with free ad network mediation.</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 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>
+
+    <h4>2. Run the sample</h4>
+    <p>Once you've installed the Google Play services package, the Google Mobile Ads sample is located
+    in <code>&lt;android-sdk&gt;/extras/google-play-services/samples/ads</code> and shows you how to
+    serve banner and interstitial ads using the Google Mobile Ads APIs.</p>
+
+    <h4>3. Read the documentation</h4>
+    <p>Read the <a class="external-link" href="https://www.google.com/adsense/localized-terms">AdSense
+    Terms of Service</a> and the <a class="external-link"
+    href="https://support.google.com/admob/topic/1307235?hl=en&ref_topic=1307209">AdMob
+    publisher guidelines and policies</a>.</p>
+    <p>For quick access while developing your Android apps, the <a
+    href="{@docRoot}reference/gms-packages.html">Google Mobile Ads API reference</a> is available here on
+    developer.android.com.</p>
+    <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>

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

@@ -0,0 +1,195 @@
+page.title=Advertising ID
+page.tags="Ads","Advertising ID", "ID"
+header.hide=1
+
+@jd:body
+
+<div class="landing-banner">
+        
+<div class="col-8">
+
+  <h1 itemprop="name" style="margin-bottom:0;">Advertising ID</h1>
+  <p itemprop="description">The advertising ID is a user-specific, unique, resettable ID for advertising, provided by
+    Google Play services. Developers can use the advertising ID to deliver targeted ads to users in a consistent way.
+    At the same time, the advertising ID gives users control over their privacy and the ability to
+    op-out of interest-based ads at any time.</p>
+
+<p>The advertising ID is accessible through a straightforward API that you can implement in your apps. For details, 
+take a look at the
+<a href="#get_started">overview</a> and the <a
+href="{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary.html">advertising ID API reference</a>.
+
+</div>
+</div>
+
+<div class="landing-docs">
+  <div class="col-6 normal-links">
+    <h3 style="clear:left">Key Developer Features</h3>
+
+      <h4>Standard, simple ID</h4>
+      <p>The advertising ID is a part of a standard, simple system for serving ads and performing analytics.</p>
+
+      <h4>Giving users control</h4>
+      <p>Users  can reset their advertising ID or opt out of interest-based ads at any time, right from the Google Settings app.
+      Their preferences apply across all ad companies that use the advertising ID.</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 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>
+
+    <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>
+    below, as well as the <a href="#example">example</a>.</p>
+    <p>
+    For detailed documentation, take a look at the <a href=
+    "{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary.html">
+    advertising ID API reference documentation</a>.
+    </p>
+  </div>
+</div>
+
+
+<h2 id="get_started">Using the Advertising ID</h2>
+
+<p>
+  The <strong>advertising ID</strong> is a unique but
+  user-resettable string identifier that lets ad networks and other apps anonymously
+  identify a user. The user's advertising ID is made available to apps through APIs
+  provided in Google Play services.
+</p>
+<p>
+  Users can reset their advertising ID at any time, right from the Ads section of the
+  Google Settings app on their devices. From the same app, users can also
+  opt-out of targeted advertising based on the advertising ID by setting the appropriate
+  <strong style="white-space:nowrap">ad tracking preference</strong>. When the
+  user opts-out of targeted ads, this ad tracking preference is made available
+  to apps through a Google Play services API.
+</p>
+<p>
+  Apps making use of the advertising ID <strong>must check for and respect</strong> the
+  user's ad tracking preference. Also please note that any use of the advertising ID
+  must abide by the terms of Google Play Store <a class="external-link"
+  href="http://play.google.com/about/developer-content-policy.html">policies</a>.
+</p>
+
+<h3 id="format">Format of the Advertising ID</h3>
+
+<p>
+  Google Play services APIs expose the user's advertising ID as a string format of UUID,
+  with values similar to this:
+</p>
+<p style="margin-left:1.5em;"><code>“38400000-8cf0-11bd-b23e-10b96e40000d”</code></p>
+
+<h3 id="requirements">Requirements</h3>
+
+<ul>
+  <li>The advertising ID APIs are supported in Google Play services 4.0+</li>
+  <li>Support for the advertising ID on specific devices is based on their installed versions 
+  of Google Play services</li>
+</ul>
+
+<h3 id="obtaining">Obtaining the user's advertising ID and ad tracking preference</h3>
+
+<p>
+  If you want to use the advertising ID in your app, you must first install the Google
+  Play services SDK. As noted in the requirements above, you should install the
+  SDK for Google Play services 4.0 or higher if you will develop using the advertising ID
+  APIs. For information about how to get started, see <a href=
+  "{@docRoot}google/play-services/setup.html">Set Up Google Play services</a>.
+</p>
+<p>
+  The advertising ID APIs are available in the <a href=
+  "{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary.html">
+  <code>com.google.android.gms.ads.identifier</code></a> package in the Google
+  Play Services library. To obtain the user's advertising ID and tracking preference,
+  call the method
+  <a href=
+  "{@docRoot}reference/com/google/android/gms/ads/identifier/AdvertisingIdClient.html#getAdvertisingIdInfo(android.content.Context)">
+  <code>getAdvertisingIdInfo()</code></a>, which returns an <a href=
+  "{@docRoot}reference/com/google/android/gms/ads/identifier/AdvertisingIdClient.Info.html">
+  <code>AdvertisingIdClient.Info</code></a> encapsulating the user's current Advertising ID
+  and tracking preference.
+</p>
+
+<p class="note">
+  <strong>Note:</strong> The <code>getAdvertisingIdInfo()</code> method is a
+  blocking call, so you must not call it on the main (UI) thread. If called on
+  the main thread, the method throws <code>IllegalStateException</code>.
+</p>
+
+<p>
+  Once you've retrieved the <code>AdvertisingIdClient.Info</code> object, you
+  can use it's <a href=
+  "{@docRoot}reference/com/google/android/gms/ads/identifier/AdvertisingIdClient.Info.html#getId()">
+  <code>getId()</code></a> and <a href=
+  "{@docRoot}reference/com/google/android/gms/ads/identifier/AdvertisingIdClient.Info.html#isLimitAdTrackingEnabled()">
+  <code>isLimitAdTrackingEnabled()</code></a> methods to access the advertising ID and
+  ad tracking preference.
+</p>
+
+<table>
+<tr>
+<th>Method</th>
+<th>Description</th>
+</tr>
+<tr>
+<td><code>public String getId()</code></td>
+<td style="white-space:nowrap;">Retrieves the advertising ID.</td>
+</tr>
+<tr>
+<td style="white-space:nowrap;"><code>public boolean isLimitAdTrackingEnabled()</code></td>
+<td>Retrieves whether the user has limit ad tracking enabled or not.</td>
+</tr>
+</table>
+
+<p>
+  The advertising ID APIs do not include a "reset" method. Only users can initiate a
+  reset of their own advertising IDs, through the Google Settings application.
+</p>
+<p>
+  For more information about the advertising ID APIs, see the <a href=
+  "{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary.html">
+  reference documentation</a>.
+</p>
+
+<h3 id="example">Example implementation</h3>
+
+<p>
+  Here's a basic illustration of how you can retrieve the user's advertising ID and ad
+  tracking preference in your app:
+</p>
+
+<pre>
+import com.google.android.gms.ads.identifier.AdvertisingIdClient;
+import com.google.android.gms.ads.identifier.AdvertisingIdClient.Info;
+import com.google.android.gms.common.GooglePlayServicesAvailabilityException;
+import com.google.android.gms.common.GooglePlayServicesNotAvailableException;
+import java.io.IOException;
+...
+
+// Do not call this function from the main thread. Otherwise, 
+// an IllegalStateException will be thrown.
+public void getIdThread() {
+
+  Info adInfo = null;
+  try {
+    adInfo = AdvertisingIdClient.getAdvertisingIdInfo(mContext);
+
+  } catch (IOException e) {
+    // Unrecoverable error connecting to Google Play services (e.g.,
+    // the old version of the service doesn't support getting AdvertisingId).
+ 
+  } catch (GooglePlayServicesAvailabilityException e) {
+    // Encountered a recoverable error connecting to Google Play services. 
+
+  } catch (GooglePlayServicesNotAvailableException e) {
+    // Google Play services is not available entirely.
+  }
+  final String id = adInfo.getId();
+  final boolean isLAT = adInfo.isLimitAdTrackingEnabled();
+}</pre>

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

@@ -1,4 +1,4 @@
-page.title=Setup Google Play Services SDK
+page.title=Set Up Google Play Services SDK
 @jd:body
 
     

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

@@ -0,0 +1,87 @@
+page.title=Google Wallet Instant Buy for Android
+page.tags="Wallet","payments","Google Play Services"
+header.hide=1
+
+@jd:body
+
+<div class="landing-banner">
+<div class="col-8">
+<!--<div class="col-6">
+  <img src="{@docRoot}images/google/gps-wallet.png" alt="" style="">
+</div>
+<div class="col-6"> -->
+
+  <h1 itemprop="name" style="margin-bottom:0;">Google Wallet Instant Buy</h1>
+  <p itemprop="description">Add fast, secure checkout for users buying physical goods and
+  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>Check out the <a 
+  href="{@docRoot}reference/gms-packages.html">Instant Buy API reference</a> and visit
+  <a href="developers.google.com/mobile-ads-sdk">developers.google.com/mobile-ads-sdk</a>
+  for complete information about integrating Google Wallet Instant Buy 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>Add the "Buy with Google" button</h4>
+      <p>Easily embed a “Buy with Google” button in your flow to let customers purchase instantly
+      from your app. Customers can grant you access to their payment information with just
+      a few clicks.
+      <br />
+      <a href="https://devsite.googleplex.com/commerce/wallet/instant-buy/android/tutorial#add_google_wallet_buttons_to_your_ui"
+      class="external-link">Add a "Buy with Google" button</a>.</p>
+
+      <h4>Streamline Purchases with Google+ Sign-On</h4>
+      <p>For users ready to purchase, you can simplify the login and account creation steps
+      by adding Google+ sign in. Users can sign in with a single click and share their
+      profile information during the purchase. 
+      <br />
+      <a href="https://devsite.googleplex.com/commerce/wallet/instant-buy/wallet-sso#android"
+      class="external-link">Add Google+ Sign-In for Wallet</a>.</p>
+       
+      <h4>Minimize User Data Entry</h4>
+      <p>Google Wallet provides auto-completion of addresses, minimizing user data entry. You can also
+      retrieve billing and shipping addresses directly from the user’s Wallet to-do form pre-fills.<br />
+      <a class="external-link"
+      href="https://devsite.googleplex.com/commerce/wallet/instant-buy/android/reference/com/google/android/gms/wallet/MaskedWallet#getBillingAddress()">Get
+      billing addresses</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 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"
+      href="https://developers.google.com/commerce/wallet/instant-buy/android/tutorial">tutorial</a>
+      to learn how to set up your app.
+    </p>
+    <h4>2. Run the sample</h4>
+    <p>Once you've installed the Google Play services package, try the Google Wallet
+    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://devsite.googleplex.com/commerce/wallet/instant-buy/android/quickstart">Quick
+    Start guide</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
+    API reference</a> is available here on developer.android.com.</p>
+
+    <p>Detailed documentation for the Instant Buy API is available at <a class="external-link"
+    href="https://developers.google.com/wallet/instant-buy/">developers.google.com/wallet/instant-buy/</a></p>
+
+
+  </div>
+</div>