summaryrefslogtreecommitdiff
path: root/docs/html
diff options
context:
space:
mode:
author Andrew Solovay <asolovay@google.com> 2016-03-09 19:04:39 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2016-03-09 19:04:41 +0000
commit431c8235584f3255c26e62e7cbf0e10508b55bbc (patch)
tree7cc3af2cddbe2426067fa2119df7b0cdbcd08224 /docs/html
parentcf826a8f5844e6d11c9c563d56c2184649220181 (diff)
parent404c1bf6cc39da5f9347f3eb4d98e58d368273f2 (diff)
Merge "docs: Quick fix to remove movie name from Notifications pix" into mnc-mr-docs
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/preview/features/notification-updates.jd14
-rw-r--r--docs/html/preview/images/inline-reply-sent.pngbin99260 -> 0 bytes
-rw-r--r--docs/html/preview/images/inline-reply.pngbin18677 -> 28843 bytes
-rw-r--r--docs/html/preview/images/inline-reply_2x.pngbin0 -> 68982 bytes
4 files changed, 5 insertions, 9 deletions
diff --git a/docs/html/preview/features/notification-updates.jd b/docs/html/preview/features/notification-updates.jd
index 7440dea9268e..f23483185665 100644
--- a/docs/html/preview/features/notification-updates.jd
+++ b/docs/html/preview/features/notification-updates.jd
@@ -56,7 +56,10 @@ interface. On a handheld, the inline reply action appears as an additional butto
handheld app.
-<img id="fig-reply-button" src="{@docRoot}preview/images/inline-reply.png">
+<img id="fig-reply-button" src="{@docRoot}preview/images/inline-reply.png"
+ srcset="{@docRoot}preview/images/inline-reply.png 1x,
+ {@docRoot}preview/images/inline-reply_2x.png 2x"
+ width="400">
<p class="img-caption">
<strong>Figure 1.</strong> Android N adds the <strong>Reply</strong>
action button.
@@ -176,13 +179,6 @@ When the user responds via {@link android.support.v4.app.RemoteInput},
include the text in the reply history with the {@code setRemoteInputHistory()}
method.</p>
-
-<img id="fig-chat-history" src="{@docRoot}preview/images/inline-reply-sent.png">
-<p class="img-caption">
- <strong>Figure 3.</strong> Screenshot of chat history in the notification
- shade.
-</p>
-
<h2 id="bundle">Bundled Notifications</h2>
<p>Android N provides developers with a new way to represent
@@ -209,7 +205,7 @@ Builder.setGroup()} method to bundle similar notifications.</p>
{@docRoot}preview/images/bundles_2x.png 2x"
width="300">
<p class="img-caption">
- <strong>Figure 4.</strong> The user can progressively expand the notification
+ <strong>Figure 3.</strong> The user can progressively expand the notification
group.
</p>
diff --git a/docs/html/preview/images/inline-reply-sent.png b/docs/html/preview/images/inline-reply-sent.png
deleted file mode 100644
index 623e89e3a660..000000000000
--- a/docs/html/preview/images/inline-reply-sent.png
+++ /dev/null
Binary files differ
diff --git a/docs/html/preview/images/inline-reply.png b/docs/html/preview/images/inline-reply.png
index cdf5d30614f1..79a1a72bb0ee 100644
--- a/docs/html/preview/images/inline-reply.png
+++ b/docs/html/preview/images/inline-reply.png
Binary files differ
diff --git a/docs/html/preview/images/inline-reply_2x.png b/docs/html/preview/images/inline-reply_2x.png
new file mode 100644
index 000000000000..13c6e35bf207
--- /dev/null
+++ b/docs/html/preview/images/inline-reply_2x.png
Binary files differ