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

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

am c4a0882a: edits to sdk install instructions.

* commit 'c4a0882a':
  edits to sdk install instructions.
parents 02cd3a40 c4a0882a
Loading
Loading
Loading
Loading
+8 −20
Original line number Diff line number Diff line
@@ -28,9 +28,8 @@ p.paging-links {
<!-- ################    STUDIO    ##################### -->
<div id="studio" heading="Installing Android Studio" style="display:none">

<p>Android Studio provides the tools you need to start developing apps, including
the Android Studio IDE (powered by IntelliJ) and guides you to install
the Android SDK tools to streamline your Android app development.</p>
<p>Android Studio provides everything you need to start developing apps for Android, including
the Android Studio IDE and the Android SDK tools.</p>

<p>If you didn't download Android Studio, go <a href="{@docRoot}sdk/index.html"
><b>download Android Studio now</b></a>, or switch to the
@@ -39,7 +38,8 @@ install</a> instructions.</p>


<p>Before you set up Android Studio, be sure you have installed
JDK 6 or greater (the JRE alone is not sufficient). To check if you
JDK 6 or higher (the JRE alone is not sufficient)&mdash;JDK 7 is required when
developing for Android 5.0 and higher. To check if you
have JDK installed (and which version), open a terminal and type <code>javac -version</code>.
If the JDK is not available or the version is lower than 6,
<a href="http://www.oracle.com/technetwork/java/javase/downloads/index.html" class="external-link"
@@ -57,7 +57,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>Launch the <code>.exe</code> file you just downloaded.</li>
    <li>Follow the setup wizard to install Android Studio and the SDK Tools.
    <li>Follow the setup wizard to install Android Studio and any necessary SDK tools.

    <p>On some Windows systems, the launcher script does not find where Java is installed.
      If you encounter this problem,
@@ -88,7 +88,7 @@ where they are installed. For example:</p>
  <ol>
    <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.
    <li>Open Android Studio and follow the setup wizard to install any necessary SDK tools.
      <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
@@ -118,7 +118,7 @@ you can access them at:</p>
      <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 tools outside of the Android Studio directories.</li>
    <li>Follow the setup wizard to install any necessary SDK tools.</li>
  </ol>

</div><!-- end linux -->
@@ -226,8 +226,7 @@ the SDK tools from the command line.</p>
      <li><a href="https://help.ubuntu.com/community/Java">https://help.ubuntu.com/community/JavaInstallation</a></li>
    </ul>
  </li>
  <li>Here are the steps to install Java and Eclipse, prior to installing
  the Android SDK and ADT Plugin.
  <li>Here are the steps to install Java:
    <ol>
      <li><p>If you are running a 64-bit distribution on your development
      machine, you need to install additional packages first. For Ubuntu 13.10 (Saucy Salamander)
@@ -241,13 +240,6 @@ sudo apt-get install libncurses5:i386 libstdc++6:i386 zlib1g:i386</pre>
      <pre class="no-pretty-print">apt-get install ia32-libs</pre>
      </li>
      <li>Next, install Java: <pre class="no-pretty-print">apt-get install sun-java6-jdk</pre></li>
      <li>The Ubuntu package manager does not currently offer an Eclipse 3.7
      version for download, so we recommend that you download Eclipse from
      eclipse.org (<a
      href="http://www.eclipse.org/downloads/">http://www.eclipse.org/downloads/</a>).
      A Java or RCP version of Eclipse is recommended.</li>
      <li>Follow the steps given in previous sections to install the SDK
      and the ADT plugin. </li>
    </ol>
  </li>
</ul>
@@ -327,10 +319,6 @@ if (package == "tools") {
  // Show the SDK Tools (other IDE) instructions
  $("h1").text($("#tools").attr('heading'));
  $("#tools").show();
} else if (package == "adt") {
  // Show the ADT instructions
  $("h1").text($("#adt").attr('heading'));
  $("#adt").show();
} else if (package == "studio") {
  // Show the Android Studio instructions
  $("h1").text($("#studio").attr('heading'));