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

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

am 39b41f32: am 061dc1b6: am b888739d: am dd8def1e: am 5f26f2c9: am 6ec44a88:... 

am 39b41f32: am 061dc1b6: am b888739d: am dd8def1e: am 5f26f2c9: am 6ec44a88: Merge "Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore." into klp-docs

* commit '39b41f32':
  Doc change: update Mobile Ads to reflect new DFP, location, and other support. Update a few references to froyo support in gcore.
parents 01bed6df 39b41f32

docs/html/google/index.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -30,7 +30,7 @@ track app usage, and enhance your app with features such as maps, sign-in, and 
cloud messaging.</p>

cloud messaging.</p>

  <p>Although these Google services are not included in the Android platform, they are

  <p>Although these Google services are not included in the Android platform, they are

  supported by most Android-powered devices. When using these services, you can

  supported by most Android-powered devices. When using these services, you can

  distribute your app on Google Play to all devices running Android 2.2

  distribute your app on Google Play to all devices running Android 2.3

  or higher, and some services support even more devices.</p>

  or higher, and some services support even more devices.</p>

</div>

</div>

</div>

</div>

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

+7 −4
Original line number Original line Diff line number Diff line
@@ -41,12 +41,17 @@ header.hide=1 
      APK. </p>

      APK. </p>





      <h4>Monetize your apps</h4>

      <h4>Monetize your apps</h4>

      <p>Connect with over a million Google advertisers and show relevant ads in your

      <p>Connect with over a million Google advertisers and show relevant ads in your app. Users

      app. Users engage with the ads, you make money.

      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>

      <br>

      <a href="http://www.google.com/ads/admob/monetize.html" class="external-link">Learn more

      <a href="http://www.google.com/ads/admob/monetize.html" class="external-link">Learn more

      and sign up</a>.</p>

      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>

      <h4>Innovative ads</h4>

      <p>Choose from a range of ads across mobile devices and tablets, including interactive

      <p>Choose from a range of ads across mobile devices and tablets, including interactive

      ad units.</p>

      ad units.</p>
@@ -79,7 +84,5 @@ header.hide=1 
    <p>Detailed documentation for Google Mobile Ads for Android is available with the rest of the Google

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

    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>

    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>

</div>
 
</div>

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

+4 −4
Original line number Original line Diff line number Diff line
@@ -47,8 +47,8 @@ each service that let you implement the functionality you want easier and faster 
  <div class="layout-content-col span-4">

  <div class="layout-content-col span-4">





<h4>Automatic Updates</h4>

<h4>Automatic Updates</h4>

<p>Devices running Android 2.2 and newer and that have the Google Play Store

<p>Devices running Android 2.3 or higher that have the Google Play Store

app automatically receive updates to Google Play services. Enhance

app will automatically receive updates to Google Play services. Enhance

your app with the most recent version of Google Play services without worrying

your app with the most recent version of Google Play services without worrying

about your users' Android version.</p>

about your users' Android version.</p>
@@ -97,9 +97,9 @@ about your users' Android version.</p> 
    <p>

    <p>

      The Google Play services APK is delivered through the Google Play Store, so

      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

      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

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

      Play Store app are not supported).

    </p>

    </p>

  </div>

  </div>

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

+1 −1
Original line number Original line Diff line number Diff line
@@ -190,7 +190,7 @@ to your <code>gradle.build</code> file's build types. For more information, see 




<p>As described in the <a href="{@docRoot}google/play-services/index.html">Google Play services

<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

introduction</a>, Google Play delivers service updates for users on

Android 2.2 through the Google Play Store app. However, updates might not reach

Android 2.3 through the Google Play Store app. However, updates might not reach

all users immediately.</p>

all users immediately.</p>





<p class="caution">

<p class="caution">