Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d6d52575 authored by sreevanis's avatar sreevanis Committed by android-build-merger
Browse files

Merge "Build JobStatus objects outside the lock" into nyc-dev am: 87ad1fce am: c854e70a 

am: a97bf418

* commit 'a97bf418':
  Updated image sizes and wrapped text around images.

Change-Id: I10dd7c4de37b934ad71225f70c3820c1b403fb7e
parents a190e12f a97bf418

docs/html/wear/preview/api-overview.jd

+1 −1
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ see <a href="{@docRoot}wear/preview/features/complications.html"> 
<p> If you have a chat messaging app, your notifications should use

{@code Notification.MessagingStyle}, which is new in Android 6.0. Wear 2.0 uses

the chat messages included in a

<a href="{docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a>

<a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a>

 notification

(see {@code addMessage()}) to provide a rich chat app-like experience in the

expanded notification.

docs/html/wear/preview/features/notifications.jd

+27 −21
Original line number Diff line number Diff line
@@ -87,8 +87,9 @@ material design</a> visual changes. 
 <a href="http://www.google.com/design/spec-wear">Material Design for Android Wear</a>,

  so the user gets an app-like experience.

</p>

<p><img src="{@docRoot}wear/preview/images/expanded_diagram.png" /> </p>

<p><b>Figure 2</b>. An expanded notification with content and actions.</p>





<h3 id="expanded">Expanded notifications</h3>

<p>If the first action in the expanded notification has a

<a href=" {@docRoot}reference/android/support/v4/app/RemoteInput.html">{@code RemoteInput}</a>

  (e.g., a Reply action), then the choices you set with <a href="http://developer.android.com/reference/android/support/v4/app/RemoteInput.Builder.html#setChoices(java.lang.CharSequence[])">{@code setChoices()}</a>
@@ -129,6 +130,8 @@ material design</a> visual changes. 
    will provide; however be judicious with the amount of detail you include in a

    notification.

</p>

<img src="{@docRoot}wear/preview/images/expanded_diagram.png" height="340"

  style="float:left;margin:10px 20px 0 0" />

<h4>Adding additional content</h4>

To show additional content in your expanded notification, see <a href="{@docRoot}training/wearables/notifications/pages.html">Adding Pages to a Notification</a>.</p>

<p>Additional content pages are stacked vertically in the expanded notification
@@ -151,19 +154,25 @@ action in the notification unless a different action is specified using 


<p>If you have a chat messaging app, your notifications should use

<a href="{@docRoot}preview/features/notification-updates.html#style">{@code Notification.MessagingStyle}</a>,

 which is new in Android 6.0. Wear 2.0 uses the chat messages included

 which is new in Android N. Wear 2.0 uses the chat messages included

  in a <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notification 



  (see <a href="{@docRoot}preview/features/notification-updates.html#style">{@code addMessage()}</a>) to provide

  a rich chat app-like experience in the expanded notification.

</p>



<p class="note">Note: <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a>

expanded notifications require that you have at least version 1.5.0.2861804 of the

  <a href="https://play.google.com/store/apps/details?id=com.google.android.wearable.app">Android Wear app</a>

  on your paired Android phone. That version will be available within the next

  few weeks in the Play Store.

</p>



<h3 id="smart-reply">Smart Reply</h3>

<p>Wear 2.0 also introduces <i>Smart Reply</i> for <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notifications.

<img src="{@docRoot}wear/preview/images/messaging_style.png" height="420"

  style="float:right;margin:10px 20px 0 0" />

<p>Wear 2.0 also introduces <i>Smart Reply</i>

for <a href="{@docRoot}preview/features/notification-updates.html#style">{@code MessagingStyle}</a> notifications.

  Smart Reply provides the user with contextually relevant, touchable choices in

  the expanded notification and in {@code RemoteInput}. These augment the fixed

  list of choices that the developer provides in
@@ -175,10 +184,6 @@ expanded notifications require that you have at least version 1.5.0.2861804 of t 
  you provide users with a fast (single tap), discreet (no speaking aloud), and

  reliable way to respond to chat messages.

</p>

<p><img src="{@docRoot}wear/preview/images/messaging_style.png" /></p>

<p><b>Figure 3</b>. The expanded notification includes contextually relevant

  Smart Reply responses below the primary action.

</p>



<p>Responses generated by Smart Reply are shown in addition to those set using the

  <a href="{@docRoot}reference/android/support/v4/app/RemoteInput.Builder.html#setChoices(java.lang.CharSequence[])">{@code setChoices()}</a> method.
@@ -222,7 +227,8 @@ Notification noti = new NotificationCompat.Builder() 
 .setSmallIcon(R.drawable.new_message)

 .setLargeIcon(aBitmap)

 // 2) set the style to MessagingStyle

 .setStyle(new NotificationCompat.MessagingStyle(resources.getString(R.string.reply_name)).addMessage(messages[0].getText(), messages[0].getTime(), messages[0].getSender())

 .setStyle(new NotificationCompat.MessagingStyle(resources.getString(R.string.reply_name))

 .addMessage(messages[0].getText(), messages[0].getTime(), messages[0].getSender())

 .addMessage(messages[1].getText(), messages[1].getTime(), messages[1].getSender()))

docs/html/wear/preview/images/comparison_diagram.png

+13.1 KiB (104 KiB)
Loading image diff...

docs/html/wear/preview/images/messaging_style.png

−55.7 KiB (48.4 KiB)
Loading image diff...

docs/html/wear/preview/images/messaging_style_diagram.png

deleted100644 → 0
−69.3 KiB
Loading image diff...