Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit bd26ba48 authored by Scott Main's avatar Scott Main Committed by Android (Google) Code Review
Browse files

Merge "docs: update SDK and AVD Manager strings; update android tool doc and... 

Merge "docs: update SDK and AVD Manager strings; update android tool doc and update another AVD manager screenshot and finally change "component" to "package" for SDK manager docs" into ics-mr1
parents af9a26b2 a7b1b8c7

docs/html/guide/appendix/api-levels.jd

+3 −3
Original line number Diff line number Diff line
@@ -350,11 +350,11 @@ including the latest version, and provides an updater tool that you can use to 
download other platform versions as necessary. </p>



<p>To access the updater, use the <code>android</code> command-line tool,

located in the &lt;sdk&gt;/tools directory. You can launch the Updater by using

the <code>android</code> command without specifying any options. You can

located in the &lt;sdk&gt;/tools directory. You can launch the SDK updater by

executing <code>android sdk</code>. You can

also simply double-click the android.bat (Windows) or android (OS X/Linux) file.

In ADT, you can also access the updater by selecting 

<strong>Window</strong>&nbsp;>&nbsp;<strong>Android SDK and AVD

<strong>Window</strong>&nbsp;>&nbsp;<strong>Android SDK

Manager</strong>.</p>



<p>To run your application against different platform versions in the emulator,

docs/html/guide/developing/building/building-cmdline.jd

+5 −5
Original line number Diff line number Diff line
@@ -202,12 +202,12 @@ ant release 


  <ol>

    <li>

      <strong>Open the SDK and AVD Manager and launch a virtual device</strong>

      <strong>Open the AVD Manager and launch a virtual device</strong>



      <p>From your SDK's <code>platform-tools/</code> directory, execute the {@code android} tool with no

      arguments:</p>

      <p>From your SDK's <code>platform-tools/</code> directory, execute the {@code android} tool

with the <code>avd</code> options:</p>

      <pre>

android

android avd

</pre>



      <p>In the <em>Virtual Devices</em> view, select an AVD and click <strong>Start</strong>.</p>
@@ -237,7 +237,7 @@ adb -s emulator-5554 install <em>path/to/your/app</em>.apk 
  </ol>



  <p>If you don't see your application on the emulator, try closing the emulator and launching the

  virtual device again from the SDK and AVD Manager. Sometimes when you install an application for the

  virtual device again from the AVD Manager. Sometimes when you install an application for the

  first time, it won't show up in the application launcher or be accessible by other applications.

  This is because the package manager usually examines manifests completely only on emulator

  startup.</p>

docs/html/guide/developing/devices/index.jd

+3 −3
Original line number Diff line number Diff line
@@ -7,9 +7,9 @@ page.title=Managing Virtual Devices 


  <p>The easiest way to create an AVD is to use the graphical <a href= 

  "{@docRoot}guide/developing/devices/managing-avds.html">AVD Manager</a>, which you launch

  from Eclipse by clicking <strong>Window &gt; Android SDK and AVD Manager</strong>. You can also start

  the AVD Manager from the command line by calling the <code>android</code> tool in the <strong>tools</strong>

  directory of the Android SDK.</p>

  from Eclipse by clicking <strong>Window &gt; AVD Manager</strong>. You can also start the AVD

Manager from the command line by calling the <code>android</code> tool with the <code>avd</code>

options, from the <strong>&lt;sdk>/tools/</strong> directory.</p>



  <p>You can also create AVDs on the command line by passing the <code>android</code> tool options.

  For more information on how to create AVDs in this manner, see <a href=

docs/html/guide/developing/devices/managing-avds.jd

+3 −3
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ parent.link=index.html 
    <li>Start the AVD Manager:



      <ul>

        <li>In Eclipse: select <strong>Window &gt; Android SDK and AVD Manager</strong>, or click

        the Android SDK and AVD Manager icon in the Eclipse toolbar.</li>

        <li>In Eclipse: select <strong>Window &gt; AVD Manager</strong>, or click

        the AVD Manager icon in the Eclipse toolbar.</li>



        <li>In other IDEs: Navigate to your SDK's <code>tools/</code> directory and execute the

        <code>android</code> tool with no arguments.</li>
@@ -72,7 +72,7 @@ parent.link=index.html 
    <li>Click <strong>Create AVD</strong>.</li>

  </ol>



  <p>Your AVD is now ready and you can either close the SDK and AVD Manager, create more AVDs, or

  <p>Your AVD is now ready and you can either close the AVD Manager, create more AVDs, or

  launch an emulator with the AVD by selecting a device and clicking <strong>Start</strong>.</p>



<h3 id="hardwareopts">Hardware options</h3>

docs/html/guide/developing/projects/index.jd

+4 −4
Original line number Diff line number Diff line
@@ -209,8 +209,8 @@ used.</dd> 
      application uses code and resources from an example library project called TicTacToeLib.</p>



      <p>To download the sample applications and run them as projects in

      your environment, use the <em>Android SDK and AVD Manager</em> to download the "Samples for

      SDK API 8" (or later) component into your SDK.</p>

      your environment, use the <em>Android SDK Manager</em> to download the "Samples for

      SDK API 8" (or later) package into your SDK.</p>



      <p>For more information and to browse the code of the samples, see

      the <a href="{@docRoot}resources/samples/TicTacToeMain/index.html">TicTacToeMain
@@ -227,8 +227,8 @@ used.</dd> 
    <p class="note"><strong>Note:</strong> You need SDK Tools r14 or newer to use the new library

    project feature that generates each library project into its own JAR file.

    You can download the tools and platforms using the

    <em>Android SDK and AVD Manager</em>, as described in

    <a href="{@docRoot}sdk/adding-components.html">Adding SDK Components</a>.</p>

    <em>Android SDK Manager</em>, as described in

    <a href="{@docRoot}sdk/adding-components.html">Adding SDK Packages</a>.</p>



    <p>If you have source code and resources that are common to multiple Android projects, you

    can move them to a library project so that it is easier to maintain across applications and