Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 81fcc85c: Merge "docs:studio-update-814" into lmp-docs

Browse Source 
* commit '81fcc85c23eea3905238f3f8d359df0344c37865':
  docs:studio-update-814
This commit is contained in:
Joe Fernandez
2014-10-31 05:21:22 +00:00
committed by Android Git Automerger
parent 3d875f8040 81fcc85c23
commit 922e6b6aae
4 changed files with 80 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

51
docs/html/sdk/installing/index.jd
View File

@@ -74,9 +74,9 @@ Continue: Adding SDK Packages</a></p>
<!-- ################ STUDIO ##################### -->
<div id="studio" heading="Installing Android Studio" style="display:none">
<p>Android Studio provides everything you need to start developing apps, including
the Android SDK tools and the Android Studio IDE (powered by IntelliJ) to
streamline your Android app development.</p>
<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>If you didn't download Android Studio, go <a href="{@docRoot}sdk/installing/studio.html"
><b>download Android Studio now</b></a>, or switch to the
@@ -103,8 +103,9 @@ 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 downloaded EXE file, {@code android-studio-bundle-&lt;version&gt;.exe}.</li>
<li>Follow the setup wizard to install Android Studio.
<li>Unzip the file, {@code android-studio-ide-&lt;version&gt;-windows.zip} and launch the
<code>studio.exe</code> file.</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.
If you encounter this problem,
@@ -119,11 +120,10 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;'
</ol>
<p>The individual tools and
other SDK packages are saved within the Android Studio application directory.
If you need to access the tools directly, use a terminal to navigate into the application and locate
the {@code sdk/} directory. For example:</p>
<p><code>\Users\&lt;user&gt;\AppData\Local\Android\android-studio\sdk\</code></p>
<p>The individual tools and other SDK packages are saved outside the Android Studio application
directory. If you need to access the tools directly, use a terminal to navigate to the location
where they are installed. For example:</p>
<p><code>\Users\&lt;user&gt;\sdk\</code></p>
@@ -134,7 +134,7 @@ the {@code sdk/} directory. For example:</p>
<p><b>To set up Android Studio on Mac OSX:</b></p>
<ol>
<li>Open the downloaded DMG file, {@code android-studio-bundle-&lt;version&gt;.dmg}.</li>
<li>Unzip the downloaded zip file, {@code android-studio-ide-&lt;version&gt;-mac.zip}.</li>
<li>Drag and drop Android Studio into the Applications folder.
<p>
Depending on your security settings, when you attempt to open Android Studio, you might
@@ -143,13 +143,13 @@ the {@code sdk/} directory. 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 within the Android Studio application directory.
If you need access the tools directly, use a terminal to navigate into the application and locate
the {@code sdk/} directory. For example:</p>
<p><code>/Applications/Android\ Studio.app/sdk/</code></p>
<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>
</div><!-- end mac -->
@@ -160,13 +160,14 @@ the {@code sdk/} directory. For example:</p>
<p><b>To set up Android Studio on Linux:</b></p>
<ol>
<li>Unpack the downloaded Tar file, {@code android-studio-bundle-&lt;version&gt;.tgz}, into an appropriate
location for your applications.
<li>Unpack the downloaded Tar file, {@code android-studio-ide-&lt;version&gt;-linux.zip}, 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>
</ol>
</div><!-- end linux -->
@@ -217,11 +218,12 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;'
<p>Your download package is an executable file that starts an installer. The installer checks your machine
for required tools, such as the proper Java SE Development Kit (JDK) and installs it if necessary.
The installer then saves the Android SDK Tools into a default location (or you can specify the location).</p>
The installer then saves the Android SDK Tools to a specified the location outside of the Android
Studio directories.</p>
<ol>
<li>Double-click the executable ({@code .exe} file) to start the install.</li>
<li>Make a note of the name and location in which it saves the SDK on your system&mdash;you will need to
<li>Make a note of the name and location where you save the SDK on your system&mdash;you will need to
refer to the SDK directory later when using
the SDK tools from the command line.</li>
<li>Once the installation completes, the installer starts the Android SDK Manager.
@@ -237,8 +239,8 @@ the SDK tools from the command line.</li>
<p><b>To get started on Mac OSX:</b></p>
<p>Unpack the ZIP file you've downloaded. By default, it's unpacked
into a directory named <code>android-sdk-mac_x86</code>. Move it to an appropriate location on your machine,
such as a "Development" directory in your home directory.</p>
into a directory named <code>android-sdk-mac_x86</code>. Move it to an appropriate location on your
machine, such as a "Development" directory in your home directory.</p>
<p>Make a note of the name and location of the SDK directory on your system&mdash;you will need to
refer to the SDK directory later when using
@@ -253,9 +255,8 @@ the SDK tools from the command line.</p>
<p><b>To get started on Linux:</b></p>
<p>Unpack the {@code .tgz} file you've downloaded. By default, the SDK files are unpacked
into a directory named <code>android-sdk-linux_x86</code>. Move it to an appropriate location on your machine,
such as a "Development" directory in your home directory.</p>
<p>Unpack the {@code .zip} file you've downloaded. The SDK files are download separately to a
user-specified directory. </p>
<p>Make a note of the name and location of the SDK directory on your system&mdash;you will need to
refer to the SDK directory later when using

74
docs/html/sdk/installing/studio.jd
View File

@@ -194,14 +194,12 @@ This is the Android Software Development Kit License Agreement
href="" style="display:none;width:368px;margin:0 auto;display:block;font-size:18px" ></a>
<div style="margin:20px 0 0 0">
<p style="margin-bottom:8px">This download includes:</p>
<ul style="margin-bottom:20px">
<li>Android Studio Beta</li>
<li>All the Android SDK Tools to design, test, and debug your app</li>
<li>A version of the Android platform to compile your app</li>
<li>A version of the Android system image to run your app in the emulator</li>
</ul>
<p style="margin-bottom:8px">This download includes the Android Studio Beta.</p>
<p class="note"><strong>Note:</strong> The SDK tools are now downloaded and installed separately
from the Android Studio directories. </p>
<li>All the Android SDK Tools to design, test, and debug your app</li>
</div>
</div>
@@ -244,43 +242,43 @@ download (or continue to use)
<th>Platform</th>
<th>Package</th>
<th>Size</th>
<th>MD5 Checksum</th>
<th>SHA Sum</th>
</tr>
<tr>
<td>Windows</td>
<td>
<a onclick="return onDownload(this)" id="win-studio"
href="https://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-windows.exe">
android-studio-bundle-135.1339820-windows.exe
href="http://dl.google.com/dl/android/studio/ide-zips/0.8.14/android-studio-ide-135.1538390-
windows.zip">android-studio-ide-135.1538390-windows.zip
</a>
</td>
<td>379497130 bytes</td>
<td>024e002b8c8fa7dcd2ff69fd69e06e56</td>
<td>177343814 bytes</td>
<td>b533480200ba893616c73b32477e66ebb357a1b3</td>
</tr>
<tr>
<td><nobr>Mac OS X</nobr></td>
<td>
<a onclick="return onDownload(this)" id="mac-studio"
href="https://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-mac.dmg">
android-studio-bundle-135.1339820-mac.dmg
href="http://dl.google.com/dl/android/studio/ide-zips/0.8.14/android-studio-ide-135.1538390-mac.zip">
android-studio-ide-135.1538390-mac.zip
</a>
</td>
<td>368507143 bytes</td>
<td>4143f2aa556634eae91701965d88899b</td>
<td>176745627 bytes</td>
<td>4070e6f6a44d042266f46f1f2f9ca3448ac23f8cd</td>
</tr>
<tr>
<td>Linux</td>
<td>
<a onclick="return onDownload(this)" id="linux-studio"
href="https://dl.google.com/android/studio/install/0.8.6/android-studio-bundle-135.1339820-linux.tgz">
android-studio-bundle-135.1339820-linux.tgz
href="http://dl.google.com/dl/android/studio/ide-zips/0.8.14/android-studio-ide-135.1538390-
linux.zip">android-studio-ide-135.1538390-linux.zip
</a>
</td>
<td>417631443 bytes</td>
<td>fa403762ecd0a5da87acbeff485f81cc</td>
<td>176358193 bytes</td>
<td>718356b49254f6c4e55c64b99164d311995205dd</td>
</tr>
</table>
@@ -301,26 +299,26 @@ download (or continue to use)
<tr>
<td>
<ul>
<li>Microsoft Windows 8, 7, Vista, 2003, or XP (32 or 64 bit)</li>
<li>1 GB of RAM minimum, 2 GB recommended</li>
<li>Microsoft Windows 8, 7, Vista, or 2003 (32 or 64 bit)</li>
<li>2 GB of RAM minimum, 4/8 GB recommended</li>
<li>400 MB of disk space</li>
<li>At least 1 GB of additional disk space for the Android SDK, emulator system images, and caches</li>
<li>1280x800 minimum screen resolution</li>
<li>Java Development Kit (JDK) 6 or higher</li>
<li>Java Development Kit (JDK) 7 or higher</li>
</ul>
</td>
<td>
<ul>
<li>Mac OS X 10.8.5 or higher, up to 10.9 (Mavericks)</li>
<li>1 GB of RAM minimum, 2 GB recommended</li>
<li>2 GB of RAM minimum, 4/8 GB recommended</li>
<li>400 MB of disk space</li>
<li>At least 1 GB of additional disk space for the Android SDK, emulator system images, and caches</li>
<li>1280x800 minimum screen resolution</li>
<li>Java Runtime Environment (JRE) 6 *</li>
<li>Java Development Kit (JDK) 6 or JDK 7</li>
<li>Java Development Kit (JDK) 7 or higher</li>
</ul>
<p>* On Mac OS, run Android Studio with Java Runtime Environment (JRE) 6 for optimized font
rendering. You can then configure your project to use Java Development Kit (JDK) 6 or JDK 7.</p>
rendering. You can then configure your project to use Java Development Kit (JDK) JDK 7.</p>
</td>
<td>
<ul>
@@ -328,17 +326,16 @@ rendering. You can then configure your project to use Java Development Kit (JDK)
<li>GNU C Library (glibc) 2.11 or later is required.</li>
<li>Tested on Ubuntu 12.04, Precise Pangolin</li>
<li>GNOME or KDE desktop</li>
<li>1 GB of RAM minimum, 2 GB recommended</li>
<li>2 GB of RAM minimum, 4/8 GB recommended</li>
<li>400 MB of disk space</li>
<li>At least 1 GB of additional disk space for the Android SDK, emulator system images, and caches</li>
<li>1280x800 minimum screen resolution</li>
<li>Oracle Java Development Kit (JDK) 6 or JDK 7</li>
<li>Oracle Java Development Kit (JDK) 7 or higher</li>
</ul>
</td>
</tr>
</table>
<p class="note"><strong>Note:</strong> Java Development Kit (JDK) 7 is required if you're targeting
the Android L Developer Preview.</p>
<p class="note"><strong>Note:</strong> The full SDK/NDK requires 13 GB of disk space.</p>
</div><!-- end pax -->
@@ -425,7 +422,7 @@ installation.</p>
<p><strong>Caution:</strong> Replacing your existing installation of
Android Studio will remove any additional SDK packages you've installed, such as target
platforms, system images, and sample apps. To preserve these, copy them from your current
SDK directory under Android Studio to a temporary location
SDK directory to a temporary location
before installing the update. Then move them back once the update is complete.
If you fail to copy these packages, then you can instead download them again through
the Android SDK Manager.</p>
@@ -453,6 +450,17 @@ style="vertical-align:bottom;margin:0;height:19px" /> in the toolbar.</p>
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
alt=""/>Android Studio v0.8.14</a> <em>(October 2014)</em>
</p>
<div class="toggle-content-toggleme">
<p>See <a href="http://tools.android.com/recent">tools.android.com</a> for a full list of changes.</p>
</div>
</div>
<div class="toggle-content closed">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>Android Studio v0.8.6</a> <em>(August 2014)</em>
</p>
@@ -650,8 +658,8 @@ for possible resolutions to known issues: <a href="http://tools.android.com/know
if (os) {
/* set up primary ACE download button */
$('#download-ide-button').show();
$('#download-ide-button').append("Download Android Studio Beta <span class='small'>v0.8.6</span>"
+ "<br/> <span class='small'>with the Android SDK for " + os + "</span>");
$('#download-ide-button').append("Download Android Studio Beta <span class='small'>v0.8.14</span>"
+ "<br/> <span class='small'>Android SDK for " + os + installed separately"</span>");
$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);
} else {

12
docs/html/tools/revisions/build-tools.jd
View File

@@ -77,6 +77,18 @@ listing in the Android SDK Manager.</p>
<div class="toggle-content opened">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-opened.png" class="toggle-content-img"
alt=""/>Build Tools, Revision 21.1</a> <em>(October 2014)</em>
</p>
<div class="toggle-content-toggleme">
<p>Added multidex file support for APKs and Jack suppport to address the 64K method reference
limit.</p>
</div>
</div>
<div class="toggle-content closed">
<p><a href="#" onclick="return toggleContent(this)">
<img src="{@docRoot}assets/images/triangle-closed.png" class="toggle-content-img"
alt=""/>Build Tools, Revision 21.0.2</a> <em>(October 2014)</em>
</p>
<div class="toggle-content-toggleme">

2
docs/html/tools/revisions/platforms.jd
View File

@@ -88,7 +88,7 @@ class="toggle-content-img" alt="" />Revision 2</a> <em>(October 2014)</em>
<div class="toggle-content-toggleme">
<p>Added location APIs support for Wear.</p>
<p>Updated the rendering library. </p>
<p>Dependencies:</p>
<ul>