diff options
| author | 2014-10-28 02:51:30 +0000 | |
|---|---|---|
| committer | 2014-10-28 02:51:32 +0000 | |
| commit | 3c00bc01f9c6e82a0859201f74237998b24872da (patch) | |
| tree | 0fdef40cd786ba369d9dd9381d4d1210f72578b7 | |
| parent | d126294a8f954fb758d3f67bc5271014748ba9e7 (diff) | |
| parent | 576a4b737181c3a643160cb58e783b4d05eda571 (diff) | |
Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs
| -rw-r--r-- | docs/html/design/patterns/notifications.jd | 4 | ||||
| -rw-r--r-- | docs/html/images/android-5.0/notifications/LockScreen.png | bin | 1158747 -> 154164 bytes | |||
| -rw-r--r-- | docs/html/images/android-5.0/notifications/LockScreen@2x.png | bin | 0 -> 475120 bytes |
3 files changed, 2 insertions, 2 deletions
diff --git a/docs/html/design/patterns/notifications.jd b/docs/html/design/patterns/notifications.jd index 467dbb232dfc..f5cd2a7bcb9d 100644 --- a/docs/html/design/patterns/notifications.jd +++ b/docs/html/design/patterns/notifications.jd @@ -787,8 +787,8 @@ to anyone who picks up the device and turns on the display.</p> <h3>User control over information displayed on the secure lock screen</h3> <div class="figure" style="width:311px"> - <img src="{@docRoot}images/android-5.0/notifications/LockScreen.png" - alt="" width="311px" /> + <img src="{@docRoot}images/android-5.0/notifications/LockScreen@2x.png" + srcset="{@docRoot}images/android-5.0/notifications/LockScreen.png 1x" alt="" width="311px"/> <p class="img-caption"> Notifications on the lock screen, with contents revealed after the user unlocks the device. </p> diff --git a/docs/html/images/android-5.0/notifications/LockScreen.png b/docs/html/images/android-5.0/notifications/LockScreen.png Binary files differindex c204a81826ed..b97bc3954250 100644 --- a/docs/html/images/android-5.0/notifications/LockScreen.png +++ b/docs/html/images/android-5.0/notifications/LockScreen.png diff --git a/docs/html/images/android-5.0/notifications/LockScreen@2x.png b/docs/html/images/android-5.0/notifications/LockScreen@2x.png Binary files differnew file mode 100644 index 000000000000..7f145fb3347a --- /dev/null +++ b/docs/html/images/android-5.0/notifications/LockScreen@2x.png |
