summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorJoe Fernandez <joefernandez@google.com>2012-07-23 15:38:19 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-07-23 15:38:20 -0700
commit7ba017807593bad0ae01204ff9c5f4af7d4a537a (patch)
treed13dbb01862fffeab510323a57026ec1ebdba9b2 /docs/html
parent67922bb286c7a39afe6171cccdabcdcf96e0826a (diff)
parent7e5cb8421a4c9362b5f53918bb595099aabc462f (diff)
downloadframeworks_base-7ba017807593bad0ae01204ff9c5f4af7d4a537a.zip
frameworks_base-7ba017807593bad0ae01204ff9c5f4af7d4a537a.tar.gz
frameworks_base-7ba017807593bad0ae01204ff9c5f4af7d4a537a.tar.bz2
Merge "Revert "docs: ADT r20.0.2 Release Notes, bug fixes"" into jb-dev
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/sdk/installing/installing-adt.jd8
-rw-r--r--docs/html/tools/help/monitor.jd8
-rw-r--r--docs/html/tools/sdk/eclipse-adt.jd35
3 files changed, 9 insertions, 42 deletions
diff --git a/docs/html/sdk/installing/installing-adt.jd b/docs/html/sdk/installing/installing-adt.jd
index 414b97b..60f67a2 100644
--- a/docs/html/sdk/installing/installing-adt.jd
+++ b/docs/html/sdk/installing/installing-adt.jd
@@ -1,9 +1,9 @@
page.title=Installing the Eclipse Plugin
walkthru=1
-adt.zip.version=20.0.2
-adt.zip.download=ADT-20.0.2.zip
-adt.zip.bytes=12388464
-adt.zip.checksum=8e727bcdc9789c900784a82e6330ec22
+adt.zip.version=20.0.1
+adt.zip.download=ADT-20.0.1.zip
+adt.zip.bytes=12387574
+adt.zip.checksum=6ebd7f8566bfd2cd031b07d56d49542d
@jd:body
diff --git a/docs/html/tools/help/monitor.jd b/docs/html/tools/help/monitor.jd
index 18fb49a..8e2ea36 100644
--- a/docs/html/tools/help/monitor.jd
+++ b/docs/html/tools/help/monitor.jd
@@ -1,7 +1,7 @@
-page.title=Device Monitor
+page.title=Debug Monitor
@jd:body
-<p>Android Device Monitor is a stand-alone tool that provides a graphical user interface for
+<p>Android Debug Monitor is a stand-alone tool that provides a graphical user interface for
several Android application debugging and analysis tools. The Monitor tool does not
require installation of a integrated development environment, such as Eclipse, and encapsulates the
following tools:</p>
@@ -16,9 +16,9 @@ following tools:</p>
<h2 id="usage">Usage</h2>
-<p>To start Device Monitor, enter the following command from the SDK <code>tools/</code>
+<p>To start Debug Monitor, enter the following command from the SDK <code>tools/</code>
directory:</p>
<pre>monitor</pre>
-<p>Start an Android emulator or connect an Android device via USB cable, and connect Device
+<p>Start an Android emulator or connect an Android device via USB cable, and connect the Debug
Monitor to the device by selecting it in the <strong>Devices</strong> window.</p>
diff --git a/docs/html/tools/sdk/eclipse-adt.jd b/docs/html/tools/sdk/eclipse-adt.jd
index 1d4e421..947e463 100644
--- a/docs/html/tools/sdk/eclipse-adt.jd
+++ b/docs/html/tools/sdk/eclipse-adt.jd
@@ -97,40 +97,7 @@ padding: 5px 0 0;
<a href="#" onclick="return toggleDiv(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-img" height="9px"
width="9px" />
-ADT 20.0.2</a> <em>(July 2012)</em>
- <div class="toggleme">
-<dl>
- <dt>Dependencies:</dt>
-
- <dd>
- <ul>
- <li>Java 1.6 or higher is required for ADT 20.0.2.</li>
- <li>Eclipse Helios (Version 3.6.2) or higher is required for ADT 20.0.2.</li>
- <li>ADT 20.0.2 is designed for use with <a href="{@docRoot}tools/sdk/tools-notes.html">SDK
- Tools r20.0.1</a>. If you haven't already installed SDK Tools r20.0.1 into your SDK, use the
- Android SDK Manager to do so.</li>
- </ul>
- </dd>
-
- <dt>Bug fixes:</dt>
- <dd>
- <ul>
- <li>Fixed keybindings in various XML editors for Eclipse 4.x.</li>
- <li>Fixed bug when creating layout configurations that already exist.</li>
- </ul>
- </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 20.0.1</a> <em>(July 2012)</em>
+ADT 20.0.1</a> <em>(June 2012)</em>
<div class="toggleme">
<dl>
<dt>Dependencies:</dt>