Merge "Docs: Minor fixes to Background Optimizations and Doze docs" into mnc-mr-docs
diff --git a/docs/html/develop/index.jd b/docs/html/develop/index.jd
index 49235ae..de38f3d 100644
--- a/docs/html/develop/index.jd
+++ b/docs/html/develop/index.jd
@@ -19,10 +19,14 @@
frameborder="0" allowfullscreen=""
style="float: right;"></iframe>
-->
+ <a href="{@docRoot}sdk/index.html">
<img class="dac-hero-image" src="{@docRoot}images/tools/studio/studio-feature-instant-run_2x.png" />
+ </a>
</div>
<div class="col-1of2 col-pull-1of2">
- <h1 class="dac-hero-title">Android Studio 2.0,<br>now available!</h1>
+ <h1 class="dac-hero-title">
+ <a style="color:inherit" href="{@docRoot}sdk/index.html">
+ Android Studio 2.0,<br>now available!</a></h1>
<p class="dac-hero-description">
The latest version of Android Studio is the biggest update yet.
It includes new features like <strong>Instant Run</strong>, which
diff --git a/docs/html/images/training/ctl-config.png b/docs/html/images/training/ctl-config.png
new file mode 100644
index 0000000..611f9d7
--- /dev/null
+++ b/docs/html/images/training/ctl-config.png
Binary files differ
diff --git a/docs/html/jd_collections.js b/docs/html/jd_collections.js
index 863d235..3decdf0 100644
--- a/docs/html/jd_collections.js
+++ b/docs/html/jd_collections.js
@@ -1782,7 +1782,7 @@
"title": "",
"resources": [
"https://medium.com/google-developers/how-often-should-you-update-android-studio-db25785c488e#.8blbql35x",
- "http://android-developers.blogspot.com/2016/02/android-studio-20-beta.html",
+ "http://android-developers.blogspot.com/2016/04/android-studio-2-0.html",
"https://medium.com/google-developers/writing-more-code-by-writing-less-code-with-android-studio-live-templates-244f648d17c7#.hczcm02du",
]
},
diff --git a/docs/html/sdk/index.jd b/docs/html/sdk/index.jd
index 923a6d7..e95d6c8 100644
--- a/docs/html/sdk/index.jd
+++ b/docs/html/sdk/index.jd
@@ -486,8 +486,9 @@
<ul>
<li>Microsoft® Windows® 7/8/10 (32 or 64-bit)</li>
<li>2 GB RAM minimum, 8 GB RAM recommended</li>
-<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
-Android SDK and emulator system image). 4 GB Recommended.</li>
+<li>2 GB of available disk space minimum,<br>4 GB Recommended
+(500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image)</li>
<li>1280 x 800 minimum screen resolution</li>
<li>Java Development Kit (JDK) 8</li>
<li>Optional for accelerated emulator: Intel® processor with support for Intel®
@@ -500,8 +501,9 @@
<ul>
<li>Mac® OS X® 10.8.5 or higher, up to 10.11.4 (El Capitan)</li>
<li>2 GB RAM minimum, 8 GB RAM recommended</li>
-<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
-Android SDK and emulator system image). 4 GB Recommended.</li>
+<li>2 GB of available disk space minimum,<br>4 GB Recommended
+(500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image)</li>
<li>1280 x 800 minimum screen resolution</li>
<li>Java Development Kit (JDK) 6</li>
</ul>
@@ -515,8 +517,9 @@
capable of running 32-bit applications)</i></li>
<li>GNU C Library (glibc) 2.11 or later</li>
<li>2 GB RAM minimum, 8 GB RAM recommended</li>
-<li>2 GB of available disk space minimum (500 MB for IDE + 1.5 GB for
-Android SDK and emulator system image). 4 GB Recommended.</li>
+<li>2 GB of available disk space minimum,<br>4 GB Recommended
+(500 MB for IDE + 1.5 GB for
+Android SDK and emulator system image)</li>
<li>1280 x 800 minimum screen resolution</li>
<li>Java Development Kit (JDK) 8</li>
</ul>
diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index f776c9a..e4d860b 100644
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -5,21 +5,29 @@
@jd:body
+<style>
+.instruction-select {
+ float:right;
+ background: #f7f7f7;
+ padding: 15px;
+ margin: -15px 0 20px 40px;
+}
+</style>
-<div style="float:right;margin:0 0 20px 20px;border:1px solid #ccc;padding:10px">
+<div class="instruction-select">
<p><strong>Instructions for</strong></p>
<select id="instructions-option" onchange="showInstructions(this.value)" style="padding:4px">
<option value="windows">Windows</option>
<option value="mac">Mac</option>
<option value="linux">Linux</option>
-</select>
+</select>
</div>
<p>Setting up Android Studio takes just a few clicks.</p>
<p>While the <a href="{@docRoot}sdk/index.html">Android Studio download</a>
-completes, make sure you have JDK 8 or higher installed. To check which version
-you have, open a command line and type <code>javac -version</code>. If the JDK
+completes, verify which version of the JDK you have:
+open a command line and type <code>javac -version</code>. If the JDK
is not available or the version is lower than 1.8, download the <a href=
"http://www.oracle.com/technetwork/java/javase/downloads/jdk8-downloads-2133151.html"
class="external-link">Java SE Development Kit 8</a>.</p>
@@ -38,7 +46,7 @@
<p>Select <strong>Start menu > Computer > System Properties >
Advanced System Properties</strong>. Then open <strong>Advanced tab > Environment
Variables</strong> and add a new system variable <code>JAVA_HOME</code> that points to
- your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p>
+ your JDK folder, for example <code>C:\Program Files\Java\jdk1.8.0_77</code>.</p>
</p>
</li>
</ol>
@@ -50,8 +58,8 @@
<source src="https://storage.googleapis.com/androiddevelopers/videos/studio-install-windows.mp4" type="video/mp4">
</video>
-<p>As new tools and other APIs become available, Android Studio will tell you
-with a pop-up, or you can check yourself by clicking <strong>Help >
+<p>As new tools and other APIs become available, Android Studio tells you
+with a pop-up, or you can check for updates by clicking <strong>Help >
Check for Update</strong>.</p>
@@ -64,6 +72,10 @@
<div id="system-mac" style="display:none">
+<p>There are, however, known stability issues in Android Studio on Mac
+when using JDK 1.8. Until these issues are resolved, you can improve stability
+by downgrading your JDK to an older version (but no lower than JDK 1.6).</p>
+
<p>To install Android Studio on your Mac, proceed as follows:</p>
<ol>
@@ -72,9 +84,8 @@
Android Studio.</li>
<li>Select whether you want to import previous Android Studio settings,
then click <strong>OK</strong>.</li>
- <li>The Android Studio Setup Wizard will guide you though the rest of the
- setup procedures in just a few clicks,
- which includes downloading various Android SDK components
+ <li>The Android Studio Setup Wizard guides you though the rest of the
+ setup, which includes downloading Android SDK components
that are required for development.</li>
</ol>
@@ -86,9 +97,9 @@
</video>
<p>
-As new tools and other APIs become available, Android Studio will tell you
-with a pop-up, or you can check yourself by clicking <strong>Android Studio >
-Check for Updates</strong>.</p>
+As new tools and other APIs become available, Android Studio tells you
+with a pop-up, or you can check for updates by clicking <strong>Android Studio
+> Check for Updates</strong>.</p>
</div>
<!-- end mac -->
@@ -116,13 +127,21 @@
</li>
<li>Select whether you want to import previous Android Studio settings
or not, then click <strong>OK</strong>.</li>
- <li>The Android Studio Setup Wizard will guide you though the rest of the
- setup procedures in just a few clicks,
- which includes downloading various Android SDK components
+ <li>The Android Studio Setup Wizard guides you though the rest of the
+ setup, which includes downloading Android SDK components
that are required for development.</li>
</li>
</ol>
+<div class="note">
+<p><strong>Note:</strong>
+If you are running a 64-bit version of Ubuntu, you need to install some 32-bit
+libraries with the following command:</p>
+<pre>sudo apt-get install lib32z1 lib32ncurses5 lib32bz2-1.0 lib32stdc++6</pre>
+<p>If you are running 64-bit Fedora, the command is:</p>
+<pre>sudo yum install zlib.i686 ncurses-libs.i686 bzip2-libs.i686</pre>
+</div>
+
<p>That's it!
The following video shows each step of the recommended setup procedure.</p>
@@ -130,16 +149,16 @@
<source src="https://storage.googleapis.com/androiddevelopers/videos/studio-install-linux.mp4" type="video/mp4">
</video>
-<p>As new tools and other APIs become available, Android Studio will tell you
-with a pop-up, or you can check yourself by clicking <strong>Help >
+<p>As new tools and other APIs become available, Android Studio tells you
+with a pop-up, or you can check for updates by clicking <strong>Help >
Check for Update</strong>.</p>
- <p class="note"><strong>Note:</strong> To support 32-bit apps
- on a 64-bit machine, you will need to install the ia32-libs,
- lib32ncurses5-dev, and lib32stdc++6 packages.</p>
-
</div><!-- end linux -->
+<p class="note"><strong>Note:</strong>
+If you want to develop apps with the N Preview SDK, you must use
+the preview version of Android Studio 2.1. For more information, see the
+<a href="{@docRoot}preview/setup-sdk.html">N Preview setup guide</a>.</p>
diff --git a/docs/html/tools/devices/emulator.jd b/docs/html/tools/devices/emulator.jd
index d9a38f7..319286e 100644
--- a/docs/html/tools/devices/emulator.jd
+++ b/docs/html/tools/devices/emulator.jd
@@ -94,21 +94,6 @@
For more information, see
<a href="{@docRoot}tools/devices/index.html">Managing Virtual Devices</a>.</p>
-<h3 id="manifest">Manifest settings</h3>
-
-<p>For your app to use certain emulator device features, you need to specify
-in the manifest that your app will use them. For example, an Android Wear watch
-requires the following <code><uses-feature></code> setting:</p>
-
-<pre>
-<uses-feature android:name="android.hardware.type.watch" />
-</pre>
-
-<p>There are also settings for camera, location, audio, microphone, phone,
-networking, TV, touchscreen, and more. For more information, see
-<a href="{@docRoot}guide/topics/manifest/uses-feature-element.html">
-<uses-feature></a>.</p>
-
<h3 id="system">System images</h3>
<p>The Android Emulator runs a full
diff --git a/docs/html/training/testing/start/index.jd b/docs/html/training/testing/start/index.jd
index 74617b0..bc87194 100644
--- a/docs/html/training/testing/start/index.jd
+++ b/docs/html/training/testing/start/index.jd
@@ -479,38 +479,40 @@
</li>
</ol>
+<img src="{@docRoot}images/training/ctl-config.png" alt="">
+<p class="img-caption">
+ <strong>Figure 1.</strong> Creating a test configuration for Cloud Test
+ Lab.
+</p>
+
<h4 id="ctl-results">
Analyzing test results
</h4>
<p>
When Cloud Test Lab completes running your tests, the <em>Run</em> window will
- open to show the results, as shown in figure 1. You may need to click
+ open to show the results, as shown in figure 2. You may need to click
<strong>Show Passed</strong> <img src="{@docRoot}images/tools/as-ok.png" alt=
"" style="vertical-align:bottom;margin:0;"> to see all your executed tests.
</p>
-<p>
- <img src="{@docRoot}images/training/ctl-test-results.png" alt="">
-</p>
+<img src="{@docRoot}images/training/ctl-test-results.png" alt="">
<p class="img-caption">
- <strong>Figure 1.</strong> Viewing the results of instrumented tests using
+ <strong>Figure 2.</strong> Viewing the results of instrumented tests using
Cloud Test Lab.
</p>
<p>
You can also analyze your tests on the web by following the link displayed at
the beginning of the test execution log in the <em>Run</em> window, as shown
- in figure 2.
+ in figure 3.
</p>
-<p>
- <img src="{@docRoot}images/training/ctl-exec-log.png" alt="">
-</p>
+<img src="{@docRoot}images/training/ctl-exec-log.png" alt="">
<p class="img-caption">
- <strong>Figure 2.</strong> Click the link to view detailed test results on
+ <strong>Figure 3.</strong> Click the link to view detailed test results on
the web.
</p>
