From 70c6411a10340694baa310aff2191cdfa98dfaff Mon Sep 17 00:00:00 2001
From: Bert McMeen <amcmeen@google.com>
Date: Mon, 3 Oct 2016 13:32:54 -0700
Subject: [PATCH] Docs: Wear preview 3 - tweaks to gradle snippet

Bug: 31910705
Change-Id: Ia58ac7bec8e748a797c6213bbd31a05f876e2424
---
 docs/html/wear/preview/downloads.jd                 | 12 ++++++++++--
 docs/html/wear/preview/features/app-distribution.jd |  6 +++++-
 2 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/docs/html/wear/preview/downloads.jd b/docs/html/wear/preview/downloads.jd
index 83a3f98452c89..da6a06d485c0c 100644
--- a/docs/html/wear/preview/downloads.jd
+++ b/docs/html/wear/preview/downloads.jd
@@ -653,6 +653,12 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement
       "{@docRoot}studio/intro/update.html#sdk-manager">SDK Manager</a>.
     </p>
 
+    <p>
+      After you create a virtual device as described below, follow the steps for
+      <a href="#set_up_a_phone">setting up a phone</a> with the beta version of
+      the Android Wear companion app.
+    </p>
+
     <p>Create a new virtual device in Android Studio as follows:
     </p>
 
@@ -696,7 +702,9 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement
     </p>
 
     <ol>
-      <li>On the phone, install the Android Wear app from Google Play.
+      <li>Follow the steps for
+      <a href="#set_up_a_phone">setting up a phone</a> with the beta version of
+      the Android Wear companion app.
       </li>
 
       <li>On the phone, enable Developer Options and USB Debugging.
@@ -740,7 +748,7 @@ This is the Android Wear SDK Preview License Agreement (the “License Agreement
       in the <a href=
       "{@docRoot}tools/devices/emulator.html">Android Emulator</a>. For more
       information about using virtual devices, see <a href=
-      "{@docRoot}tools/devices/managing-avds.html">
+      "{@docRoot}studio/run/managing-avds.html">
       Create and Manage Virtual Devices</a>.
     </p>
 
diff --git a/docs/html/wear/preview/features/app-distribution.jd b/docs/html/wear/preview/features/app-distribution.jd
index 319efa6b65545..afc95165e49b7 100644
--- a/docs/html/wear/preview/features/app-distribution.jd
+++ b/docs/html/wear/preview/features/app-distribution.jd
@@ -132,6 +132,9 @@ page.image=images/cards/card-n-sdk_2x.png
 
 <pre>
 android {
+    // Allows you to reference product flavors in your
+    // phone module's build.gradle file
+    publishNonDefault true
     ...
     defaultConfig
     {
@@ -148,6 +151,7 @@ android {
             minSdkVersion 24
         }
     }
+}
 </pre>
 
     <p>
@@ -158,7 +162,7 @@ android {
 <pre>
 dependencies {
     ...
-    wearApp project(path: ':wearable', configuration: 'wear1Release')
+    wearApp project(path: ':wear', configuration: 'wear1Release')
 }
 </pre>