Merge "docs: add templated tabs for jb highlights" into jb-mr1-dev
diff --git a/docs/html/about/versions/jelly-bean.jd b/docs/html/about/versions/jelly-bean.jd
index 3888fa5..19e73fe 100644
--- a/docs/html/about/versions/jelly-bean.jd
+++ b/docs/html/about/versions/jelly-bean.jd
@@ -100,7 +100,7 @@
<div style="float:left;margin:16px 24px 12px 0px;">
<a href="" target="_android">
-<img src="{@docRoot}images/jb-nexus10-1.png" alt="10-inch tablet running Android 4.2" width="380" /></a>
+<img src="{@docRoot}images/jb-nexus10-1.png" alt="10-inch tablet running Android 4.2" width="380" height="281" /></a>
</div>
<h2 id="42-ui" style="margin-top:2em;">Refined, refreshed UI</h2>
@@ -149,7 +149,7 @@
<div style="float:right;margin:22px 0px 0px 24px;width:280px;">
<div>
-<img src="{@docRoot}images/jb-lock-calendar.png" alt="Calendar lock screen widget" height="462" style="padding-left:1em;margin-bottom:0">
+<img src="{@docRoot}images/jb-lock-calendar.png" alt="Calendar lock screen widget" width="280" height="543" style="padding-left:1em;margin-bottom:0">
</div>
<p class="image-caption" style="padding:1.5em">You can extend <strong>app widgets</strong> to run on the lock screen, for instant access to your content.</p>
</div>
@@ -202,7 +202,7 @@
<div style="float:left;margin:20px 30px 0px 0px;width:460px;">
<div>
-<img src="{@docRoot}images/jb-dream-1.png" alt="Daydream screensaver mode" style="width:440px;padding-left:1em;">
+<img src="{@docRoot}images/jb-dream-1.png" alt="Daydream screensaver mode" height="300" style="padding-left:1em;">
</div>
<p class="image-caption" style="padding:.5em .5em .5em 1.5em;"><span
style="font-weight:500;">Daydream</span> lets you create powerful interactive screensavers that display any kind of content.</p>
@@ -248,7 +248,7 @@
<div style="margin:0 auto;width:569px;padding-top:1em;">
-<img src="{@docRoot}images/external-display.png" alt="" width="569" style="padding-left:1em;margin-bottom:0">
+<img src="{@docRoot}images/external-display.png" alt="" width="555" height="351" style="padding-left:1em;margin-bottom:0">
<p class="image-caption" style="padding:1.25em">You can take full control of two or more independent displays using <strong>Presentation</strong>.</p>
</div>
@@ -308,7 +308,7 @@
<div style="float:right;margin:22px 0px 0px 24px;width:340px;">
<div>
-<img src="{@docRoot}images/jb-rtl.png" alt="RTL layout mirroring" width="340" style="margin-bottom:0;">
+<img src="{@docRoot}images/jb-rtl.png" alt="RTL layout mirroring" width="340" height="457" style="margin-bottom:0;">
</div>
<p class="image-caption" style="padding-top:1em">Developers can now <strong>mirror their layouts</strong> for RTL languages.</p>
</div>
@@ -455,12 +455,12 @@
could not do if the scripts were executed individually.</p>
<div style="float:right;padding-top:1em;width:400px;margin-left:2em;">
-<img src="{@docRoot}images/jb-rs-chart-versions.png" alt="Renderscipt optimizations chart" width="360"
+<img src="{@docRoot}images/jb-rs-chart-versions.png" alt="Renderscipt optimizations chart" width="360" height="252"
style="border:1px solid #ddd;border-radius: 6px;" />
<p style="image-caption">Renderscript image-processing
benchmarks run on different Android platform versions (Android 4.0, 4.1, and 4.2)
in CPU only on a Galaxy Nexus device.</p>
-<img src="{@docRoot}images/jb-rs-chart-gpu.png" style="border:1px solid #ddd;border-radius: 6px; alt="" width="360" />
+<img src="{@docRoot}images/jb-rs-chart-gpu.png" style="border:1px solid #ddd;border-radius: 6px; alt="" width="360" height="252" />
<p style="image-caption">Renderscript image-processing benchmarks comparing operations run with GPU + CPU to those run in CPU only on the same Nexus 10 device.</p>
</div>
@@ -509,7 +509,7 @@
<div style="float:left;margin:20px 42px 0px 0px;width:290px;">
<div>
-<img src="{@docRoot}images/jb-dev-options-device.png" width="280" height="548;margin-bottom:0">
+<img src="{@docRoot}images/jb-dev-options-device.png" width="280" height="548">
</div>
<p class="image-caption" style="padding:.5em">New <span
style="font-weight:500;">developer options</span> give you more ways to profile and debug on a device.</p>
@@ -672,7 +672,7 @@
<div style="float:right;width:320px;padding:0px 0px 0px 34px;clear:both">
<div>
-<img src="{@docRoot}images/jb-android-4.1.png" height="426" width="390">
+<img src="{@docRoot}images/jb-android-4.1.png" height="426" width="320">
</div>
</div>
<p>Welcome to Android 4.1 the first version of Jelly Bean!</p>
@@ -700,7 +700,7 @@
<div style="float:left;margin:12px 24px 0px 0px;">
-<img src="{@docRoot}images/jb-accessibility-focus-250.png" style="width:240px">
+<img src="{@docRoot}images/jb-accessibility-focus-250.png" width="240px" height="469">
</div>
<div style="width:85%;padding-top:16px;">
@@ -721,7 +721,7 @@
<div style="clear:both;padding-top:16px;float:right;">
<div style="float:right;margin-left:18px;fpadding-top:90px;padding-bottom:60px">
-<img src="{@docRoot}images/jb-r2l.png" width="280">
+<img src="{@docRoot}images/jb-r2l.png" width="280" height="356">
</div>
</div>
diff --git a/docs/html/images/external-display.png b/docs/html/images/external-display.png
index 337aba4..f71d09f 100644
--- a/docs/html/images/external-display.png
+++ b/docs/html/images/external-display.png
Binary files differ
diff --git a/docs/html/images/jb-dev-options-device.png b/docs/html/images/jb-dev-options-device.png
index 8959d54..6265b34 100644
--- a/docs/html/images/jb-dev-options-device.png
+++ b/docs/html/images/jb-dev-options-device.png
Binary files differ
diff --git a/docs/html/images/jb-device-2.png b/docs/html/images/jb-device-2.png
index 504106c..bcaa2ff 100644
--- a/docs/html/images/jb-device-2.png
+++ b/docs/html/images/jb-device-2.png
Binary files differ
diff --git a/docs/html/images/jb-devices.png b/docs/html/images/jb-devices.png
index 5a6bae9..e09891f 100644
--- a/docs/html/images/jb-devices.png
+++ b/docs/html/images/jb-devices.png
Binary files differ
diff --git a/docs/html/images/jb-dream-1.png b/docs/html/images/jb-dream-1.png
index ab7ce4e..419ef0b 100644
--- a/docs/html/images/jb-dream-1.png
+++ b/docs/html/images/jb-dream-1.png
Binary files differ
diff --git a/docs/html/images/jb-lock-calendar.png b/docs/html/images/jb-lock-calendar.png
index 41098d4..860f6c1 100644
--- a/docs/html/images/jb-lock-calendar.png
+++ b/docs/html/images/jb-lock-calendar.png
Binary files differ
diff --git a/docs/html/index.jd b/docs/html/index.jd
index 74ce76c..97f12b3 100644
--- a/docs/html/index.jd
+++ b/docs/html/index.jd
@@ -17,10 +17,10 @@
<a href="{@docRoot}about/versions/jelly-bean.html"><img src="{@docRoot}images/home/android-jellybean.png" ></a>
</div>
<div class="content-right col-6">
- <h1>A new version of Jelly Bean!</h1>
- <p>Android 4.2 is here, with performance optimizations, a refreshed UI, and great new features for developers. </p>
- <p>Some new features to check out include locksceen widgets, Daydream screensavers, external display support, RTL layouts, nested Fragments, and more. With even better performance, these can help you build new types of beautiful, immersive apps for more users around the world.</p>
- <p><a href="{@docRoot}about/versions/jelly-bean.html" class="button">Read the Highlights</a></p>
+ <h1>Android 4.2 Jelly Bean!</h1>
+ <p>The latest version of Jelly Bean is here, with performance optimizations, a refreshed UI, and great new features for developers. </p>
+ <p>Android 4.2 includes APIs for developing lock sceen widgets and Daydream screensavers, using external displays, creating RTL layouts, building flexible UI with nested Fragments, and much more.</p>
+ <p><a href="/about/versions/jelly-bean.html" class="button">Learn More</a></p>
</div>
</li>
<li class="item carousel-home">
