diff options
Diffstat (limited to 'docs/html/sdk')
-rw-r--r-- | docs/html/sdk/index.jd | 29 | ||||
-rw-r--r-- | docs/html/sdk/installing/migrate.jd | 32 |
2 files changed, 38 insertions, 23 deletions
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd index 5a03197ee20d..d3fcf480c2a9 100644 --- a/docs/html/sdk/index.jd +++ b/docs/html/sdk/index.jd @@ -1,6 +1,7 @@ page.title=Download Android Studio and SDK Tools page.tags=sdk, android studio page.template=sdk +page.image=images/cards/android-studio_2x.png header.hide=1 page.metaDescription=Download the official Android IDE and developer tools to build apps for Android phones, tablets, wearables, TVs, and more. @@ -63,7 +64,7 @@ sdk.win_installer_checksum=e764ea93aa72766737f9be3b9fb3e42d879ab599 } .feature-blurb { margin:0px; font-size:16px; font-weight:300; - padding:40px 0 0 0; + padding-top:40px; } .landing-button.green { @@ -284,7 +285,7 @@ This is the Android Software Development Kit License Agreement <img src="{@docRoot}images/tools/studio-hero.png" srcset="{@docRoot}images/tools/studio-hero_2x.png 2x, {@docRoot}images/tools/studio-hero.png 1x" -width="760" height="400" alt="" style="margin-bottom:80px" /> +width="760" height="400" alt="" style="margin-bottom:100px" /> <div style="color: #fff; width:226px; height:0; overflow:visible; position:absolute; top:40px; left:25px"> @@ -293,7 +294,7 @@ width="760" height="400" alt="" style="margin-bottom:80px" /> <p style="font-size: 16px; color:#bbb; position: absolute;left: 297px; top: 5px; display: block; width: 400px;text-align: center;">The official Android IDE</p> -<ul style="font-size:12px"> +<ul style="font-size:12px;line-height:19px;"> <li>Android Studio IDE</li> <li>Android SDK tools</li> <li>Android 5.0 (Lollipop) Platform</li> @@ -322,10 +323,10 @@ target="_blank">Take a Survey</a></li> +<div class="cols"> +<h2 class="feature norule col-13">Intelligent code editor</h2> -<h2 class="feature norule" >Intelligent code editor</h2> - -<div class="col-9" style="margin:0 20px 0 0"> +<div class="col-9"> <img src="{@docRoot}images/tools/studio-hero-code.png" srcset="{@docRoot}images/tools/studio-hero-code_2x.png 2x, {@docRoot}images/tools/studio-hero-code.png 1x" width="520" /> </div><!-- end col-9 (left column) --> @@ -340,9 +341,9 @@ srcset="{@docRoot}images/tools/studio-hero-code_2x.png 2x, {@docRoot}images/tool -<h2 class="feature norule">Code templates and GitHub integration</h2> +<h2 class="feature norule col-13">Code templates and GitHub integration</h2> -<div class="col-9" style="margin:0 20px 0 0"> +<div class="col-9"> <img src="{@docRoot}images/tools/studio-hero-import.png" srcset="{@docRoot}images/tools/studio-hero-import_2x.png 2x, {@docRoot}images/tools/studio-hero-import.png 1x" width="520" /> </div><!-- end col-9 (left column) --> @@ -357,9 +358,9 @@ srcset="{@docRoot}images/tools/studio-hero-import_2x.png 2x, {@docRoot}images/to -<h2 class="feature norule">Multi-screen app development</h2> +<h2 class="feature norule col-13">Multi-screen app development</h2> -<div class="col-9" style="margin:0 20px 0 0"> +<div class="col-9"> <img src="{@docRoot}images/tools/studio-hero-screens.png" srcset="{@docRoot}images/tools/studio-hero-screens_2x.png 2x, {@docRoot}images/tools/studio-hero-screens.png 1x" width="520" /> </div><!-- end col-9 (left column) --> @@ -374,9 +375,9 @@ srcset="{@docRoot}images/tools/studio-hero-screens_2x.png 2x, {@docRoot}images/t -<h2 class="feature norule">Virtual devices for all shapes and sizes</h2> +<h2 class="feature norule col-13">Virtual devices for all shapes and sizes</h2> -<div class="col-9" style="margin:0 20px 0 0"> +<div class="col-9"> <img src="{@docRoot}images/tools/studio-hero-avds.png" srcset="{@docRoot}images/tools/studio-hero-avds_2x.png 2x, {@docRoot}images/tools/studio-hero-avds.png 1x" width="520" /> </div><!-- end col-9 (left column) --> @@ -390,10 +391,10 @@ srcset="{@docRoot}images/tools/studio-hero-avds_2x.png 2x, {@docRoot}images/tool -<h2 class="feature norule"> +<h2 class="feature norule col-13"> Android builds evolved, with Gradle</h2> -<div class="col-9" style="margin:0 20px 0 0"> +<div class="col-9"> <img src="{@docRoot}images/tools/studio-hero-gradle.png" srcset="{@docRoot}images/tools/studio-hero-gradle_2x.png 2x, {@docRoot}images/tools/studio-hero-gradle.png 1x" width="520" /> </div><!-- end col-9 (left column) --> diff --git a/docs/html/sdk/installing/migrate.jd b/docs/html/sdk/installing/migrate.jd index 3c04cb4ce832..345e89a7e9d3 100644 --- a/docs/html/sdk/installing/migrate.jd +++ b/docs/html/sdk/installing/migrate.jd @@ -24,17 +24,31 @@ Android, so you should migrate to Android Studio to receive all the latest IDE u <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 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> + <li>In Android Studio, from the main menu or the <strong>Welcome to Android Studio</strong> page, + choose <strong>File > Import Project</strong>.</li> + <li> Select the Eclipse root project directory</strong> and click <strong>OK</strong>. + <p class="note"><strong>Note:</strong> The Eclipse root directory must contain the + <code>AndroidManifest.xml</code> file. Also, the root directory must contain either the + <code>.project</code> and <strong>.classpath</strong> files from Eclipse or the + <code>res/</code> and <code>src/</code> directories.</p> + </li> + <li>Follow the steps in the import wizard. </li> </ol> -<p>Android Studio properly updates the project structure and creates the appropriate -Gradle build file.</p> +<p>Android Studio imports the current dependencies, downloads libraries, and +creates an Android Studio project with the imported Eclipse project as the main module. Android +Studio also creates the required Gradle build files. </p> + +<p>The import process replaces any JAR files and libraries with Gradle dependencies, and replaces +source libraries and binary libraries with Maven dependencies, so you no longer need to maintain +these files manually.</p> + + <p class="note"><strong>Note:</strong> If there are references to Eclipse workspace library files, + comment them out in the <code>project.properties</code> or <code>.classpath</code> files + that you imported from the Eclipse project. You can then add these files in the + <code>build.gradle</code> file. See + <a href="{@docRoot}tools/building/configuring-gradle.html">Configuring Gradle Builds</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 |