summaryrefslogtreecommitdiffstats
path: root/docs/html/sdk
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2012-11-13 00:44:17 -0800
committerScott Main <smain@google.com>2012-11-13 02:23:51 -0800
commit576552550d2a5c52d767429c4fbf885981d25ff9 (patch)
tree248ae92f7fcbac3edd05601dec4c70dadddff20d /docs/html/sdk
parentee5c84c4396f8f6c2ca3eeb99d0c103a8d9ebc04 (diff)
downloadframeworks_base-576552550d2a5c52d767429c4fbf885981d25ff9.zip
frameworks_base-576552550d2a5c52d767429c4fbf885981d25ff9.tar.gz
frameworks_base-576552550d2a5c52d767429c4fbf885981d25ff9.tar.bz2
docs: add jb mr1 api overview
Change-Id: I05db9daa6b9b96fef2debabdf35bcbe169fed007
Diffstat (limited to 'docs/html/sdk')
-rw-r--r--docs/html/sdk/index.jd23
-rw-r--r--docs/html/sdk/installing/bundle.jd3
-rw-r--r--docs/html/sdk/installing/index.jd2
3 files changed, 6 insertions, 22 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index c77687d..63dbed7 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -311,7 +311,7 @@ the ADT plugin to it.</p>
onclick="toggleExpandable(this,'.reqs');hideExpandable('.pax,.myide');return false;"
>SYSTEM REQUIREMENTS</a></h4>
-<div class="col-6 reqs" style="margin:0 0 15px;display:none;font-size:12px">
+<div class="col-6 reqs" style="margin:0 0 15px;display:none;">
<h5>Operating Systems</h5>
<ul>
<li>Windows XP (32-bit), Vista (32- or 64-bit), or Windows 7 (32- or 64-bit)</li>
@@ -326,7 +326,7 @@ the ADT plugin to it.</p>
</ul>
</div>
-<div class="col-7 reqs" style="margin:0 0 15px;display:none;font-size:12px">
+<div class="col-6 reqs" style="margin:0 0 15px 20px;display:none;">
<h5>Eclipse IDE</h5>
<ul>
<li><a href="http://eclipse.org/mobile/">Eclipse</a> 3.6.2 (Helios) or greater
@@ -338,7 +338,7 @@ in most Eclipse IDE packages) </li>
(JRE alone is not sufficient)</li>
<li><a href="{@docRoot}tools/sdk/eclipse-adt.html">Android Development Tools plugin</a>
(recommended)</li>
- <li><strong>Not</strong> compatible with Gnu Compiler for Java (gcj)</li>
+ <li><strong>Not</strong> compatible with GNU Compiler for Java (gcj)</li>
</ul>
@@ -349,26 +349,9 @@ in most Eclipse IDE packages) </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>
-</ul>
<p class="note"><strong>Note:</strong> Some Linux distributions may include JDK 1.4 or Gnu Compiler
for Java, both of which are <em>not</em> supported for Android development. </p>
</div><!-- end col-7 reqs -->
-
-<h4><a href='' class="expandable"
- onclick="toggleExpandable(this,'.pax');hideExpandable('.myide,.reqs');return false;"
- >DOWNLOAD FOR OTHER PLATFORMS</a></h4>
-
-</div><!-- end col-13 for lower-half content -->
-
-<script>
- if (location.hash == "#Requirements") {
- $('.reqs').show();
- } else if (location.hash == "#ExistingIDE") {
- $('.ide').show();
- }
-</script>
-
diff --git a/docs/html/sdk/installing/bundle.jd b/docs/html/sdk/installing/bundle.jd
index 243c03d..1f7da55 100644
--- a/docs/html/sdk/installing/bundle.jd
+++ b/docs/html/sdk/installing/bundle.jd
@@ -4,7 +4,8 @@ page.title=Setting Up the ADT Bundle
<p>The ADT Bundle provides everything you need to start developing apps, including
-a powerful IDE based on Eclipse called ADT (Android Developer Tools).
+a version of the Eclipse IDE with built-in <b>ADT (Android Developer Tools)</b> to
+streamline your Android app development.
If you haven't already, go download the <a href="{@docRoot}sdk/index.html"
>Android ADT Bundle</a>. (If you downloaded the SDK Tools only, for use with an
existing IDE, you should instead read
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index 24d86cf..9d5e8c1 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -23,7 +23,7 @@ use to download the rest of the SDK packages (such as the latest system image).<
<li>Make a note of the name and location in which it saves the SDK on your system&mdash;you will need to
refer to the SDK directory later, when setting up the ADT plugin and when using
the SDK tools from the command line.</li>
-<li>Once the installation completes. the installer offers to start the Android SDK Manager.
+<li>Once the installation completes, the installer offers to start the Android SDK Manager.
If you'll be using Eclipse, <strong>do not</strong> start the Android SDK Manager,
and instead move on to <a href="{@docRoot}sdk/installing/installing-adt.html"
>Installing the Eclipse Plugin</a>.