Merge "add glare effect to screenshot and add 1x version with srcset" into lmp-dev
diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd
index 874262c..f8d8ab6 100644
--- a/docs/html/about/versions/android-5.0.jd
+++ b/docs/html/about/versions/android-5.0.jd
@@ -121,6 +121,11 @@
offers new features for users and app developers. This document provides an
introduction to the most notable new APIs.</p>
+<p>For a high-level look at the new platform features, instead
+see the
+<a href="{@docRoot}about/versions/lollipop.html">Android Lollipop
+highlights</a>.</p>
+
<h3 id="Start">Start developing</h3>
@@ -255,15 +260,6 @@
{@link android.app.Notification#VISIBILITY_PUBLIC VISIBILITY_PUBLIC}.
</p>
-<div class="figure" style="width:320px">
- <img src="{@docRoot}images/android-5.0/hun-example.png"
- srcset="{@docRoot}images/android-5.0/hun-example@2x.png 2x"
- alt="" width="320" height="541" id="figure1" />
- <p class="img-caption">
- <strong>Figure 1.</strong> Fullscreen activity showing a heads-up notification
- </p>
-</div>
-
<h4 id="NotificationsMediaPlayback">Media playback</h4>
<p>If you are implementing notifications that present media playback
status or transport controls, consider using the new
@@ -933,16 +929,6 @@
<h2 id="Enterprise">Android in the Workplace and in Education</h2>
<h3 id="ManagedProvisioning">Managed provisioning</h3>
-<div class="figure" style="width:360px">
- <img src="../../images/android-5.0/managed_apps_launcher.png"
- srcset="../../images/android-5.0/managed_apps_launcher@2x.png 2x"
- alt="" width="360" height="609" id="figure3" />
- <p class="img-caption">
- <strong>Figure 2.</strong> Launcher screen showing managed apps (marked with
- a lock badge)
- </p>
-</div>
-
<p>Android 5.0 provides new functionality for running apps within
an enterprise environment. A
<a href="{@docRoot}guide/topics/admin/device-admin.html">device administrator</a> can
diff --git a/docs/html/about/versions/lollipop.jd b/docs/html/about/versions/lollipop.jd
index 3cd52eb..2d4072b 100644
--- a/docs/html/about/versions/lollipop.jd
+++ b/docs/html/about/versions/lollipop.jd
@@ -28,6 +28,7 @@
<li><a href="#Graphics">High-performance graphics</a></li>
<li><a href="#Audio">More Powerful Audio</a></li>
<li><a href="#Camera">Enhanced Camera & Video</a></li>
+ <li><a href="#Work">Android in the Workplace</a></li>
<li><a href="#ScreenCapture">Screen capturing and sharing</a></li>
<li><a href="#Sensors">New types of sensors</a></li>
<li><a href="#WebView">Chromium WebView</a></li>
@@ -204,6 +205,23 @@
<p>Android 5.0 also adds support for <strong>multimedia tunneling</strong> to provide the best experience for ultra-high definition (4K) content and the ability to play compressed audio and video data together. </p>
+
+<img style="float:right; margin:0 0 40px 60px"
+ src="{@docRoot}images/android-5.0/managed_apps_launcher@2x.png"
+ srcset="{@docRoot}images/android-5.0/managed_apps_launcher@2x.png 2x"
+ alt="" width="300" />
+
+<h2 id="Work">Android in the Workplace</h2>
+
+<p>In an enterprise work environment, an Android device can now be configured with separate profiles for both work and personal use. The employer administers the work profile and can control the apps available within it. Employees can then control their personal space on the device, which is not accessible by the employer.</p>
+
+<p>Notifications and apps for both the personal and work profile are
+visible in a unified view. Apps for work are badged so users can identify them easily. The data for each profile is kept separate
+and secure from each other, including when the same app is used by both profiles—similar to the <a href="{@docRoot}about/versions/jelly-bean.html#42-multiuser">multi-user support</a> introduced in
+Android 4.2.</p>
+
+
+
<h2 id="ScreenCapture">Screen capturing and sharing</h2>
<p>Android 5.0 lets you add screen capturing and screen sharing capabilities to your app. </p>
@@ -249,4 +267,4 @@
<img src="{@docRoot}images/versions/battery_historian.png" srcset="{@docRoot}images/versions/battery_historian@2x.png 2x" alt="" width="760" height="462" />
<p class="img-caption">Battery Historian is a new tool to convert the statistics from <code>dumpsys batterystats</code> into a visualization for battery-related debugging. You can find it at <a href="https://github.com/google/battery-historian"
->https://github.com/google/battery-historian</a>.</p>
\ No newline at end of file
+>https://github.com/google/battery-historian</a>.</p>
diff --git a/docs/html/images/android-5.0/managed_apps_launcher.png b/docs/html/images/android-5.0/managed_apps_launcher.png
index b5ef407..8184556 100644
--- a/docs/html/images/android-5.0/managed_apps_launcher.png
+++ b/docs/html/images/android-5.0/managed_apps_launcher.png
Binary files differ
diff --git a/docs/html/images/android-5.0/managed_apps_launcher@2x.png b/docs/html/images/android-5.0/managed_apps_launcher@2x.png
index 90d7d51..66b7be9 100644
--- a/docs/html/images/android-5.0/managed_apps_launcher@2x.png
+++ b/docs/html/images/android-5.0/managed_apps_launcher@2x.png
Binary files differ
