Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit '7459dfed6c4353a9437f5c5fbbbc1738f465a432':
  docs: add new UX images for notifications and wear
This commit is contained in:
Robert Ly
2014-07-01 02:52:30 +00:00
committed by Android Git Automerger
parent 62395c9379 7459dfed6c
commit 9baaf2ce84
7 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

BIN
docs/html/design/media/wear/2d_picker_indicated.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 110 KiB

After

Width:  |  Height:  |  Size: 46 KiB

BIN
docs/html/preview/images/notifications/action_combo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 126 KiB

After

Width:  |  Height:  |  Size: 127 KiB

BIN
docs/html/preview/images/notifications/basic_combo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 194 KiB

After

Width:  |  Height:  |  Size: 196 KiB

BIN
docs/html/preview/images/notifications/expandedtext_combo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 251 KiB

After

Width:  |  Height:  |  Size: 248 KiB

BIN
docs/html/preview/images/notifications/stack_combo.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 210 KiB

After

Width:  |  Height:  |  Size: 210 KiB

4
docs/html/preview/notifications.jd
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 image) for you to re-use in your application. The following images show you how they look on
handhelds and wearables.</p> 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" /> 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" /> alt="" width="700px" height;="284px" />
<img style="margin-top:30px" src="{@docRoot}preview/images/notifications/ExpandedImage.png" <img style="margin-top:30px" src="{@docRoot}preview/images/notifications/ExpandedImage.png"
alt="" width="311px" height;="450px" /> alt="" width="311px" height;="450px" />

6
docs/html/training/wearables/apps/layouts.jd
View File

@@ -84,9 +84,9 @@ PendingIntent notificationPendingIntent = PendingIntent.getActivity(this, 0, not
</li> </li>
<li>Issue the notification using the <li>Issue the notification using the
{@link android.app.NotificationManager#notify notify()} method. {@link android.app.NotificationManager#notify notify()} method.
<p class="note"><b>Note:</b> The system initially displays your notification with <p class="note"><b>Note:</b> When the notification is peeking on the homescreen, the system
a standard template. This template works well on all watchfaces. When users swipe the notification 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
up to view it, they'll then see your activity for the notification.</p> custom activity for the notification.</p>
</li> </li>
</ol> </ol>
<h2 id="UiLibrary">Create Layouts with the Wearable UI Library</h2> <h2 id="UiLibrary">Create Layouts with the Wearable UI Library</h2>