am 9baaf2ce: am 7459dfed: Merge "docs: add new UX images for notifications and wear" into klp-modular-dev

* commit '9baaf2ce843ec84424e10aa10cb7e367951b9306':
  docs: add new UX images for notifications and wear

7 files changed, 5 insertions, 5 deletions

diff --git a/docs/html/design/media/wear/2d_picker_indicated.png b/docs/html/design/media/wear/2d_picker_indicated.png
index eee5305..a21cc51 100644
--- a/docs/html/design/media/wear/2d_picker_indicated.png
+++ b/docs/html/design/media/wear/2d_picker_indicated.png
diff --git a/docs/html/preview/images/notifications/action_combo.png b/docs/html/preview/images/notifications/action_combo.png
index f7f58a3..5400218 100644
--- a/docs/html/preview/images/notifications/action_combo.png
+++ b/docs/html/preview/images/notifications/action_combo.png
diff --git a/docs/html/preview/images/notifications/basic_combo.png b/docs/html/preview/images/notifications/basic_combo.png
index 03a6005..01a0239 100644
--- a/docs/html/preview/images/notifications/basic_combo.png
+++ b/docs/html/preview/images/notifications/basic_combo.png
diff --git a/docs/html/preview/images/notifications/expandedtext_combo.png b/docs/html/preview/images/notifications/expandedtext_combo.png
index 39b6e32..1a54033 100644
--- a/docs/html/preview/images/notifications/expandedtext_combo.png
+++ b/docs/html/preview/images/notifications/expandedtext_combo.png
diff --git a/docs/html/preview/images/notifications/stack_combo.png b/docs/html/preview/images/notifications/stack_combo.png
index be4693d..ad22926 100644
--- a/docs/html/preview/images/notifications/stack_combo.png
+++ b/docs/html/preview/images/notifications/stack_combo.png
diff --git a/docs/html/preview/notifications.jd b/docs/html/preview/notifications.jd
index 7f591e9..375fad9 100644
--- a/docs/html/preview/notifications.jd
+++ b/docs/html/preview/notifications.jd
@@ -79,9 +79,9 @@ pinch-zoom or perform a single-finger glide in order to toggle between compact a
  image) for you to re-use in your application. The following images show you how they look on
  handhelds and wearables.</p>
 
-<img style="margin-top:50px" src="{@docRoot}preview/images/notifications/expandedtext_combo.png"
+<img style="margin-top:30px" src="{@docRoot}preview/images/notifications/expandedtext_combo.png"
   alt="" width="700px" height;="284px" />
-<img style="margin-top:50px" src="{@docRoot}preview/images/notifications/stack_combo.png"
+<img style="margin-top:30px" src="{@docRoot}preview/images/notifications/stack_combo.png"
   alt="" width="700px" height;="284px" />
 <img style="margin-top:30px" src="{@docRoot}preview/images/notifications/ExpandedImage.png"
     alt="" width="311px" height;="450px" />
diff --git a/docs/html/training/wearables/apps/layouts.jd b/docs/html/training/wearables/apps/layouts.jd
index 4bf9cde..cdd7d12 100644
--- a/docs/html/training/wearables/apps/layouts.jd
+++ b/docs/html/training/wearables/apps/layouts.jd
@@ -84,9 +84,9 @@ PendingIntent notificationPendingIntent = PendingIntent.getActivity(this, 0, not
   </li>
   <li>Issue the notification using the
   {@link android.app.NotificationManager#notify notify()} method.
-  <p class="note"><b>Note:</b> The system initially displays your notification with
-  a standard template. This template works well on all watchfaces. When users swipe the notification
-  up to view it, they'll then see your activity for the notification.</p>
+  <p class="note"><b>Note:</b> When the notification is peeking on the homescreen, the system
+  displays it with a standard template that it generates from the notification's semantic data. This template works well on all watchfaces. When users swipe the notification up, they'll then see the
+  custom activity for the notification.</p>
   </li>
 </ol>
 <h2 id="UiLibrary">Create Layouts with the Wearable UI Library</h2>