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

Commit 49be1ef3 authored by Dirk Dougherty's avatar Dirk Dougherty Committed by Android (Google) Code Review
Browse files

Merge "Doc change: cleanup filtering sidebars and api level table. Changes... 

Merge "Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved." into jb-mr1-dev
parents 2138e5c0 2b286bb2

docs/html/about/versions/android-3.1.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -825,7 +825,7 @@ devices.</li> 
href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code

href="{@docRoot}guide/topics/manifest/uses-feature-element.html">{@code

&lt;uses-feature&gt;}</a> manifest elements. For more information about

&lt;uses-feature&gt;}</a> manifest elements. For more information about

declaring features in an application manifest, read <a

declaring features in an application manifest, read <a

href="{@docRoot}guide/google/play/filters.html">Google Play

href="{@docRoot}google/play/filters.html">Google Play

Filters</a>.</p>

Filters</a>.</p>

docs/html/about/versions/android-4.2.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -343,7 +343,7 @@ unique installations</a>. By creating a new {@link java.util.UUID} when your app 
first time, you’re certain to obtain a unique ID for tracking each user, regardless of how many

first time, you’re certain to obtain a unique ID for tracking each user, regardless of how many

users install your app on a single device. Alternatively, you can save a local token fetched from

users install your app on a single device. Alternatively, you can save a local token fetched from

your server or use the registrations ID provided by <a

your server or use the registrations ID provided by <a

href="{@docRoot}guide/google/gcm/index.html">Google Cloud Messaging</a>.</p>

href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a>.</p>





<p>Beware that if your app requests one of the hardware device identifiers (such as the WiFi MAC

<p>Beware that if your app requests one of the hardware device identifiers (such as the WiFi MAC

address, the {@link android.os.Build#SERIAL} number, or the {@link

address, the {@link android.os.Build#SERIAL} number, or the {@link

docs/html/about/versions/jelly-bean.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -962,7 +962,7 @@ style="font-weight:500;">App Widgets</span> can resize automatically to fit the 




<p>GCM handles all the details of <strong>queuing messages and delivering them</strong> efficiently to the targeted Android devices. It supports message <strong>multicasting</strong> and can reach up to 1000 connected devices simultaneously with a single request. It also supports message <strong>payloads</strong>, which means that in addition to sending tickle messages to an app on the device, developers can send up to 4K of data. </p>

<p>GCM handles all the details of <strong>queuing messages and delivering them</strong> efficiently to the targeted Android devices. It supports message <strong>multicasting</strong> and can reach up to 1000 connected devices simultaneously with a single request. It also supports message <strong>payloads</strong>, which means that in addition to sending tickle messages to an app on the device, developers can send up to 4K of data. </p>





<p>Google Cloud Messaging is completely <strong>free for all developers</strong> and sign-up is easy. See the <a href="{@docRoot}guide/google/gcm/index.html">Google Cloud Messaging</a> page for registration, downloads, and documentation.</p>

<p>Google Cloud Messaging is completely <strong>free for all developers</strong> and sign-up is easy. See the <a href="{@docRoot}google/gcm/index.html">Google Cloud Messaging</a> page for registration, downloads, and documentation.</p>





<h3>App Encryption</h3>

<h3>App Encryption</h3>

docs/html/develop/index.jd

+2 −2
Original line number Original line Diff line number Diff line
@@ -70,7 +70,7 @@ src="http://1.bp.blogspot.com/-6K1kfNOdek8/T72bXvtTSQI/AAAAAAAABmw/kYzmJt0_328/s 
                   <h2>In-app Subscriptions with Trials</h2>

                   <h2>In-app Subscriptions with Trials</h2>

                   <p>You can now set up a <strong>free trial period</strong> for any Google Play in-app subscription, making it easy for users try your subscriber content before automatically converting to a full subscription. Free trials give you a new way to bring users into your products and engage them effectively. </p>

                   <p>You can now set up a <strong>free trial period</strong> for any Google Play in-app subscription, making it easy for users try your subscriber content before automatically converting to a full subscription. Free trials give you a new way to bring users into your products and engage them effectively. </p>

                   <p><a class="button"

                   <p><a class="button"

href="{@docRoot}guide/google/play/billing/billing_subscriptions.html#trials">Read

href="{@docRoot}google/play/billing/billing_subscriptions.html#trials">Read

more</a></p>

more</a></p>

                   </div>                

                   </div>                

                </li>

                </li>

docs/html/distribute/googleplay/about/distribution.jd

+1 −1
Original line number Original line Diff line number Diff line
@@ -62,7 +62,7 @@ others.</p> 




<p>When you upload your app, Google Play reads the dependencies and sets up any

<p>When you upload your app, Google Play reads the dependencies and sets up any

necessary distribution rules. For technical information about declaring

necessary distribution rules. For technical information about declaring

dependencies, read <a href="{@docRoot}guide/google/play/filters.html">Filters on 

dependencies, read <a href="{@docRoot}google/play/filters.html">Filters on 

Google Play</a>. </p>

Google Play</a>. </p>





<p>For pinpoint control over distribution, Google Play lets you see all of the

<p>For pinpoint control over distribution, Google Play lets you see all of the