Merge "docs:studio-updates-814v2" into lmp-docs (ea17fdec) · Commits · e / os / android_frameworks_base

docs/html/sdk/installing/studio.jd

+34 −29

Original line number	Diff line number	Diff line
		@@ -194,12 +194,14 @@ 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 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>

		<p style="margin-bottom:8px">This installation 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>

		</div>
		</div>

		@@ -249,8 +251,7 @@ download (or continue to use)
		<td>Windows</td>
		<td>
		<a onclick="return onDownload(this)" id="win-studio"
		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
		href="https://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>177343814 bytes</td>
		@@ -261,7 +262,7 @@ download (or continue to use)
		<td><nobr>Mac OS X</nobr></td>
		<td>
		<a onclick="return onDownload(this)" id="mac-studio"
		href="http://dl.google.com/dl/android/studio/ide-zips/0.8.14/android-studio-ide-135.1538390-mac.zip">
		href="https://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>
		@@ -273,8 +274,7 @@ download (or continue to use)
		<td>Linux</td>
		<td>
		<a onclick="return onDownload(this)" id="linux-studio"
		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
		href="https://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>176358193 bytes</td>
		@@ -299,38 +299,43 @@ download (or continue to use)
		<tr>
		<td>
		<ul>
		<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>Microsoft Windows 8/7/Vista/2003 (32 or 64 bit)</li>
		<li>2 GB RAM minimum, 4 GB RAM recommended</li>
		<li>400 MB disk space </li>
		<li>At least 1 GB for Android SDK, emulator system images, and caches</li>
		<li>1280x800 minimum screen resolution</li>
		<li>Java Development Kit (JDK) 7 or higher</li>
		<li>(Optional for accelerated emulator: Intel processor with support for Intel VT-x, Intel
		EM64T (Intel 64), and Execute Disable (XD) Bit functionality)</li>
		</ul>
		</td>
		<td>
		<ul>
		<li>Mac OS X 10.8.5 or higher, up to 10.9 (Mavericks)</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>2 GB RAM minimum, 4 GB RAM recommended</li>
		<li>400 MB disk space</li>
		<li>At least 1 GB for 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) 7 or higher</li>
		<li>Java Runtime Environment (JRE) 6</li>
		<li>Java Development Kit (JDK) 7 or higher
		<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) JDK 7.</p></li>
		<li>(Optional for accelerated emulator: Intel processor with support for Intel VT-x, Intel
		EM64T (Intel 64), and Execute Disable (XD) Bit functionality)</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) JDK 7.</p>

		</td>
		<td>
		<ul>
		<li>64-bit distribution capable of running 32-bit applications</li>
		<li>GNOME or KDE desktop.</li>
		<li>Tested on Ubuntu 12.04, Precise Pangolin (64-bit distribution capable of running 32-bit
		applications)</li>
		<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>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>2 GB RAM minimum, 4 GB RAM recommended</li>
		<li>400 MB disk space</li>
		<li>At least 1 GB for Android SDK, emulator system images, and caches</li>
		<li>1280x800 minimum screen resolution</li>
		<li>Oracle Java Development Kit (JDK) 7 or higher</li>
		<li>Java Development Kit (JDK) 7 or higher</li>
		</ul>
		</td>
		</tr>
		@@ -659,7 +664,7 @@ for possible resolutions to known issues: <a href="http://tools.android.com/know
		/* set up primary ACE download button */
		$('#download-ide-button').show();
		$('#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>");
		+ "<br/> <span class='small'>with the Android SDK for " + os + "</span>");
		$('#download-ide-button').click(function() {return onDownload(this,true);}).attr('href', bundlename);

		} else {