diff options
Diffstat (limited to 'docs/html/sdk/installing')
| -rw-r--r-- | docs/html/sdk/installing/index.jd | 69 | ||||
| -rw-r--r-- | docs/html/sdk/installing/installing-adt.jd | 18 | ||||
| -rw-r--r-- | docs/html/sdk/installing/migrate.jd | 39 | ||||
| -rw-r--r-- | docs/html/sdk/installing/studio-build.jd | 2 | ||||
| -rw-r--r-- | docs/html/sdk/installing/studio-tips.jd | 14 |
5 files changed, 38 insertions, 104 deletions
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd index 744ce15..14d274f 100644 --- a/docs/html/sdk/installing/index.jd +++ b/docs/html/sdk/installing/index.jd @@ -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)—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> @@ -272,47 +264,6 @@ Continue: Adding SDK Packages</a></p> -<!-- ################### ADT BUNDLE ####################### --> -<div id="adt" heading="Installing the Eclipse ADT Bundle" style="display:none"> - - -<p>The Eclipse ADT Bundle provides everything you need to start developing apps, including -the Android SDK tools and a version of the Eclipse IDE with built-in ADT -(Android Developer Tools) to streamline your Android app development.</p> - -<p>If you didn't download the Eclipse ADT bundle, go <a href="{@docRoot}tools/eclipse/index.html" -><b>download the Eclipse ADT bundle now</b></a>, or switch to the -<a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio -install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=tools">stand-alone SDK Tools -install</a> instructions</i>.</p> - -<div class="procedure-box"> -<p><b>To set up the ADT Bundle:</b></p> -<ol> -<li>Unpack the ZIP file -(named {@code adt-bundle-<os_platform>.zip}) and save it to an appropriate location, -such as a "Development" directory in your home directory.</li> -<li>Open the {@code adt-bundle-<os_platform>/eclipse/} directory and launch -<strong>Eclipse</strong>.</li> -</ol> - -<p class="caution"><strong>Caution:</strong> Do not move any of the files or directories -from the {@code adt-bundle-<os_platform>} directory. If you move the {@code eclipse/} -or {@code sdk/} directory, ADT will not be able to locate the SDK and you'll -need to manually update the ADT preferences.</p> -</div> - -<p>Eclipse with ADT is now ready and loaded with the Android developer tools, but there are still -a couple packages you should add to make your Android SDK complete.</p> - -<p class="paging-links"> -<a href="{@docRoot}sdk/installing/adding-packages.html" class="next-page-link"> -Continue: Adding SDK Packages</a></p> - - -</div> -<!-- ################ END ADT BUNDLE ##################### --> - @@ -368,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')); diff --git a/docs/html/sdk/installing/installing-adt.jd b/docs/html/sdk/installing/installing-adt.jd index c8200aa..0114848 100644 --- a/docs/html/sdk/installing/installing-adt.jd +++ b/docs/html/sdk/installing/installing-adt.jd @@ -15,12 +15,18 @@ of Eclipse to let you quickly set up new Android projects, build an app UI, debug your app, and export signed (or unsigned) app packages (APKs) for distribution. </p> -<p class="note"><strong>Note:</strong> You should install the ADT plugin -only if you already have an Eclipse installation that you want to continue using. If you do not -have Eclipse installed, you should instead <b><a href="{@docRoot}sdk/index.html">install -the complete Android SDK</a></b>, which includes the latest IDE for Android developers.</p> - -<p>Your existing Eclipse installation must meet these requirements:</p> +<p class="note"><strong>Note:</strong> +If you have been using Eclipse with ADT, be aware that <a +href="{@docRoot}tools/studio/index.html">Android Studio</a> is now the official IDE +for Android, so you should migrate to Android Studio to receive all the +latest IDE updates. For help moving projects, +see <a href="/sdk/installing/migrate.html">Migrating to Android +Studio</a>.</p> + + +<p>You should install the ADT plugin +only if you already have an Eclipse installation that you want to continue using. +Your existing Eclipse installation must meet these requirements:</p> <ul> <li><a href="http://eclipse.org/mobile/">Eclipse</a> 3.7.2 (Indigo) or greater <p class="note"><strong>Note:</strong> Eclipse 3.6 (Helios) is no longer diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd index c99cc30..3c04cb4 100644 --- a/docs/html/sdk/installing/migrate.jd +++ b/docs/html/sdk/installing/migrate.jd @@ -6,7 +6,8 @@ page.title=Migrating to Android Studio <div id="qv"> <h2>See also</h2> <ul> - <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA">IntelliJ FAQ on migrating to IntelliJ IDEA</a></li> + <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA" + class="external-link">IntelliJ FAQ on migrating to IntelliJ IDEA</a></li> <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/Working+in+Eclipse+Compatibility+Mode" class="external-link" >Eclipse Compatibility Mode</a></li> <li><a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA" class="external-link" @@ -15,41 +16,27 @@ page.title=Migrating to Android Studio </div> </div> -<p>If you're currently using Eclipse with ADT, we recommend you migrate to -<a href="{@docRoot}tools/studio/index.html">Android Studio</a> as soon as possible, because -the ADT plugin for Eclipse is no longer in active development.</p> +<p>If you have been using <a href="{@docRoot}tools/help/adt.html">Eclipse with ADT</a>, be aware +that <a href="{@docRoot}tools/studio/index.html">Android Studio</a> is now the official IDE for +Android, so you should migrate to Android Studio to receive all the latest IDE updates.</p> -<p>To migrate existing Android projects from Eclipse, -you should export your projects from Eclipse in order to generate -Gradle build files:</p> - -<ol> - <li>In Eclipse, select <strong>File > Export</strong>.</li> - <li>Select <strong>Generate Gradle build files</strong> inside the Android folder, then click - <strong>Next</strong>.</li> - <li>Click <strong>Browse</strong> to find your project to export.</li> - <li>Select your project from the list, click <strong>OK</strong>, then <strong>Finish</strong>.</li> -</ol> - - -<p>You can then import the project into Android Studio:</p> +<p>To migrate existing Android projects, simply import them using Android Studio:</p> <ol> <li>In Android Studio, close any projects currently open. You should see the <strong>Welcome to Android Studio</strong> window.</li> - <li>Click <strong>Import Project</strong>.</li> + <li>Click <strong>Import Non-Android Studio project</strong>.</li> <li>Locate the project you exported from Eclipse, expand it, select the <strong>build.gradle</strong> file and click <strong>OK</strong>.</li> <li>In the following dialog, leave <strong>Use gradle wrapper</strong> selected and click <strong>OK</strong>. (You do not need to specify the Gradle home.)</li> </ol> -<p>It's possible to import an existing Android project to Android Studio even if you -don't generate a Gradle build file from Eclipse—Android Studio will successfully build and -run projects using an existing Ant build file. However, in order to take advantage of build -variants and other advanced features in the future, -you should generate a Gradle build file using -the ADT plugin or write your own Gradle build file for use with Android Studio.</p> +<p>Android Studio properly updates the project structure and creates the appropriate +Gradle build file.</p> -<p><a href="{@docRoot}tools/studio/index.html">Learn more about Android Studio</a>.</p> +<p>For more help getting started with Android Studio and the IntelliJ user experience, +<a href="{@docRoot}tools/studio/index.html">learn more about Android Studio</a> and +read <a href="http://confluence.jetbrains.com/display/IntelliJIDEA/FAQ+on+Migrating+to+IntelliJ+IDEA" + class="external-link">FAQ on Migrating to IntelliJ IDEA</a>.</p> diff --git a/docs/html/sdk/installing/studio-build.jd b/docs/html/sdk/installing/studio-build.jd index c80368f..4fe9071 100644 --- a/docs/html/sdk/installing/studio-build.jd +++ b/docs/html/sdk/installing/studio-build.jd @@ -13,7 +13,7 @@ page.title=Build System Overview <li><a href="{@docRoot}sdk/installing/studio.html"> Getting Started with Android Studio</a></li> <li><a href="{@docRoot}tools/studio/index.html">Android Studio Basics</a></li> - <li><a href="{@docRoot}tools/eclipse/migrate-adt.html">Migrating from Eclipse</a></li> + <li><a href="{@docRoot}sdk/installing/migrate.html">Migrating from Eclipse</a></li> </div> </div> diff --git a/docs/html/sdk/installing/studio-tips.jd b/docs/html/sdk/installing/studio-tips.jd index fba7a70..8e7e345 100644 --- a/docs/html/sdk/installing/studio-tips.jd +++ b/docs/html/sdk/installing/studio-tips.jd @@ -40,25 +40,19 @@ For example, if you add a button to the layout without specifying the <em>width< add all missing attributs</em>. Clicking the message adds the missing attributes to the layout.</p> -<h2>Output window message filtering</h2> -<p>When checking build results, you can filter messages by <em>message type</em> to quickly -locate messages of interest.</p> -<img src="{@docRoot}images/tools/studio-outputwindowmsgfiltering.png" style="width:200px"style="width:200px" /> -<p class="img-caption"><strong>Figure 14.</strong> Filter Build Messages</p> - <h3> Bitmap rendering in the debugger</h3> <p>While debugging, you can now right-click on bitmap variables in your app and invoke <em>View Bitmap</em>. This fetches the associated data from the debugged process and renders the bitmap in the debugger. </p> <p><img src="{@docRoot}images/tools/studio-bitmap-rendering.png" style="width:350px"/></p> -<p class="img-caption"><strong>Figure 2.</strong> Bitmap Rendering</p> +<p class="img-caption"><strong>Figure 1.</strong> Bitmap Rendering</p> <h3>Output window message filtering</h3> <p>When checking build results, you can filter messages by <em>message type</em> to quickly locate messages of interest.</p> <img src="{@docRoot}images/tools/studio-outputwindowmsgfiltering.png" style="width:200px"style="width:200px" /> -<p class="img-caption"><strong>Figure 3.</strong> Filter Build Messages</p> +<p class="img-caption"><strong>Figure 2.</strong> Filter Build Messages</p> <h3>Hierarchical parent setting</h3> @@ -79,7 +73,7 @@ including the preview device, layout theme, platform version and more. To previe multiple devices simultaneously, select <strong>Preview All Screen Sizes</strong> from the device drop-down.</p> <p><img src="{@docRoot}images/tools/studio-previewall.png" style="width:350px"/></p> -<p class="img-caption"><strong>Figure 4.</strong> Preview All Screens</p> +<p class="img-caption"><strong>Figure 3.</strong> Preview All Screens</p> <p>You can switch to the graphical editor by clicking <strong>Design</strong> at the bottom of the window. While editing in the Design view, you can show and hide the @@ -166,7 +160,7 @@ resolved values for the various attributes that are pulled in.</p> </strong> <code>F1</code>, see the theme inheritance hierarchy, and resolved values for the various attributes.</p> <img src="{@docRoot}images/tools/studio-allocationtracker.png" style="width:300px" /> -<p class="img-caption"><strong>Figure 1.</strong> Allocation Tracker</p> +<p class="img-caption"><strong>Figure 4.</strong> Allocation Tracker</p> <h3 id="key-commands">Keyboard Commands</h3> |