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

Commit ead7b78b authored by Joe Fernandez's avatar Joe Fernandez
Browse files

resolved conflicts for merge of 66189de6 to master 

Change-Id: Id4a80013dd506bd1135dd931450ee2a08a4c77aa
parents 3bf22c31 66189de6

docs/html/sdk/index.jd

+33 −25
Original line number Diff line number Diff line
@@ -4,19 +4,27 @@ page.template=sdk 
header.hide=1

page.metaDescription=Download the official Android developer tools to build apps for Android phones, tablets, wearables, TVs, and more.



studio.version=0.8.14

studio.version=1.0.0



studio.linux_bundle_download=android-studio-ide-135.1538390-linux.zip

studio.linux_bundle_bytes=176358193

studio.linux_bundle_checksum=718356b49254f6c4e55c64b99164d311995205dd

studio.linux_bundle_download=android-studio-ide-135.1629389-linux.zip

studio.linux_bundle_bytes=243909934

studio.linux_bundle_checksum=601a302f10cf8a22ba4216e0884a035bdfec38b3



studio.mac_bundle_download=android-studio-ide-135.1538390-mac.zip

studio.mac_bundle_bytes=176745627

studio.mac_bundle_checksum=4070e6f6a44d042266f46f1f2f9ca3448ac23f8cd

studio.mac_bundle_download=android-studio-ide-135.1629389.dmg

studio.mac_bundle_bytes=245757810

studio.mac_bundle_checksum=0d9e0e230ece9f2e696b1b076c36ee1e73edcf3c



studio.win_bundle_download=android-studio-ide-135.1538390-windows.zip

studio.win_bundle_bytes=177343814

studio.win_bundle_checksum=b533480200ba893616c73b32477e66ebb357a1b3

studio.win_bundle_exe_download=android-studio-bundle-135.1629389.exe

studio.win_bundle_exe_bytes=852499624

studio.win_bundle_exe_checksum=0c8a3b45385a698b43a47757fdd6a83ca837abd2



studio.win_notools_exe_download=android-studio-ide-135.1629389.exe

studio.win_notools_exe_bytes=262099808

studio.win_notools_exe_checksum=bfc6e9397f72969bcb3db80c9abe3a205540c8ab



studio.win_bundle_download=android-studio-ide-135.1629389-windows.zip

studio.win_bundle_bytes=246241434

studio.win_bundle_checksum=6951e678a41b94b6172276727537db8590be7270
@@ -325,18 +333,19 @@ srcset="{@docRoot}images/tools/studio-hero-code_2x.png 2x, {@docRoot}images/tool 






<h2 class="feature norule">

Android builds evolved, with Gradle</h2>



<h2 class="feature norule">Code templates and GitHub integration</h2>



<div class="col-9" style="margin:0 20px 0 0">

  <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" />

  <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) -->



<div class="col-4 feature-blurb">

  <p>Create multiple APKs for your Android app with different features using the same project.</p>

  <p>Manage app dependencies with Maven.</p>

  <p>Build APKs from Android Studio or the command line.</p>

  <p>New project wizards make it easier than ever to start a new project.</p>



  <p>Start projects using template code for patterns such as navigation drawer and view pagers,

  and even import Google code samples from GitHub.</p>

</div>
@@ -375,19 +384,18 @@ srcset="{@docRoot}images/tools/studio-hero-avds_2x.png 2x, {@docRoot}images/tool 








<h2 class="feature norule">Code templates and GitHub integration</h2>

<h2 class="feature norule">

Android builds evolved, with Gradle</h2>



<div class="col-9" style="margin:0 20px 0 0">

  <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" />

  <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) -->



<div class="col-4 feature-blurb">

  <p>New project wizards make it easier than ever to start a new project.</p>



  <p>Start projects using template code for patterns such as navigation drawer and view pagers,

  and even import Google code samples from GitHub.</p>

  <p>Create multiple APKs for your Android app with different features using the same project.</p>

  <p>Manage app dependencies with Maven.</p>

  <p>Build APKs from Android Studio or the command line.</p>

</div>

docs/html/sdk/installing/index.jd

+5 −5
Original line number Diff line number Diff line
@@ -155,8 +155,7 @@ for your favorite IDE (if available).</p> 


<p>If you didn't download the SDK tools, go <a href="{@docRoot}sdk/index.html#Other"

><b>download the SDK now</b></a>,

or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=adt">Eclipse ADT

install</a> or <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio

or switch to the <a href="{@docRoot}sdk/installing/index.html?pkg=studio">Android Studio

install</a> instructions.</p>
@@ -328,7 +327,8 @@ Continue: Adding SDK Packages</a></p> 
<div id="default" style="display:none">



<p>If you haven't already, <b><a href="{@docRoot}sdk/index.html">download

the Android SDK bundle for Android Studio or the stand-alone SDK Tools</a></b>. </p>

the Android SDK bundle for Android Studio</a></b> or the

<a href="{@docRoot}sdk/index.html#Other">stand-alone SDK Tools</a>. </p>



<p>Then, select which SDK bundle you want to install:</p>

docs/html/sdk/installing/migrate.jd

+2 −2
Original line number Diff line number Diff line
@@ -14,8 +14,8 @@ 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/basics/index.html">Android Studio</a>, a new Android

<p>If you're currently using Eclipse with ADT, we recommend you migrate to

<a href="{@docRoot}tools/studio/index.html">Android Studio</a>, a new Android

development environment powered by IntelliJ IDEA. On top of the capabilities you expect from

IntelliJ, Android Studio offers:</p>

<ul>

docs/html/tools/debugging/debugging-studio.jd

+1 −1
Original line number Diff line number Diff line
@@ -28,7 +28,7 @@ page.title=Debugging with Android Studio 
</ol>

<h2>See also</h2>

<ul>

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

<li><a href="{@docRoot}sdk/installing/studio-tips.html">

Android Studio Tips and Tricks</a></li>

<li><a href="{@docRoot}tools/debugging/index.html">Debugging</a></li>

<li><a href="{@docRoot}tools/help/monitor.html">Device Monitor</a></li>

docs/html/tools/eclipse/index.jd

+3 −3
Original line number Diff line number Diff line
@@ -7,7 +7,7 @@ page.title=Eclipse ADT 
  <h2>See also</h2>

  <ol>

    <li><a href="{@docRoot}tools/sdk/index.html">Downloading Android Studio</a></li>

    <li><a href="{@docRoot}tools/basics/index.html">Android Studio Basics</a></li>

    <li><a href="{@docRoot}tools/studio/index.html">Android Studio</a></li>

    <li><a href="{@docRoot}tools/eclipse/migrate-adt.html">Migrating to Android Studio</a></li>

  </ol>

</div>
@@ -26,8 +26,8 @@ to Android Studio</a> as the Eclipse ADT is no longer in active development. 
with an Android plugin for <em>Gradle</em>. <a href="http://www.gradle.org/">Gradle</a> is an

advanced build toolkit that manages dependencies and allows you to define custom build logic. Android

Studio also adds support for Maven-based build dependencies, build variants, advanced code

completion and refactoring. For more details about Android Studio, see

<a href="{@docRoot}tools/studio/basics.html">Android Studio basics.</a>

completion and refactoring. For more details about Android Studio, see the

<a href="{@docRoot}tools/studio/index.html">Android Studio</a> guide.



<p>If you still wish to get started with the ADT plugin,

<a href="{@docRoot}tools/eclipse/installing-adt.html">download and install the Eclipse ADT plugin.</a>