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

Commit d9c08bac authored by smain@google.com's avatar smain@google.com Committed by Android Git Automerger
Browse files

am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install... 

am 895ab42f: am 59a3dd7b: misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.

* commit '895ab42f':
  misc fixes for studio launch: update install instructions, update tools nav for AVD page, update AVD instructions in first app class, other edits to first app.
parents 44e7bcf4 895ab42f

docs/html/sdk/installing/adding-packages.jd

+3 −3
Original line number Diff line number Diff line
@@ -64,10 +64,10 @@ So before you can start, there are a few packages you should add to your Android 


<p>To start adding packages, launch the Android SDK Manager in one of the following ways:</p>

<ul>

  <li>In Eclipse or Android Studio, click <strong>SDK Manager</strong>

  <li>In Android Studio, click <strong>SDK Manager</strong>

<img src="{@docRoot}images/tools/sdk-manager-studio.png"

style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>

  <li>If you're not using Eclipse or Android Studio:

  <li>If you're not using Android Studio:

    <ul>

      <li>Windows: Double-click the <code>SDK Manager.exe</code> file at the root of the Android

  SDK directory.</li>
@@ -77,7 +77,7 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li> 
  </li>

</ul>



<p>When you open the SDK Manager for the first time, several packages will be selected by

<p>When you open the SDK Manager for the first time, several packages are selected by

default. Leave these selected, but be sure you have everything you need

to get started by following these steps:</p>

docs/html/sdk/installing/index.jd

+8 −10
Original line number Diff line number Diff line
@@ -56,8 +56,7 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;' 


<p><b>To set up Android Studio on Windows:</b></p>

  <ol>

    <li>Unzip the file, {@code android-studio-ide-&lt;version&gt;-windows.zip} and launch the

        <code>studio.exe</code> file.</li>

    <li>Launch the <code>.exe</code> file you just downloaded.</li>

    <li>Follow the setup wizard to install Android Studio and the SDK Tools.



    <p>On some Windows systems, the launcher script does not find where Java is installed.
@@ -87,8 +86,9 @@ where they are installed. For example:</p> 


<p><b>To set up Android Studio on Mac OSX:</b></p>

  <ol>

    <li>Unzip the downloaded zip file, {@code android-studio-ide-&lt;version&gt;-mac.zip}.</li>

    <li>Launch the {@code .dmg} file you just downloaded.</li>

    <li>Drag and drop Android Studio into the Applications folder.

    <li>Open Android Studio and follow the instructions to set up the SDK.

      <p>

      Depending on your security settings, when you attempt to open Android Studio, you might

      see a warning that says the package is damaged and should be moved to the trash. If this
@@ -96,13 +96,11 @@ where they are installed. For example:</p> 
      <strong>Allow applications downloaded from</strong>, select <strong>Anywhere</strong>.

      Then open Android Studio again.</p>

    </li>

    <li>Follow the links to install the SDK outside of the Android Studio directories.</li>

  </ol>



<p>The individual tools and other SDK packages are saved outside the Android Studio application

directory. If you need access the tools directly, use a terminal to navigate into the location

where they are installed. For example:</p>

<p><code>/Applications/sdk/</code></p>

<p>If you need use the Android SDK tools from a command line,

you can access them at:</p>

<p><code>/Users/&lt;user>/Library/Android/sdk/</code></p>





</div><!-- end mac -->
@@ -113,14 +111,14 @@ where they are installed. For example:</p> 
<p><b>To set up Android Studio on Linux:</b></p>



  <ol>

    <li>Unpack the downloaded Tar file, {@code android-studio-ide-&lt;version&gt;-linux.zip}, into an

    <li>Unpack the downloaded ZIP file into an

        appropriate location for your applications.

    <li>To launch Android Studio, navigate to the {@code android-studio/bin/} directory

    in a terminal and execute {@code studio.sh}.

      <p>You may want to add {@code android-studio/bin/} to your PATH environmental

      variable so that you can start Android Studio from any directory.</p>

    </li>

    <li>Follow the links to install the SDK outside of the Android Studio directories.</li>

    <li>Follow the links to install the SDK tools outside of the Android Studio directories.</li>

  </ol>



</div><!-- end linux -->

docs/html/tools/tools_toc.cs

+1 −1
Original line number Diff line number Diff line
@@ -52,7 +52,7 @@ 
      <li class="nav-section">

        <div class="nav-section-header"><a href="<?cs var:toroot ?>tools/projects/index.html"><span class="en">Managing Projects</span></a></div>

        <ul>

          <li><a href="<?cs var:toroot ?>tools/projects/projects-eclipse.html"><span class="en">From Eclipse with ADT</span></a></li>

          <li><a href="<?cs var:toroot ?>tools/projects/projects-studio.html"><span class="en">From Android Studio</span></a></li>

          <li><a href="<?cs var:toroot ?>tools/projects/projects-cmdline.html"><span class="en">From the Command Line</span></a></li>

          <li><a href="<?cs var:toroot ?>tools/projects/templates.html"><span class="en">Using Code Templates</span></a></li>

        </ul>

docs/html/training/basics/firstapp/creating-project.jd

+1 −4
Original line number Diff line number Diff line
@@ -24,8 +24,6 @@ next.link=running-app.html 
<h2>You should also read</h2>



<ul>

  <li><a href="{@docRoot}sdk/installing/index.html">Installing the

SDK</a></li>

  <li><a href="{@docRoot}tools/projects/index.html">Managing Projects</a></li>

</ul>
@@ -34,8 +32,7 @@ SDK</a></li> 
</div>



<p>An Android project contains all the files that comprise the source code for your Android

app. The Android SDK tools make it easy to start a new Android project with a set of

default project directories and files.</p>

app.</p>



<p>This lesson

shows how to create a new project either using Android Studio or using the

docs/html/training/basics/firstapp/index.jd

+6 −9
Original line number Diff line number Diff line
@@ -12,7 +12,7 @@ helpoutsWidget=true 
<div id="tb-wrapper">

<div id="tb">



<h2>Dependencies and prerequisites</h2>

<h2>Dependencies</h2>



<ul>

  <li><a href="{@docRoot}sdk/index.html">Android Studio</a></li>
@@ -37,14 +37,11 @@ to:</p> 
  <a href="{@docRoot}tools/help/sdk-manager.html">SDK Manager</a>.</li>

</ol>



<p class="note"><strong>Note:</strong> Make sure you install the most recent versions of Android

Studio and the Android SDK before you start this class. The procedures described in this class may

not apply to earlier versions.</p>

<p class="note"><strong>Note:</strong> Although most of this training class

expects that you're using Android Studio, some procedures include alternative

instructions for using

the SDK tools from the command line instead.</p>



<p>If you haven't already done these tasks, start by downloading the

  <a href="{@docRoot}sdk/index.html">Android SDK</a> and following the install steps.

  Once you've finished the setup, you're ready to begin this class.</p>



<p>This class uses a tutorial format that incrementally builds a small Android app that teaches

<p>This class uses a tutorial format to create a small Android app that teaches

you some fundamental concepts about Android development, so it's important that you follow each

step.</p>