misc cleanup to the SDK install steps

Change-Id: I76cb566d20d134b6ba6d63ab5adb689d6bbfc0e5

diff --git a/docs/html/google/play-services/setup.jd b/docs/html/google/play-services/setup.jd
index 049e6fe..4332953 100644 (file)
--- a/docs/html/google/play-services/setup.jd
+++ b/docs/html/google/play-services/setup.jd
@@ -8,7 +8,6 @@ page.title=Setting Up Google Play Services
 
 <h2>In this document</h2>
 <ol>
-  <li><a href="#Install">Install the Google Play Services SDK</a></li>
   <li><a href="#Setup">Add Google Play Services to Your Project</a></li>
   <li><a href="#Proguard">Create a Proguard Exception</a></li>
   <li><a href="#ensure">Ensure Devices Have the Google Play services APK</a></li>

diff --git a/docs/html/sdk/installing/adding-packages.jd b/docs/html/sdk/installing/adding-packages.jd
index f6435f7..e6c0118 100644 (file)
--- a/docs/html/sdk/installing/adding-packages.jd
+++ b/docs/html/sdk/installing/adding-packages.jd
@@ -74,6 +74,11 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
   </li>
 </ul>
 
+<p>When you open the SDK Manager for the first time, several packages will be selected by
+default. Leave these selected, but be sure you have everything you need
+to get started by following these steps:</p>
+
+
 <ol class="large">
 <li>
   <h2 id="GetTools" class="norule">Get the latest SDK tools</h2>
@@ -87,7 +92,7 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
      <ul>
        <li><strong>Android SDK Tools</strong></li>
        <li><strong>Android SDK Platform-tools</strong></li>
-       <li><strong>Android SDK Build-tools</strong></li>
+       <li><strong>Android SDK Build-tools</strong> (highest version)</li>
      </ul>
    </li>
    <li>Open the first Android X.X folder (the latest version) and select:
@@ -97,7 +102,6 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
       <strong>ARM EABI v7a System Image</strong></li>
      </ul>
    </li>
-   <li>Click <strong>Install</strong>.</li>
   </ol>
 </li>
 
@@ -105,8 +109,6 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
   <h2 id="GetSupportLib" class="norule">Get the support library for additional APIs</h2>
 
   <div class="sidebox">
-    <h3>Why use the support library?</h3>
-
     <p>The support library is required for:</p>
     <ul>
       <li><a href="{@docRoot}wear/index.html">Android Wear</a></li>
@@ -114,7 +116,7 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
       <li><a href="{@docRoot}google/play-services/cast.html">Google Cast</a></li>
     </ul>
 
-    <p>The support library also provides these popular APIs:</p>
+    <p>It also provides these popular APIs:</p>
     <ul>
       <li><a href="{@docRoot}reference/android/support/v4/widget/DrawerLayout.html">Navigation
       drawer</a></li>
@@ -127,16 +129,11 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
   <p>The <a href="{@docRoot}tools/support-library/features.html">Android Support Library</a>
   provides an extended set of APIs that are compatible with most versions of Android.</p>
 
-  <p>To download the support library:</p>
-  <ol>
-    <li>Open the <strong>Extras</strong> directory and select:
+  <p>Open the <strong>Extras</strong> directory and select:</p>
      <ul>
        <li><strong>Android Support Repository</strong></li>
        <li><strong>Android Support Library</strong></li>
      </ul>
-    </li>
-    <li>Click <strong>Install</strong>.</li>
-  </ol>
 
   <p>&nbsp;</p>
   <p>&nbsp;</p>
@@ -148,7 +145,6 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
   <h2 id="GetGoogle" class="norule">Get Google Play services for even more APIs</h2>
 
   <div class="sidebox">
-    <h3>Why use Google Play services?</h3>
 
     <p>The Google Play services APIs provide a variety of features and services for your Android
     apps, such as:</p>
@@ -163,15 +159,11 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
   </div>
 
   <p>To develop with Google APIs, you need the Google Play services package:</p>
-  <ol>
-    <li>Open the <strong>Extras</strong> directory and select:
+  <p>Open the <strong>Extras</strong> directory and select:</p>
      <ul>
        <li><strong>Google Repository</strong></li>
        <li><strong>Google Play services</strong></li>
      </ul>
-    </li>
-    <li>Click <strong>Install</strong>.</li>
-  </ol>
 
   <p class="note"><strong>Note:</strong> Google Play services APIs are not available on all
   Android-powered devices, but are available on all devices with Google Play Store. To use these
@@ -180,6 +172,18 @@ style="vertical-align:bottom;margin:0;height:17px" /> in the toolbar.</li>
 </li>
 
 
+<li>
+  <h2 id="Install" class="norule">Install the packages</h2>
+  <p>Once you've selected all the desired packages, continue to install:</p>
+  <ol>
+   <li>Click <strong>Install X packages</strong>.</li>
+   <li>In the next window, double-click each package name on the left
+   to accept the license agreement for each.</li>
+   <li>Click <strong>Install</strong>.</li>
+  </ol>
+  <p>The download progress is shown at the bottom of the SDK Manager window.
+  <strong>Do not exit the SDK Manager</strong> or it will cancel the download.</p>
+</li>
 
 <li>
   <h2 id="Build" class="norule">Build something!</h2>

diff --git a/docs/html/sdk/installing/index.jd b/docs/html/sdk/installing/index.jd
index b6929bd..3671726 100644 (file)
--- a/docs/html/sdk/installing/index.jd
+++ b/docs/html/sdk/installing/index.jd
@@ -108,13 +108,13 @@ style="float:right;font-size:13px"><a href='' onclick='showAll();return false;'
       your JDK folder, for example <code>C:\Program Files\Java\jdk1.7.0_21</code>.</p>
     </p>
     </li>
-
+    
   </ol>
 
 
 <p>The individual tools and
 other SDK packages are saved within the Android Studio application directory.
-To access the tools directly, use a terminal to navigate into the application and locate
+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>
 
@@ -140,7 +140,7 @@ the {@code sdk/} directory. For example:</p>
 
 <p>The individual tools and
 other SDK packages are saved within the Android Studio application directory.
-To access the tools directly, use a terminal to navigate into the application and locate
+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>
 

diff --git a/docs/html/sdk/installing/studio.jd b/docs/html/sdk/installing/studio.jd
index c97afa5..8ac6163 100644 (file)
--- a/docs/html/sdk/installing/studio.jd
+++ b/docs/html/sdk/installing/studio.jd
@@ -339,18 +339,12 @@ td.no {
   </tr>
 
     <tr>
-    <td>APK signing</td>
+    <td>APK signing and keystore management</td>
     <td class="yes">Yes</td>
     <td class="yes">Yes</td>
     </tr>
 
     <tr>
-    <td>Keystore management</td>
-    <td class="no">Coming soon</td>
-    <td class="yes">Yes</td>
-    </tr>
-
-    <tr>
     <td>NDK support</td>
     <td class="no">Coming soon</td>
     <td class="yes">Yes</td>