summaryrefslogtreecommitdiffstats
path: root/docs/html
diff options
context:
space:
mode:
authorDirk Dougherty <ddougherty@google.com>2012-06-28 10:34:56 -0700
committerAndroid (Google) Code Review <android-gerrit@google.com>2012-06-28 10:34:56 -0700
commitd91cce8558d09295746588fa13a2cbb0f3e7ab59 (patch)
tree825a99823eb354eb4c2e9f353490cef719eff781 /docs/html
parent4fa4648515c3c1f77a31da186a9fe31d6c509412 (diff)
parent7b6be8ef4c63bb2cfaddad3d89444d9f84f134e1 (diff)
downloadframeworks_base-d91cce8558d09295746588fa13a2cbb0f3e7ab59.zip
frameworks_base-d91cce8558d09295746588fa13a2cbb0f3e7ab59.tar.gz
frameworks_base-d91cce8558d09295746588fa13a2cbb0f3e7ab59.tar.bz2
Merge "Doc change: swap notification image for generic." into jb-dev
Diffstat (limited to 'docs/html')
-rw-r--r--docs/html/about/versions/jelly-bean.jd4
-rw-r--r--docs/html/images/jb-notif-ex1.pngbin0 -> 73723 bytes
2 files changed, 1 insertions, 3 deletions
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index 32b2310..18b3ff6 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -121,7 +121,7 @@ for users and developers. This document provides a glimpse of what's new for dev
<div style="float:right;margin:22px 0px 0px 24px;width:280px;">
<div>
<!-- <img src="{@docRoot}images/jd-notif-cd.png" style="width:200px"> -->
-<img src="{@docRoot}images/jb-notif-ex.png" width="280" height="548">
+<img src="{@docRoot}images/jb-notif-ex1.png" width="280" height="548">
</div>
<p class="image-caption" style="padding:.5em">Developers can create custom notification styles
like those shown in the examples above to display rich content and actions.</p>
@@ -147,8 +147,6 @@ like those shown in the examples above to display rich content and actions.</p>
<p>With expandable notifications, apps can give more information to the user, effortlessly and on demand. Users remain in control and can long-press any notification to get information about the sender and optionally disable further notifications from the app.</p>
-</div>
-
<div style="float:left;margin:66px 30px 0px 0px;width:280px;">
<div>
<img src="{@docRoot}images/jb-appwidgets.png" width="280" height="548">
diff --git a/docs/html/images/jb-notif-ex1.png b/docs/html/images/jb-notif-ex1.png
new file mode 100644
index 0000000..a960ab9
--- /dev/null
+++ b/docs/html/images/jb-notif-ex1.png
Binary files differ