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
This commit is contained in:
Robert Ly
2014-07-01 02:57:11 +00:00
committed by Android Git Automerger
7 changed files with 5 additions and 5 deletions

Binary file not shown.

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 46 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 127 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 196 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 251 KiB

After

Width:  |  Height:  |  Size: 248 KiB

Binary file not shown.

Before

Width:  |  Height:  |  Size: 210 KiB

After

Width:  |  Height:  |  Size: 210 KiB

View File

@@ -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" />

View File

@@ -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>