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

Commit 8545714f authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android Git Automerger
Browse files

am 285782a6: am 73f68dbc: Merge "Doc change: Google Play services 4.0 reference docs." into klp-dev 

* commit '285782a6':
  Doc change: Google Play services 4.0 reference docs.
parents d8ad764e 285782a6

docs/html/gms_navtree_data.js

+21 −8

File changed.

Preview size limit exceeded, changes collapsed.

docs/html/google/index.jd

+2 −2
Original line number Diff line number Diff line
@@ -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="{@docRoot}google/play-services/wallet.html"

    <h4><a 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
@@ -138,7 +138,7 @@ interaction patterns, and much more. 
  <div class="cell-icon">

    <img src="{@docRoot}images/google/google-mobile-ads.png" width="40" />

  </div>

    <h4><a class="external-link" href="{@docRoot}google/play-services/ads.html"

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

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

+9 −6
Original line number Diff line number Diff line
@@ -9,10 +9,12 @@ header.hide=1 
<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 itemprop="description">The advertising ID is a user-specific, unique,

  resettable ID for advertising, provided by Google Play services. It gives

  users better controls and provides developers with a simple, standard system

  to continue to monetize your apps. It is an anonymous identifier for advertising

  purposes and enables users to reset their identifier or opt out of interest-based

  ads within Google Play apps. </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
@@ -73,8 +75,9 @@ href="{@docRoot}reference/com/google/android/gms/ads/identifier/package-summary. 
<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>.

  must abide by the terms of the <a class="external-link"

  href="http://play.google.com/about/developer-content-policy.html#ADID">Google Play

  Developer Content Policies</a>. 

</p>



<h3 id="format">Format of the Advertising ID</h3>

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

+7 −8
Original line number Diff line number Diff line 
page.title=Google Wallet Instant Buy for Android

page.tags="Wallet","payments","Google Play Services"

page.tags="Wallet","payments","Instant Buy"

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
@@ -22,10 +17,14 @@ header.hide=1 
      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>

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

  Buy API reference</a> and visit

  <a href="https://developers.google.com/wallet/instant-buy/">developers.google.com/wallet/instant-buy/</a>

  for complete information about integrating Google Wallet Instant Buy into your app.</p>

</div>



<div class="col-4"> 

  <img src="{@docRoot}images/google/gps-wallet-instant.png" alt="" style="padding-bottom:14px;width:210px">

</div>

</div>

docs/html/images/google/gps-wallet-instant.png

0 → 100644
+6.31 KiB
Loading image diff...