diff --git a/docs/html/about/versions/android-5.0.jd b/docs/html/about/versions/android-5.0.jd index 874262cd4f54b..f8d8ab6d71f48 100644 --- a/docs/html/about/versions/android-5.0.jd +++ b/docs/html/about/versions/android-5.0.jd @@ -121,6 +121,11 @@ sdk.platform.apiLevel=21 offers new features for users and app developers. This document provides an introduction to the most notable new APIs.

+

For a high-level look at the new platform features, instead +see the +Android Lollipop +highlights.

+

Start developing

@@ -255,15 +260,6 @@ method and set the notification's visibility level to {@link android.app.Notification#VISIBILITY_PUBLIC VISIBILITY_PUBLIC}.

-
- -

- Figure 1. Fullscreen activity showing a heads-up notification -

-
-

Media playback

If you are implementing notifications that present media playback status or transport controls, consider using the new @@ -933,16 +929,6 @@ related issues.

Android in the Workplace and in Education

Managed provisioning

-
- -

- Figure 2. Launcher screen showing managed apps (marked with - a lock badge) -

-
-

Android 5.0 provides new functionality for running apps within an enterprise environment. A device administrator can diff --git a/docs/html/about/versions/lollipop.jd b/docs/html/about/versions/lollipop.jd index 59392ea0c51e4..d94d7992daa46 100644 --- a/docs/html/about/versions/lollipop.jd +++ b/docs/html/about/versions/lollipop.jd @@ -28,6 +28,7 @@ page.title=Android Lollipop

  • High-performance graphics
  • More Powerful Audio
  • Enhanced Camera & Video
    • +
  • Android in the Workplace
  • Screen capturing and sharing
  • New types of sensors
  • Chromium WebView
    • @@ -204,6 +205,23 @@ video apps and games to display smooth synchronized content.

    Android 5.0 also adds support for multimedia tunneling to provide the best experience for ultra-high definition (4K) content and the ability to play compressed audio and video data together.

    + + + +

    Android in the Workplace

    + +

    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.

    + +

    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 multi-user support introduced in +Android 4.2.

    + + +

    Screen capturing and sharing

    Android 5.0 lets you add screen capturing and screen sharing capabilities to your app.

    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 b5ef4074c5374..818455634dbbb 100644 Binary files a/docs/html/images/android-5.0/managed_apps_launcher.png and b/docs/html/images/android-5.0/managed_apps_launcher.png 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 90d7d5165985c..66b7be91c2f93 100644 Binary files a/docs/html/images/android-5.0/managed_apps_launcher@2x.png and b/docs/html/images/android-5.0/managed_apps_launcher@2x.png differ