am b2d582d9: am 3c00bc01: Merge "Updates Notifications screenshot for Android 5.0." into lmp-docs

automerge: b648cab

* commit 'b648cabadfd73bcd3fa8b88db48007f58739300e':
  Updates Notifications screenshot for Android 5.0.
This commit is contained in:
David Friedman
2014-10-28 19:27:37 +00:00
committed by android-build-merger
3 changed files with 2 additions and 2 deletions

View File

@@ -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>

Binary file not shown.

Before

Width:  |  Height:  |  Size: 1.1 MiB

After

Width:  |  Height:  |  Size: 151 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 464 KiB