Merge "No overpraising for AS." into mnc-docs
diff --git a/docs/html/guide/components/bound-services.jd b/docs/html/guide/components/bound-services.jd
index c2ac607..f71ba87 100644
--- a/docs/html/guide/components/bound-services.jd
+++ b/docs/html/guide/components/bound-services.jd
@@ -15,7 +15,11 @@
<li><a href="#Messenger">Using a Messenger</a></li>
</ol>
</li>
- <li><a href="#Binding">Binding to a Service</a></li>
+ <li><a href="#Binding">Binding to a Service</a>
+ <ol>
+ <li><a href="#Additional_Notes">Additional notes</a></li>
+ </ol>
+ </li>
<li><a href="#Lifecycle">Managing the Lifecycle of a Bound Service</a></li>
</ol>
@@ -309,8 +313,11 @@
android.content.ServiceConnection#onServiceConnected onServiceConnected()} callback. The next
section provides more information about this process of binding to the service.</p>
-<p class="note"><strong>Note:</strong> The example above doesn't explicitly unbind from the service,
-but all clients should unbind at an appropriate time (such as when the activity pauses).</p>
+<p class="note"><strong>Note:</strong> In the example above, the
+{@link android.app.Activity#onStop onStop()} method unbinds the client from the service. Clients
+should unbind from services at appropriate times, as discussed in
+<a href="#Additional_Notes">Additional Notes</a>.
+</p>
<p>For more sample code, see the <a
href="{@docRoot}resources/samples/ApiDemos/src/com/example/android/apis/app/LocalService.html">{@code
@@ -538,10 +545,11 @@
the methods defined by the interface.</li>
<li>To disconnect from the service, call {@link
android.content.Context#unbindService unbindService()}.
- <p>When your client is destroyed, it will unbind from the service, but you should always unbind
-when you're done interacting with the service or when your activity pauses so that the service can
-shutdown while its not being used. (Appropriate times to bind and unbind is discussed
-more below.)</p>
+ <p>If your client is still bound to a service when your app destroys the client, destruction
+causes the client to unbind. It is better practice to unbind the client as soon as it is done
+interacting with the service. Doing so allows the idle service to shut down. For more information
+about appropriate times to bind and unbind, see <a href="#Additional_Notes">Additional Notes</a>.
+</p>
</li>
</ol>
@@ -591,7 +599,7 @@
</ul>
-<h3>Additional notes</h3>
+<h3 id="Additional_Notes">Additional notes</h3>
<p>Here are some important notes about binding to a service:</p>
<ul>
diff --git a/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png b/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png
index 99e60e9..06361af 100644
--- a/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png
+++ b/docs/html/images/training/auto-desktop-head-unit-context-menu-enabled.png
Binary files differ
diff --git a/docs/html/images/training/auto-desktop-head-unit-server-running.png b/docs/html/images/training/auto-desktop-head-unit-server-running.png
index 5aa3b83..f8e1f38 100644
--- a/docs/html/images/training/auto-desktop-head-unit-server-running.png
+++ b/docs/html/images/training/auto-desktop-head-unit-server-running.png
Binary files differ
diff --git a/docs/html/tools/help/theme-editor.jd b/docs/html/tools/help/theme-editor.jd
index 653f303..19f765f 100644
--- a/docs/html/tools/help/theme-editor.jd
+++ b/docs/html/tools/help/theme-editor.jd
@@ -104,9 +104,9 @@
follow these steps:
</p>
<ol>
-<li>Click anywhere in the field containing the resource. The <em>Resources</em> dialog
-appears, containing a color picker, material-color palette, and other settings and
-information.</li>
+<li>Click the colored square next to the name of the resource you want to change.
+The <em>Resources</em> dialog appears, containing a color picker, material-color
+palette, and other settings and information.</li>
<li>Change the color, opacity, and name of a theme's resources as desired.</p>
<li>To ensure that your theme uses a color from the material
palette, click <strong>CLOSEST MATERIAL COLOR</strong>, located next to <em>Custom
diff --git a/docs/html/training/auto/start/index.jd b/docs/html/training/auto/start/index.jd
index b9996ca..0206a24 100644
--- a/docs/html/training/auto/start/index.jd
+++ b/docs/html/training/auto/start/index.jd
@@ -220,7 +220,7 @@
<ol>
<li>On the mobile device, enable Android Auto developer mode by starting the Android Auto
- companion app, and then tapping the header image 10 times.
+ companion app, and then tapping the <i>Android Auto</i> toolbar title 10 times.
This step is only required the first time you run the companion app.
</li>
<li>If the server is not already running, select <strong>Start head unit server</strong>
