Merge "docs: updates to menu resource doc for new attributes"
diff --git a/docs/html/guide/practices/screens_support.jd b/docs/html/guide/practices/screens_support.jd
index f503749..5738bd6 100644
--- a/docs/html/guide/practices/screens_support.jd
+++ b/docs/html/guide/practices/screens_support.jd
@@ -195,10 +195,10 @@
Illustration of how the Android platform maps actual screen densities and sizes
to generalized density and size configurations. </p>
-<p>Although the platform lets your application provide layouts and resources for
-generalized size-density configurations, you do not necessarily need to do write
-custom code or provide custom resources for each of the nine supported
-configurations. The platform provides robust compatibility features, described
+<p>Although the platform lets your application provide customized resources for
+the various size and density configurations, you do not need to do write
+custom code or provide custom resources for every combination of screen size and density.
+The platform provides robust compatibility features, described
in the sections below, that can handle most of the work of rendering your
application on any device screen, provided that you've implemented your
application UI properly. For more information about how to implement a UI that
diff --git a/docs/html/guide/topics/resources/drawable-resource.jd b/docs/html/guide/topics/resources/drawable-resource.jd
index 79ce669..129462e 100644
--- a/docs/html/guide/topics/resources/drawable-resource.jd
+++ b/docs/html/guide/topics/resources/drawable-resource.jd
@@ -32,12 +32,16 @@
for different states (for example, to use a different image when a button is pressed).
Creates a {@link android.graphics.drawable.StateListDrawable}.</dd>
<dt><a href="#LevelList">Level List</a></dt>
- <dd>An XML file that defines a Drawable that manages a number of alternate Drawables, each
+ <dd>An XML file that defines a drawable that manages a number of alternate Drawables, each
assigned a maximum numerical value. Creates a {@link
android.graphics.drawable.LevelListDrawable}.</dd>
<dt><a href="#Transition">Transition Drawable</a></dt>
- <dd>An XML file that defines a Drawable that can cross-fade between two drawable resources.
+ <dd>An XML file that defines a drawable that can cross-fade between two drawable resources.
Creates a {@link android.graphics.drawable.TransitionDrawable}.</dd>
+ <dt><a href="#Inset">Inset Drawable</a></dt>
+ <dd>An XML file that defines a drawable that insets another drawable by a specified distance.
+This is useful when a View needs a background drawble that is smaller than the View's actual
+bounds.</dd>
<dt><a href="#Clip">Clip Drawable</a></dt>
<dd>An XML file that defines a drawable that clips another Drawable based on this Drawable's
current level value. Creates a {@link android.graphics.drawable.ClipDrawable}.</dd>
@@ -893,7 +897,7 @@
<dd>
<pre class="stx">
<?xml version="1.0" encoding="utf-8"?>
-<<a href="#transition-element">layer-list</a>
+<<a href="#transition-element">transition</a>
xmlns:android="http://schemas.android.com/apk/res/android" >
<<a href="#transition-item-element">item</a>
android:drawable="@[package:]drawable/<em>drawable_resource</em>"
@@ -994,13 +998,10 @@
-
-
-
<h2 id="Inset">Inset Drawable</h2>
-<p>A drawable defined in XML that insets another drawable by a specified distance. This is used when
-a View needs a background that is smaller than the View's actual bounds.</p>
+<p>A drawable defined in XML that insets another drawable by a specified distance. This is useful
+when a View needs a background that is smaller than the View's actual bounds.</p>
<dl class="xml">
diff --git a/docs/html/sdk/adt_download.html b/docs/html/sdk/adt_download.html
new file mode 100644
index 0000000..5ba2ef5
--- /dev/null
+++ b/docs/html/sdk/adt_download.html
@@ -0,0 +1,10 @@
+<html>
+<head>
+<meta http-equiv="refresh" content="0;url=http://developer.android.com/sdk/eclipse-adt.html">
+<title>Redirecting...</title>
+</head>
+<body>
+<p>You should be redirected. Please <a
+href="http://developer.android.com/sdk/eclipse-adt.html">click here</a>.</p>
+</body>
+</html>
\ No newline at end of file
diff --git a/docs/html/sdk/adt_download.jd b/docs/html/sdk/adt_download.jd
deleted file mode 100644
index 33e480a..0000000
--- a/docs/html/sdk/adt_download.jd
+++ /dev/null
@@ -1,127 +0,0 @@
-page.title=Download the ADT Zip File
-@jd:body
-
-<p>If you are unable to download the ADT plugin through <a
-href="{@docRoot}sdk/eclipse-adt.html#installing">setting up a remote
-update site</a> in Eclipse, you can download the ADT zip file and install it
-from your computer (archived site) instead. </p>
-
-<p>If you use this approach, in order to update the plugin, you will need to
-download the latest version from this page, uninstall the old version from
-Eclipse, then install the new version. For more details on the procedure,
-see <a
-href="{@docRoot}sdk/eclipse-adt.html#troubleshooting">Troubleshooting
-ADT Installation</a>.</p>
-
-<table class="download">
- <tr>
- <th><nobr>ADT Version</nobr></th>
- <th>Package</th>
- <th>Size</th>
- <th>Md5 Checksum</th>
- <th>Notes</th>
- </tr>
- <tr>
- <td>8.0.0</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-8.0.0.zip">ADT-8.0.0.zip</a></td>
- <td><nobr> bytes</nobr></td>
- <td></td>
- <td>Requires SDK Tools, Revision 8 <em><nobr>November 2010</nobr></em></td>
- </tr>
- <tr>
- <td>0.9.9</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-0.9.9.zip">ADT-0.9.9.zip</a></td>
- <td><nobr>8301681 bytes</nobr></td>
- <td>7deff0c9b25940a74cea7a0815a3bc36</td>
- <td>Requires SDK Tools, Revision 7 <em><nobr>September 2010</nobr></em></td>
- </tr>
- <tr>
- <td>0.9.8</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-0.9.8.zip">ADT-0.9.8.zip</a></td>
- <td><nobr>8301417 bytes</nobr></td>
- <td>27e0de800512f13feae46fb554e6ee2f</td>
- <td>Requires SDK Tools, Revision 7 <em><nobr>September 2010</nobr></em></td>
- </tr>
- <tr>
- <td>0.9.7</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-0.9.7.zip">ADT-0.9.7.zip</a></td>
- <td><nobr>8033750 bytes</nobr></td>
- <td>de2431c8d4786d127ae5bfc95b4605df</td>
- <td>Requires SDK Tools, Revision 5 <em><nobr>May 2010</nobr></em></td>
- </tr>
- <tr>
- <td>0.9.6</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-0.9.6.zip">ADT-0.9.6.zip</a></td>
- <td><nobr>7456339 bytes</nobr></td>
- <td>ea45d271be52b87b5dd1c9fb17536223</td>
- <td>Requires SDK Tools, Revision 5 <em><nobr>March 2010</nobr></em></td>
- </tr>
- <tr>
- <td>0.9.5</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-0.9.5.zip">ADT-0.9.5.zip</a></td>
- <td><nobr>3372982 bytes</nobr></td>
- <td>227ec538359fbe417ccde7f0ad614a96</td>
- <td>Requires SDK Tools, Revision 4 <em><nobr>December 2009</nobr></em></td>
- </tr>
- <tr>
- <td>0.9.4</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-0.9.4.zip">ADT-0.9.4.zip</a></td>
- <td><nobr>3367536 bytes</nobr></td>
- <td>4cdecd72b3e28022d8a55891f13e7d43</td>
- <td>Requires SDK Tools, Revision 3 <em><nobr>October 2009</nobr></em></td>
- </tr>
- <tr>
- <td>0.9.3</td>
- <td><a href="http://dl-ssl.google.com/android/ADT-0.9.3.zip">ADT-0.9.3.zip</a></td>
- <td><nobr>3252487 bytes</nobr></td>
- <td>c296488ac35772667c0f49e822156979</td>
- <td>Required for users of Android 1.6 SDK only . Updated from 0.9.1. <em><nobr>September 2009</nobr></em></td>
- </tr>
-</table>
-
-
-<h4>Obsolete Versions of ADT</h4>
-
-<p>The table below lists older versions of the ADT Plugin that are no longer
-supported. If you are developing applications that are intended to be deployable
-to Android-powered devices, make sure that you upgrade to the most current SDK
-release available and use the most current version of the ADT Plugin, as listed
-in the section above.</p>
-
-<p>If you are not sure what version of ADT is installed in your Eclipse
-environment, open Eclipse and from the main menu select <strong>Help</strong>
-> <strong>About Eclipse</strong> > <strong>Features Details</strong>.
-Locate "com.android.ide.eclipse.adt" in the Feature ID column and look at its
-version number.</p>
-
-<table>
- <tr>
- <th><nobr>ADT Version</nobr></th>
- <th>Notes</th>
- </tr>
- <tr>
- <td>0.9.1</td>
- <td>Required for users of Android 1.5 SDK. Updated from 0.9.0. <em><nobr>6 May 2009</nobr></em></td>
- </tr>
- <tr>
- <td>0.8.0</td>
- <td>Required for users of Android 1.0/1.1 SDKs. <em><nobr>23 Sep 2008</nobr></em></td>
- </tr>
- <tr>
- <td>0.7.1</td>
- <td>Required for users of the Android 0.9 SDK beta. <em><nobr>18 Aug 2008</nobr></em></td>
- </tr>
- <tr>
- <td>0.4.0</td>
- <td>Required for users of the Android M5 Early Look SDK. <em><nobr>12 Feb 2008</nobr></em></td>
- </tr>
- <tr>
- <td>0.3.3</td>
- <td>Required for users of the Android M3-RC37 Early Look SDK. <em><nobr>14 Dec 2007</nobr></em></td>
- </tr>
- <tr>
- <td>0.3.1</td>
- <td>Initial Release. Required for users of the Android M3-RC20/22 SDKs.<em><nobr>21 Nov 2007</nobr></em></td>
- </tr>
-</table>
-</p>
diff --git a/docs/html/sdk/eclipse-adt.jd b/docs/html/sdk/eclipse-adt.jd
index cc0260a..0144eb4 100644
--- a/docs/html/sdk/eclipse-adt.jd
+++ b/docs/html/sdk/eclipse-adt.jd
@@ -1,9 +1,9 @@
page.title=ADT Plugin for Eclipse
sdk.preview=0
-adt.zip.version=0.9.9
-adt.zip.download=ADT-0.9.9.zip
-adt.zip.bytes=8301681
-adt.zip.checksum=7deff0c9b25940a74cea7a0815a3bc36
+adt.zip.version=8.0.1
+adt.zip.download=ADT-8.0.1.zip
+adt.zip.bytes=8724909
+adt.zip.checksum=0e62185279083ddc01f18098ce7ba2d1
@jd:body
@@ -98,7 +98,37 @@
<div class="toggleable opened">
<a href="#" onclick="return toggleDiv(this)">
- <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px" width="9px" />
+ <img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px"
+width="9px" />
+ADT 8.0.1</a> <em>(December 2010)</em>
+ <div class="toggleme">
+
+<dl>
+
+<dt>Dependencies:</dt>
+
+<p><p>ADT 8.0.1 is designed for use with SDK Tools r8. If you haven't
+already installed SDK Tools r8 into your SDK, use the Android SDK and AVD Manager to do
+so.</p></dd>
+
+<dt>General notes:</dt>
+<dd>
+<ul>
+ <li>This is a quick follow-up to ADT 8.0.0 to fix some bugs.</li>
+ <li>Fixes an issue in which projects failed to compile, citing a dex error.</li>
+ <li>Better ProGuard error reporting when exporting applications for release.</li>
+</ul>
+<p>Also see the recent release notes for 8.0.0, below.</p>
+</dd>
+</dl>
+ </div>
+</div>
+
+
+<div class="toggleable closed">
+ <a href="#" onclick="return toggleDiv(this)">
+ <img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-img" height="9px"
+width="9px" />
ADT 8.0.0</a> <em>(December 2010)</em>
<div class="toggleme">
@@ -322,7 +352,7 @@
<dd><p>ADT 0.9.5 requires features provided in SDK Tools r4 or higher. If you install
ADT 0.9.5, which is highly recommended, you should use the Android SDK and AVD
-Manager to download thye latest SDK Tools into your SDK. For more information,
+Manager to download the latest SDK Tools into your SDK. For more information,
see <a href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.</p>
</dd>
diff --git a/docs/html/sdk/requirements.jd b/docs/html/sdk/requirements.jd
index a359dad..401dfe3 100644
--- a/docs/html/sdk/requirements.jd
+++ b/docs/html/sdk/requirements.jd
@@ -51,8 +51,7 @@
<ul>
<li><a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html">JDK 5 or JDK
6</a> (JRE alone is not sufficient)</li>
- <li><a href="http://ant.apache.org/">Apache Ant</a> 1.6.5 or later for
-Linux and Mac, 1.7 or later for Windows</li>
+ <li><a href="http://ant.apache.org/">Apache Ant</a> 1.8 or later</li>
<li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
</ul>
</li>
diff --git a/docs/html/sdk/sdk_toc.cs b/docs/html/sdk/sdk_toc.cs
index 3366c5c..9c7ad89 100644
--- a/docs/html/sdk/sdk_toc.cs
+++ b/docs/html/sdk/sdk_toc.cs
@@ -114,7 +114,7 @@
<span style="display:none" class="zh-TW"></span>
</h2>
<ul>
- <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 8.0.0
+ <li><a href="<?cs var:toroot ?>sdk/eclipse-adt.html">ADT 8.0.1
<span style="display:none" class="de"></span>
<span style="display:none" class="es"></span>
<span style="display:none" class="fr"></span>
diff --git a/docs/html/sdk/tools-notes.jd b/docs/html/sdk/tools-notes.jd
index 9316fae..f8d7071 100644
--- a/docs/html/sdk/tools-notes.jd
+++ b/docs/html/sdk/tools-notes.jd
@@ -74,6 +74,9 @@
designed for use with ADT 8.0.0 and later. After installing SDK Tools r8, we
highly recommend updating your ADT Plugin to 8.0.0.</p>
+<p>If you are developing outside Eclipse, you must have <a href="http://ant.apache.org/">Apache
+Ant</a> 1.8 or later.</p>
+
<p>Also note that SDK Tools r8 requires a new SDK component called
<em>Platform-tools</em>. The new Platform-tools component lets all SDK platforms
(Android 2.1, Android 2.2, and so on) use the same (latest) version of build