summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Main <smain@google.com>2014-03-25 10:39:28 -0700
committerScott Main <smain@google.com>2014-03-25 10:46:37 -0700
commit837a4885978dd29cda4b8309051284af5a45f41c (patch)
tree7a16641a22b4860d2f6cad6cb98e8af6c24f9419
parent52f449fd5a999aea77fa8df3628af7845d0cfcef (diff)
downloadframeworks_base-837a4885978dd29cda4b8309051284af5a45f41c.zip
frameworks_base-837a4885978dd29cda4b8309051284af5a45f41c.tar.gz
frameworks_base-837a4885978dd29cda4b8309051284af5a45f41c.tar.bz2
fix links and add note that adb forward must be repeated
bug: 13474515 bug: 13576843 Change-Id: I808efb5fa1fae2280b4447ad0278ea1d4428b5b6
-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 e83b57a..5022c75 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 4aec648..b1861f5 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.