summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Scott Main <smain@google.com> 2014-03-25 20:15:46 +0000
committer Android Git Automerger <android-git-automerger@android.com> 2014-03-25 20:15:46 +0000
commit1cf8117aa22c5ef16c5513fd1c6d428233df4833 (patch)
treed34ac38183dcb4b25b1f21422279ce4ad34ca53f
parent4f61f6d4bbd24fe1802d8aa81e1c32e57fbbbd78 (diff)
parentdc18ce783fa10466d15ec74be38d38555c4750c6 (diff)
am dc18ce78: am 78373edb: am 837a4885: fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
* commit 'dc18ce783fa10466d15ec74be38d38555c4750c6': fix links and add note that adb forward must be repeated bug: 13474515 bug: 13576843
-rw-r--r--docs/html/wear/notifications/creating.html8
-rw-r--r--docs/html/wear/preview/start.html5
2 files changed, 8 insertions, 5 deletions
diff --git a/docs/html/wear/notifications/creating.html b/docs/html/wear/notifications/creating.html
index e83b57a5c5e3..5022c75a29e5 100644
--- a/docs/html/wear/notifications/creating.html
+++ b/docs/html/wear/notifications/creating.html
@@ -572,9 +572,9 @@ for users to deliver your app a text response using voice input.</p>
<p>To use these new APIs, pass your instance of
<code><a href="/reference/android/support/v4/app/NotificationCompat.Builder.html">NotificationCompat.Builder</a></code> to the
- <a href="/reference/android/preview/support/notifications/WearableNotifications.html"> <code>WearableNotifications.Builder()</code></a> constructor. You can then add new
+ <a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Builder.html#WearableNotifications.Builder(android.content.Context)"> <code>WearableNotifications.Builder()</code></a> constructor. You can then add new
features to your notification using the
- <a href="/wear/reference/android/preview/support/wearable/notifications/WearableNotifications.Builder.html"
+ <a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Builder.html"
><code>WearableNotifications.Builder</code></a> methods. For example:</p>
<pre>
@@ -592,10 +592,10 @@ Notification notification =
.build();
</pre>
-<p>The <a href="/reference/android/preview/support/notifications/WearableNotifications.Builder.html#setBigActionIcon(int)">
+<p>The <a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Builder.html#setBigActionIcon(int)">
<code>setHintHideIcon()</code></a> method removes your app icon from the notification card.
This method is just one example of new notification features available from the
- <a href="/wear/reference/android/preview/support/wearable/notifications/WearableNotifications.Builder.html"
+ <a href="/reference/android/preview/support/wearable/notifications/WearableNotifications.Builder.html"
><code>WearableNotifications.Builder</code></a> class.</p>
<p>When you want to deliver your notifications, be certain to always use the
diff --git a/docs/html/wear/preview/start.html b/docs/html/wear/preview/start.html
index 4aec648c3941..b1861f5f36ba 100644
--- a/docs/html/wear/preview/start.html
+++ b/docs/html/wear/preview/start.html
@@ -558,7 +558,10 @@ Gmail or Google account you use with Google Play Store.</p>
The emulator should show the time and an icon that indicates no device is connected.</li>
<li>Open a command line terminal, navigate to your Android SDK's <code>platform-tools/</code>
directory, then execute:
-<pre style="margin-top:.5em">adb -d forward tcp:5601 tcp:5601</pre></li>
+<pre style="margin-top:.5em">adb -d forward tcp:5601 tcp:5601</pre>
+<p class="note"><strong>Note:</strong> You must execute this command each time you connect your
+device over USB.</p>
+</li>
<li>Return to the Android Wear Preview app. It should now indicate that it is connected to
the emulator. The Android Wear emulator should now show the 'g' orb icon, indicating
that is is connected to your device.