summaryrefslogtreecommitdiffstats
path: root/docs/html/about
diff options
context:
space:
mode:
authorsmain@google.com <smain@google.com>2014-10-22 17:58:50 -0700
committersmain@google.com <smain@google.com>2014-10-22 17:58:50 -0700
commit32c820fac0575b406acef688ce365d9c390fd93e (patch)
tree338dc129afdaf475fa5097f89e3ea39ccdab760e /docs/html/about
parent9d28487e05b6f5b2c4d464467f932060de463067 (diff)
downloadframeworks_base-32c820fac0575b406acef688ce365d9c390fd93e.zip
frameworks_base-32c820fac0575b406acef688ce365d9c390fd93e.tar.gz
frameworks_base-32c820fac0575b406acef688ce365d9c390fd93e.tar.bz2
update android workplace screenshot
bug: 18038081 Change-Id: I6cc59cf002000ee2c938e634ef3662fbba2c70cc
Diffstat (limited to 'docs/html/about')
-rw-r--r--docs/html/about/versions/lollipop.jd7
1 files changed, 4 insertions, 3 deletions
diff --git a/docs/html/about/versions/lollipop.jd b/docs/html/about/versions/lollipop.jd
index 085dc24..3ee0a86 100644
--- a/docs/html/about/versions/lollipop.jd
+++ b/docs/html/about/versions/lollipop.jd
@@ -206,15 +206,16 @@ video apps and games to display smooth synchronized content.</p>
<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>
-<!--
+
<div class="figure" style="width:320px; margin:1em 0 0 20px;padding-left:2em;">
<img style="float:right; margin:0 1em 1em 2em"
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" />
-<p class="img-caption">Android Work users have a unified view of their personal and work apps, which are badged for easy identification.</p>
+<p class="img-caption">Users have a unified view of their personal and work apps, which are
+badged for easy identification.</p>
</div>
--->
+
<h2 id="Work">Android in the workplace</h2>