Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 70ff567a: Merge "DOC CHANGE: Fix bugs in Installing SDK topic" into honeycomb

Browse Source 
* commit '70ff567a2722789ac5196a92e615dd39c29b5964':
  DOC CHANGE: Fix bugs in Installing SDK topic
This commit is contained in:
Joe Malin
2011-02-03 10:30:38 -08:00
committed by Android Git Automerger
parent 6f1bd261b7 70ff567a27
commit 64ee4ed48d
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/html/images/sdk_manager_packages.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 112 KiB

After

Width:  |  Height:  |  Size: 113 KiB

7
docs/html/sdk/installing.jd
View File

@@ -148,7 +148,7 @@ last step in setting up your Android SDK.</p>
<p>If you prefer to work in a different IDE, you do not need to <p>If you prefer to work in a different IDE, you do not need to
install Eclipse or ADT, instead, you can directly use the SDK tools to build and install Eclipse or ADT, instead, you can directly use the SDK tools to build and
debug your application. The <a href="{@docRoot}guide/developing/index.html">Overview</a> debug your application. The <a href="{@docRoot}guide/developing/index.html">Overview</a>
section of the developer guide outlines the major steps that you need to complete section of the developer guide outlines the major steps that you need to complete
when developing in Eclipse or other IDEs.</p> when developing in Eclipse or other IDEs.</p>
@@ -177,7 +177,7 @@ better understand the components available from the Android SDK and AVD Manager.
<p>You can launch the Android SDK and AVD Manager in one of the following ways:</p> <p>You can launch the Android SDK and AVD Manager in one of the following ways:</p>
<ul> <ul>
<li>From within Eclipse, select <strong>Window &gt; Android SDK and AVD Manager</strong>.</li> <li>From within Eclipse, select <strong>Window &gt; Android SDK and AVD Manager</strong>.</li>
<li>On Windows, double-click the <code>SDK Manager.ext</code> file at the root of the Android <li>On Windows, double-click the <code>SDK Manager.exe</code> file at the root of the Android
SDK directory.</li> SDK directory.</li>
<li>On Mac or Linux, open a terminal and navigate to the <code>tools/</code> directory in the <li>On Mac or Linux, open a terminal and navigate to the <code>tools/</code> directory in the
Android SDK, then execute: <pre>android</pre> </li> Android SDK, then execute: <pre>android</pre> </li>
@@ -444,6 +444,7 @@ version.</td>
<td colspan="3"><code>samples/</code></td> <td colspan="3"><code>samples/</code></td>
<td>Sample code and apps that are specific to platform version.</td> <td>Sample code and apps that are specific to platform version.</td>
</tr> </tr>
<tr>
<td colspan="3"><code>tools/</code></td> <td colspan="3"><code>tools/</code></td>
<td>Contains the set of development and profiling tools that are platform-independent, such <td>Contains the set of development and profiling tools that are platform-independent, such
as the emulator, the AVD and SDK Manager, ddms, hierarchyviewer and more. The tools in as the emulator, the AVD and SDK Manager, ddms, hierarchyviewer and more. The tools in
@@ -548,7 +549,7 @@ first step in getting started with Android development. </p>
href="{@docRoot}guide/developing/tools/index.html">development href="{@docRoot}guide/developing/tools/index.html">development
tools</a> that are available to you</li> tools</a> that are available to you</li>
<li>Read the <a <li>Read the <a
href="{@docRoot}guide/developing/index.html">Overview</a> href="{@docRoot}guide/developing/index.html">Overview</a>
for how to develop an Android application. for how to develop an Android application.
</li> </li>
<li>Read <a href="{@docRoot}guide/developing/device.html">Developing on a Device</a> to set up an <li>Read <a href="{@docRoot}guide/developing/device.html">Developing on a Device</a> to set up an