am 6875b438: am a4f67a88: am 49be1ef3: 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

* commit '6875b4385c1d1e4c1160ba6cd9128a461565338b':
  Doc change: cleanup filtering sidebars and api level table. Changes links pointing to billing and other play docs that have moved.

13 files changed, 101 insertions, 103 deletions

diff --git a/docs/html/guide/appendix/install-location.jd b/docs/html/guide/appendix/install-location.jd
index 19c4b39..50f6d27 100644
--- a/docs/html/guide/appendix/install-location.jd
+++ b/docs/html/guide/appendix/install-location.jd
@@ -174,7 +174,7 @@ external storage, it can never receive this broadcast.</dd>
   <dt>Copy Protection</dt>
     <dd>Your application cannot be installed to a device's SD card if it uses Google Play's 
       Copy Protection feature. However, if you use Google Play's 
-      <a href="{@docRoot}guide/google/play/licensing.html">Application Licensing</a> instead, your 
+      <a href="{@docRoot}google/play/licensing.html">Application Licensing</a> instead, your 
       application <em>can</em> be installed to internal or external storage, including SD cards.</dd>
 </dl>
 
diff --git a/docs/html/guide/components/fundamentals.jd b/docs/html/guide/components/fundamentals.jd
index 1717782..2c33a26 100644
--- a/docs/html/guide/components/fundamentals.jd
+++ b/docs/html/guide/components/fundamentals.jd
@@ -463,7 +463,7 @@ applications are available on each device. As such, your application should be a
 devices that meet all your application requirements.</p>
 
 <p>For more information about how Google Play filters applications based on these (and other)
-requirements, see the <a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a>
+requirements, see the <a href="{@docRoot}google/play/filters.html">Filters on Google Play</a>
 document.</p>
 
 
diff --git a/docs/html/guide/practices/compatibility.jd b/docs/html/guide/practices/compatibility.jd
index a2284bd..bc58403 100644
--- a/docs/html/guide/practices/compatibility.jd
+++ b/docs/html/guide/practices/compatibility.jd
@@ -7,7 +7,7 @@ page.title=Android Compatibility
 <h2>See also</h2>
  <ol>
 <li><a
-href="{@docRoot}guide/google/play/filters.html">Filtering on Google Play</a></li>
+href="{@docRoot}google/play/filters.html">Filtering on Google Play</a></li>
 <li><a
 href="{@docRoot}guide/topics/resources/providing-resources.html#AlternativeResources">Providing Alternative Resources</a></li>
 <li><a
@@ -119,7 +119,7 @@ device.
 
 <p style="margin-top:1em;">For information about other filters that you can
 use to control the availability of your apps, see the 
-<a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a>
+<a href="{@docRoot}google/play/filters.html">Filters on Google Play</a>
 document.</p>
   </div> 
 </div>
diff --git a/docs/html/guide/practices/screens-distribution.jd b/docs/html/guide/practices/screens-distribution.jd
index 90ac752..29d2a8c 100644
--- a/docs/html/guide/practices/screens-distribution.jd
+++ b/docs/html/guide/practices/screens-distribution.jd
@@ -213,4 +213,4 @@ sizes, especially, is within reason using a single APK, as long as you follow th
 <a href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a>.</p>
 
 <p>If you need more information about how to publish multiple APKs on Google Play, read <a
-href="{@docRoot}guide/google/play/publishing/multiple-apks.html">Multiple APK Support</a>.</p>
+href="{@docRoot}google/play/publishing/multiple-apks.html">Multiple APK Support</a>.</p>
diff --git a/docs/html/guide/topics/data/install-location.jd b/docs/html/guide/topics/data/install-location.jd
index 5abdced..061a2c0 100644
--- a/docs/html/guide/topics/data/install-location.jd
+++ b/docs/html/guide/topics/data/install-location.jd
@@ -167,7 +167,7 @@ external storage, it can never receive this broadcast.</dd>
   <dt>Copy Protection</dt>
     <dd>Your application cannot be installed to a device's SD card if it uses Google Play's 
       Copy Protection feature. However, if you use Google Play's 
-      <a href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> instead, your 
+      <a href="{@docRoot}google/play/licensing/index.html">Application Licensing</a> instead, your 
       application <em>can</em> be installed to internal or external storage, including SD cards.</dd>
 </dl>
 
diff --git a/docs/html/guide/topics/manifest/compatible-screens-element.jd b/docs/html/guide/topics/manifest/compatible-screens-element.jd
index bb004fb..9ef44fe 100644
--- a/docs/html/guide/topics/manifest/compatible-screens-element.jd
+++ b/docs/html/guide/topics/manifest/compatible-screens-element.jd
@@ -54,7 +54,7 @@ href="{@docRoot}guide/topics/manifest/supports-screens-element.html">{@code
 &lt;supports-screens&gt;}</a> element to declare whether the system should resize your
 application for different screen sizes.</p>
 
-  <p>Also see the <a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a>
+  <p>Also see the <a href="{@docRoot}google/play/filters.html">Filters on Google Play</a>
 document for more information about how Google Play filters applications using this and
 other manifest elements.</p>
 
@@ -138,5 +138,5 @@ entry looks like if your application is compatible with only small and normal sc
 <dt>see also:</dt>
 <dd><a
 href="{@docRoot}guide/practices/screens_support.html">Supporting Multiple Screens</a></dd>
-<dd><a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a></dd>
+<dd><a href="{@docRoot}google/play/filters.html">Filters on Google Play</a></dd>
 </dl>
diff --git a/docs/html/guide/topics/manifest/manifest-element.jd b/docs/html/guide/topics/manifest/manifest-element.jd
index 4807a5e..fd9f203 100644
--- a/docs/html/guide/topics/manifest/manifest-element.jd
+++ b/docs/html/guide/topics/manifest/manifest-element.jd
@@ -152,7 +152,7 @@ either internal or external storage through the system settings.</td>
 
 <p class="caution"><strong>Caution:</strong> If your application uses Google Play's Copy 
   Protection feature, it cannot be installed to a device's SD card. However, if you use Google 
-  Play's <a href="{@docRoot}guide/google/play/licensing/index.html">Application Licensing</a> instead, 
+  Play's <a href="{@docRoot}google/play/licensing/index.html">Application Licensing</a> instead, 
   your application <em>can</em> be installed to internal or external storage, including SD cards.</p>
 
 <p class="note"><strong>Note:</strong> By default, your application will be installed on the
diff --git a/docs/html/guide/topics/manifest/supports-gl-texture-element.jd b/docs/html/guide/topics/manifest/supports-gl-texture-element.jd
index 6dfc59e..65d3d40 100644
--- a/docs/html/guide/topics/manifest/supports-gl-texture-element.jd
+++ b/docs/html/guide/topics/manifest/supports-gl-texture-element.jd
@@ -3,38 +3,36 @@ parent.title=The AndroidManifest.xml File
 parent.link=manifest-intro.html
 @jd:body
 
+ <div class="sidebox-wrapper"> 
+ <div class="sidebox">
+    <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> 
+    <p style="color:#669999;padding-top:1em;">Google Play Filtering</p> 
+    <p style="padding-top:1em;">Google Play filters applications according
+    to the texture compression formats that they support, to ensure that
+    they can be installed only on devices that can handle their textures
+    properly. You can use texture compression filtering
+    as a way of targeting specific device types, based on GPU platform.</p>
+    
+    <p style="margin-top:1em;">For important information about how
+    Google Play uses <code>&lt;supports-gl-texture&gt;</code> elements as
+    the basis for filtering, please read <a href="#market-texture-filtering">Google
+    Play and texture compression filtering</a>, below.</p>
+</div>
+</div>
+
 <dl class="xml">
 
 <dt>syntax:</dt>
 <dd>
 <pre class="stx">
-&lt;supports-gl-texture android:<a href="#name">name</a>="<em>string</em>" /&gt;
+&lt;supports-gl-texture
+  android:<a href="#name">name</a>="<em>string</em>" /&gt;
 </pre>
 </dd>
 
 <dt>contained in:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
 
- <div class="sidebox-wrapper">
-  <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png">
-  <div id="qv-sub-rule">
-    <img src="{@docRoot}assets/images/icon_play.png"
-    style="float:left;margin:0;padding:0;">
-    <p style="color:#669999;padding-top:1em;">Google Play and <code
-    style="color:#669999;">&lt;supports-gl-texture&gt;</code> elements</p>
-    <p style="margin-top:1em;">Google Play filters applications according
-    to the texture compression formats that they support, to ensure that
-    they can be installed only on devices that can handle their textures
-    properly. Developers can use texture compression filtering
-    as a way of targeting specific device types, based on GPU platform.</p>
-    
-    <p style="margin-top:1em;" class="caution">For important information about how
-    Google Play uses <code>&lt;supports-gl-texture&gt;</code> elements as
-    the basis for filtering, please read <a href="#market-texture-filtering">Google
-    Play and texture compression filtering</a>, below.</p>
-</div> 
-</div>
-
 <dt>description:</dt>
 <dd>Declares a single GL texture compression format that is supported by
 the application.
@@ -141,7 +139,7 @@ and others.</td>
 <dt>see also:</dt>
 <dd>
   <ul>
-    <li><a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a></li>
+    <li><a href="{@docRoot}google/play/filters.html">Filters on Google Play</a></li>
   </ul>
 </dd>
 
diff --git a/docs/html/guide/topics/manifest/uses-configuration-element.jd b/docs/html/guide/topics/manifest/uses-configuration-element.jd
index 20ec85f..810975e 100644
--- a/docs/html/guide/topics/manifest/uses-configuration-element.jd
+++ b/docs/html/guide/topics/manifest/uses-configuration-element.jd
@@ -16,14 +16,12 @@ easier to update the doc when the change is made. -->
 
 <dl class="xml">
 <dt>syntax:</dt>
-<dd><pre class="stx">&lt;uses-configuration android:<a href="#five">reqFiveWayNav</a>=["true" | "false"] 
-                    android:<a href="#hard">reqHardKeyboard</a>=["true" | "false"]
-                    android:<a href="#kbd">reqKeyboardType</a>=["undefined" | "nokeys" | "qwerty" |  
-                                             "twelvekey"]
-                    android:<a href="#nav">reqNavigation</a>=["undefined" | "nonav" | "dpad" | 
-                                           "trackball" | "wheel"]
-                    android:<a href="#touch">reqTouchScreen</a>=["undefined" | "notouch" | "stylus" | 
-                                            "finger"] /&gt;</pre></dd>
+<dd><pre class="stx">&lt;uses-configuration
+  android:<a href="#five">reqFiveWayNav</a>=["true" | "false"] 
+  android:<a href="#hard">reqHardKeyboard</a>=["true" | "false"]
+  android:<a href="#kbd">reqKeyboardType</a>=["undefined" | "nokeys" | "qwerty" | "twelvekey"]
+  android:<a href="#nav">reqNavigation</a>=["undefined" | "nonav" | "dpad" | "trackball" | "wheel"]
+  android:<a href="#touch">reqTouchScreen</a>=["undefined" | "notouch" | "stylus" | "finger"] /&gt;</pre></dd>
 
 <dt>contained in:</dt>
 <dd><code><a href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
diff --git a/docs/html/guide/topics/manifest/uses-feature-element.jd b/docs/html/guide/topics/manifest/uses-feature-element.jd
index 10b5a33..c25dff8 100644
--- a/docs/html/guide/topics/manifest/uses-feature-element.jd
+++ b/docs/html/guide/topics/manifest/uses-feature-element.jd
@@ -28,47 +28,40 @@ parent.link=manifest-intro.html
 </div>
 </div>
 
-
-<dl class="xml">
-
-<dt>syntax:</dt>
-<dd>
-<pre class="stx">&lt;uses-feature android:<a href="#name">name</a>="<em>string</em>"
-              android:<a href="#required">required</a>=["true" | "false"]
-              android:<a href="#glEsVersion">glEsVersion</a>="<em>integer</em>" /&gt;</pre>
-</dd>
-
-<dt>contained in:</dt>
-<dd><code><a
-href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
-
  <div class="sidebox-wrapper"> 
-  <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png"> 
-  <div id="qv-sub-rule"> 
+ <div class="sidebox">
     <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> 
-    <p style="color:#669999;padding-top:1em;">Google Play and <code style="color:#669999;">&lt;uses-feature&gt;</code> elements</p>
-    <p style="margin-top:1em;">Google Play filters the applications that are visible to users, so
-that users can see and download only those applications that are compatible with their
-devices. One of the ways it filters applications is by feature compatibility.</p>
-
-<p style="margin-top:1em;">To do this, Google Play checks the
-<code>&lt;uses-feature&gt;</code> elements in each application's manifest, to
-establish the app's feature needs. Google Play then shows or hides the application to
-each user, based on a comparison with the features available on the user's
-device. </p>
+    <p style="color:#669999;padding-top:1em;">Google Play Filtering</p> 
+    <p style="padding-top:1em;">Google Play uses the <code>&lt;uses-feature&gt;</code>
+    elements declared in your app manifest to filter your app from devices 
+    that do not meet it's hardware and software feature requirements. </p>
 
 <p style="margin-top:1em;">By specifying the features that your application requires,
 you enable Google Play to present your application only to users whose
 devices meet the application's feature requirements, rather than presenting it
 to all users. </p>
 
-<p style="margin-top:1em;" class="caution">For important information about how
+<p>For important information about how
 Google Play uses features as the basis for filtering, please read <a
 href="#market-feature-filtering">Google Play and Feature-Based Filtering</a>,
 below.</p>
 </div>
 </div>
 
+<dl class="xml">
+
+<dt>syntax:</dt>
+<dd>
+<pre class="stx">&lt;uses-feature
+  android:<a href="#name">name</a>="<em>string</em>"
+  android:<a href="#required">required</a>=["true" | "false"]
+  android:<a href="#glEsVersion">glEsVersion</a>="<em>integer</em>" /&gt;</pre>
+</dd>
+
+<dt>contained in:</dt>
+<dd><code><a
+href="{@docRoot}guide/topics/manifest/manifest-element.html">&lt;manifest&gt;</a></code></dd>
+
 <dt>description:</dt>
 <dd>Declares a single hardware or software feature that is used by the
 application.
@@ -207,7 +200,7 @@ can check at run-time whether a higher level of OpenGL ES is available.)</p>
     <li>{@link android.content.pm.FeatureInfo}</li>
     <li>{@link android.content.pm.ConfigurationInfo}</li>
     <li><a href="{@docRoot}guide/topics/manifest/uses-permission-element.html"><code>&lt;uses-permission&gt;</code></a></li>
-    <li><a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a></li>
+    <li><a href="{@docRoot}google/play/filters.html">Filters on Google Play</a></li>
   </ul>
 </dd>
 
diff --git a/docs/html/guide/topics/manifest/uses-library-element.jd b/docs/html/guide/topics/manifest/uses-library-element.jd
index 3ad8ddb..253807e 100644
--- a/docs/html/guide/topics/manifest/uses-library-element.jd
+++ b/docs/html/guide/topics/manifest/uses-library-element.jd
@@ -3,12 +3,25 @@ parent.title=The AndroidManifest.xml File
 parent.link=manifest-intro.html
 @jd:body
 
+<div class="sidebox-wrapper"> 
+<div class="sidebox">
+    <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> 
+    <p style="color:#669999;padding-top:1em;">Google Play Filtering</p> 
+    <p style="padding-top:1em;">Google Play uses the &lt;uses-library&gt; elements declared
+    in your app manifest to filter your app from devices that do not meet it's library
+    requirements. For more information about filtering, see the topic
+    <a href="{@docRoot}google/play/filters.html">Google Play filters</a>.</p>
+  </div>
+</div>
+
 <dl class="xml">
+
 <dt>syntax:</dt>
 <dd>
 <pre class="stx">
-&lt;uses-library android:<a href="#nm">name</a>="<var>string</var>"
-              android:<a href="#rq">required</a>=["true" | "false"] /&gt;
+&lt;uses-library
+  android:<a href="#nm">name</a>="<var>string</var>"
+  android:<a href="#rq">required</a>=["true" | "false"] /&gt;
 </pre>
 </dd>
 <dt>contained in:</dt>
@@ -42,12 +55,6 @@ parent.link=manifest-intro.html
             {@code true}, the {@link android.content.pm.PackageManager} framework won't let the user
             install the application unless the library is present on the user's device.
         </dd>
-        <dt><em>Google Play</em></dt>
-        <dd>
-            Google Play filters applications based on the libraries installed on the
-            user's device. For more information about filtering, see the topic
-            <a href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a>.
-        </dd>
     </dl>
     <p>
         The {@code android:required} attribute is described in detail in the following section.
diff --git a/docs/html/guide/topics/manifest/uses-permission-element.jd b/docs/html/guide/topics/manifest/uses-permission-element.jd
index 6c71fb4..8e9e795 100644
--- a/docs/html/guide/topics/manifest/uses-permission-element.jd
+++ b/docs/html/guide/topics/manifest/uses-permission-element.jd
@@ -5,22 +5,21 @@ parent.link=manifest-intro.html
 
 <dl class="xml">
 
- <div class="sidebox-wrapper"> 
-  <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png"> 
-  <div id="qv-sub-rule"> 
-    <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> 
-    <p style="color:#669999;padding-top:1em;"><code style="color:#669999;">&lt;uses-permission&gt;</code> and filtering on Google Play. </p>
+<div class="sidebox-wrapper"> 
+<div class="sidebox">
+<img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> 
+<p style="color:#669999;padding-top:1em;">Google Play Filtering</p> 
 
-<p style="margin-top:1em;">In some cases, the permissions that you request
+<p style="clear:left;">In some cases, the permissions that you request
 through <code>&lt;uses-permission&gt;</code> can affect how
 your application is filtered by Google Play.</p>
 
-<p style="margin-top:1em;">If you request a hardware-related permission &mdash;
+<p>If you request a hardware-related permission &mdash;
 <code>CAMERA</code>, for example &mdash; Google Play assumes that your
 application requires the underlying hardware feature and filters the application
 from devices that do not offer it.</p>
 
-<p style="margin-top:1em;">To control filtering, always explicitly declare
+<p>To control filtering, always explicitly declare
 hardware features in <code>&lt;uses-feature&gt;</code> elements, rather than
 relying on Google Play to "discover" the requirements in
 <code>&lt;uses-permission&gt;</code> elements. Then, if you want to disable
@@ -28,14 +27,13 @@ filtering for a particular feature, you can add a
 <code>android:required="false"</code> attribute to the
 <code>&lt;uses-feature&gt;</code> declaration.</p>
 
-<p style="margin-top:1em;" class="caution">For a list of permissions that imply
+<p>For a list of permissions that imply
 hardware features, see the documentation for the <a
 href="{@docRoot}guide/topics/manifest/uses-feature-element.html#permissions-features">
 <code>&lt;uses-feature&gt;</code></a> element.</p>
 </div>
 </div>
 
-
 <dt>syntax:</dt>
 <dd><pre class="stx">&lt;uses-permission android:<a href="#nm">name</a>="<i>string</i>" /&gt;</pre></dd>
 
diff --git a/docs/html/guide/topics/manifest/uses-sdk-element.jd b/docs/html/guide/topics/manifest/uses-sdk-element.jd
index 61f03b9..f9e2785 100644
--- a/docs/html/guide/topics/manifest/uses-sdk-element.jd
+++ b/docs/html/guide/topics/manifest/uses-sdk-element.jd
@@ -26,6 +26,18 @@ parent.link=manifest-intro.html
 </div>
 </div>
 
+<div class="sidebox-wrapper"> 
+<div class="sidebox">
+    <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> 
+    <p style="color:#669999;padding-top:1em;">Google Play Filtering</p> 
+    <p style="padding-top:1em;">Google Play uses the <code>&lt;uses-sdk&gt;</code>
+    attributes declared in your app manifest to filter your app from devices 
+    that do not meet it's platform version requirements. Before setting these
+    attributes, make sure that you understand 
+    <a href="{@docRoot}google/play/filters.html">Google Play filters</a>. </p>
+  </div>
+</div>
+
 <dl class="xml">
 <dt>syntax:</dt>
 <dd><pre>
@@ -52,22 +64,6 @@ major version or the sum of the major and minor versions).</p>
 <a href="{@docRoot}tools/publishing/versioning.html">Versioning Your Applications</a>.
 </p></dd> 
 
- <div class="sidebox-wrapper" xstyle="margin-bottom:2em;margin-top:.5em;width:90%;"> 
-  <img id="rule" src="{@docRoot}assets/images/grad-rule-qv.png"> 
-  <div id="qv-sub-rule"> 
-    <img src="{@docRoot}assets/images/icon_play.png" style="float:left;margin:0;padding:0;"> 
-    <p style="color:#669999;padding-top:1em;">Google Play and &lt;uses-sdk&gt; attributes</p> 
-    <p style="padding-top:1em;">Google Play filters the applications that are visible to users, so
-that users can only see and download applications that are compatible with their
-devices. One of the ways it filters applications is by Android
-version-compatibility. To do this, Google Play checks the <code>&lt;uses-sdk&gt;</code>
-attributes in each application's manifest to establish its version-compatibility
-range, then shows or hides the application based on a comparison with the API
-Level of the user's Android system version. For more information, see <a
-href="{@docRoot}guide/google/play/filters.html">Filters on Google Play</a>.</p>
-  </div>
-</div>
-
 <dt>attributes:</dt>
 
 <dd>
@@ -224,12 +220,20 @@ exactly one API Level, although support is implicit for all earlier API Levels
 (down to API Level 1). The initial release of the Android platform provided 
 API Level 1 and subsequent releases have incremented the API Level.</p>
 
-<p>The following table specifies the API Level supported by each version of the
-Android platform.</p>
+<p>The table below specifies the API Level supported by each version of the
+Android platform. For information about the relative numbers of devices that
+are running each version, see the <a href="{@docRoot}about/dashboards/index.html">Platform
+Versions dashboards page</a>.</p>
 
 <table>
   <tr><th>Platform Version</th><th>API Level</th><th>VERSION_CODE</th><th>Notes</th></tr>
  
+    <tr><td><a href="{@docRoot}about/versions/android-4.2.html">Android 4.2</a></td>
+    <td><a href="{@docRoot}sdk/api_diff/17/changes.html" title="Diff Report">17</a></td>
+    <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN_MR1}</td>
+    <td><a href="{@docRoot}about/versions/jelly-bean.html">Platform
+Highlights</a></td></tr>
+
     <tr><td><a href="{@docRoot}about/versions/android-4.1.html">Android 4.1, 4.1.1</a></td>
     <td><a href="{@docRoot}sdk/api_diff/16/changes.html" title="Diff Report">16</a></td>
     <td>{@link android.os.Build.VERSION_CODES#JELLY_BEAN}</td>