Merge "Update preview-community redirect to point at +AD." into nyc-dev
diff --git a/core/java/android/app/IntentService.java b/core/java/android/app/IntentService.java
index f33af39..e4a22c4 100644
--- a/core/java/android/app/IntentService.java
+++ b/core/java/android/app/IntentService.java
@@ -46,7 +46,8 @@
* <div class="special reference">
* <h3>Developer Guides</h3>
* <p>For a detailed discussion about how to create services, read the
- * <a href="{@docRoot}guide/topics/fundamentals/services.html">Services</a> developer guide.</p>
+ * <a href="{@docRoot}guide/components/services.html">Services</a> developer
+ * guide.</p>
* </div>
*
* @see android.os.AsyncTask
diff --git a/docs/html/_redirects.yaml b/docs/html/_redirects.yaml
index 1f3520e..7200d47 100644
--- a/docs/html/_redirects.yaml
+++ b/docs/html/_redirects.yaml
@@ -1290,6 +1290,8 @@
to: /studio/write/draw9patch.html?utm_source=android-studio
- from: /r/studio-ui/firebase-assistant.html
to: /studio/write/firebase.html?utm_source=android-studio
+- from: /r/studio-ui/ir-flight-recorder.html
+ to: /studio/run/index.html?utm_source=android-studio#submit-feedback
# Redirects from (removed) N Preview documentation
- from: /preview/features/afw.html
diff --git a/docs/html/wear/preview/downloads.jd b/docs/html/wear/preview/downloads.jd
index 83a3f98..da6a06d 100644
--- a/docs/html/wear/preview/downloads.jd
+++ b/docs/html/wear/preview/downloads.jd
@@ -653,6 +653,12 @@
"{@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 @@
</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 @@
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 319efa6..afc9516 100644
--- a/docs/html/wear/preview/features/app-distribution.jd
+++ b/docs/html/wear/preview/features/app-distribution.jd
@@ -132,6 +132,9 @@
<pre>
android {
+ // Allows you to reference product flavors in your
+ // phone module's build.gradle file
+ publishNonDefault true
...
defaultConfig
{
@@ -148,6 +151,7 @@
minSdkVersion 24
}
}
+}
</pre>
<p>
@@ -158,7 +162,7 @@
<pre>
dependencies {
...
- wearApp project(path: ':wearable', configuration: 'wear1Release')
+ wearApp project(path: ':wear', configuration: 'wear1Release')
}
</pre>