summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBert McMeen <amcmeen@google.com>2016-10-03 21:27:35 +0000
committerandroid-build-merger <android-build-merger@google.com>2016-10-03 21:27:35 +0000
commit1b219d06e397880e65b7af25a000954a3a39567a (patch)
tree4ede4b5244c5d0750359015e3065e82fd0cce8c7
parentffa9656223c974191255dff3960f45e134f97c8c (diff)
parent3264436d18a12fdf8b87ed953afbd5dda70a4904 (diff)
Docs: Wear preview 3 - tweaks to gradle snippet am: 70c6411a10 am: e617192fff
am: 3264436d18 Change-Id: Ic0b0fb016924e61f6361160f620105c66be36d82
-rw-r--r--docs/html/wear/preview/downloads.jd12
-rw-r--r--docs/html/wear/preview/features/app-distribution.jd6
2 files changed, 15 insertions, 3 deletions
diff --git a/docs/html/wear/preview/downloads.jd b/docs/html/wear/preview/downloads.jd
index 83a3f98452c8..da6a06d485c0 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 319efa6b6554..afc95165e49b 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>