Merge "Doc change: edits to highlights files." into jb-mr1-dev

docs/html/about/versions/jelly-bean.jd

@@ -5,7 +5,7 @@ page.title=Jelly Bean Highlights for Developers
 <div id="android-4.2">
 <div style="float:right;padding:0px 0px 12px 34px;">
 <div>
-<img src="{@docRoot}images/jb-devices.png" alt="Android 4.2 on phone and tablet" height="316" width="400">
+<img src="{@docRoot}images/jb-device-2.png" alt="Android 4.2 on phone and tablet" height="348" width="400">
 </div>
 </div>
 <p>Welcome to Android 4.2, the latest version of <span
@@ -22,7 +22,7 @@ document for a detailed look at the new developer APIs.</p>
 href="http://www.android.com/whatsnew">www.android.com</a>.</p>
 
 
-<h2 id="performance">Faster, Smoother, More Responsive</h2>
+<h2 id="4.2-4.2performance">Faster, Smoother, More Responsive</h2>
 
 <p>Android 4.2 builds on the performance improvements already included in Jelly Bean
 &mdash; <strong>vsync timing</strong>, <strong>triple buffering</strong>,
@@ -38,15 +38,11 @@ certain shapes (rounded rects, circles and ovals).</p>
 of web pages smoother and free from jitter and lags.</p>
 
 <p>Android’s <strong>Renderscript Compute</strong> is the first computation
-platform ported to run directly on a mobile device GPU. It now automatically
+platform ported to run directly on a <strong>mobile device GPU</strong>. It automatically
-takes advantage of <strong>GPU computation</strong> resources wherever possible,
+takes advantage of <strong>GPU computation</strong> resources whenever possible,
-to improve performance. With this GPU integration, even the most complex
+dramatically improving performance for graphics and image processing. Any app using
-computations for graphics or image processing can execute with dramatically
+Renderscript on a supported device can benefit immediately from
-improved performance.</p>
+this GPU integration <strong>without recompiling</strong>.</p>
-
-<p>Any app using Renderscript on a supported device can benefit immediately from
-this GPU integration, without recompiling. The Nexus 10 tablet is the first
-device to support this integration.</p>
 
 
 <div style="float:left;margin:16px 24px 12px 0px;">
@@ -54,7 +50,7 @@ device to support this integration.</p>
 <img src="{@docRoot}images/jb-nexus10-1.png" alt="10-inch tablet running Android 4.2" width="380" /></a>
 </div> 
 
-<h2 id="ui" style="margin-top:2em;">Refined, refreshed UI</h2>
+<h2 id="4.2-ui" style="margin-top:2em;">Refined, refreshed UI</h2>
 
 <p>Android 4.2 refines the Jelly Bean user experience and brings familiar
 Android UI patterns such as status bar, system bar, and notifications window to
@@ -67,7 +63,7 @@ bottom, with buttons easily accessible from either hand. The <strong>Application
 Tray</strong> is also available on all screen sizes.</p>
 
 
-<h2 id="multiuser" style="margin-top:2em;clear:left;">One tablet, many users</h2>
+<h2 id="4.2-multiuser" style="margin-top:2em;clear:left;">One tablet, many users</h2>
 
 <p>Now several users can <strong>share a single Android tablet</strong>, with
 each user having convenient access to a <strong>dedicated user
@@ -97,7 +93,7 @@ in a single-user environment. </p>
 </div>
 
 
-<h2 id="engagement" style="clear:left; margin-top:1em;">New ways to engage users</h2>
+<h2 id="4.2-engagement" style="clear:left; margin-top:1em;">New ways to engage users</h2>
 
 <div style="float:right;margin:22px 0px 0px 24px;width:280px;">
 <div>
@@ -106,7 +102,7 @@ in a single-user environment. </p>
 <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>
 
-<h3 id="lockscreen-widgets">Lock screen widgets</h3>
+<h3 id="4.2-lockscreen-widgets">Lock screen widgets</h3>
 
 <p>In Android 4.2, users can place <strong>app widgets</strong> directly on
 their <strong>lock screens</strong>, for instant access to favorite app content
@@ -133,7 +129,7 @@ screen area when available and resize when needed on smaller screens. You can
 also add features to your widgets that might be especially useful or convenient
 on the lock screen.</p>
 
-<h3 id="daydreams">Daydream</h3>
+<h3 id="4.2-daydreams">Daydream</h3>
 
 <p>Daydream is an <strong>interactive screensaver mode</strong> that starts when
 a user’s device is docked or charging. In this mode, the system launches a
@@ -154,9 +150,9 @@ experiences, such as leanback or exhibition mode, demo or kiosk mode, and
 
 <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">
+<img src="{@docRoot}images/jb-dream-1.png" alt="Daydream screensaver mode" style="width:440px;padding-left:1em;">
 </div>
-<p class="image-caption" style="padding:.5em"><span
+<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>
 </div>
 
@@ -172,7 +168,7 @@ components and resources that you’ve already created for other parts of your
 app. You can provide multiple daydreams in your app and you can offer distinct
 content and display settings for each.</p>
 
-<h2  id="external-display" style="clear:left;">External display support</h2>
+<h2  id="4.2-external-display" style="clear:left;">External display support</h2>
 
 <p>Android 4.2 introduces platform support for <strong>external
 displays</strong> that goes far beyond mirroring &mdash; apps can now target
@@ -180,7 +176,7 @@ unique content to any one or multiple displays that are attached to an Android
 device. Apps can build on this to deliver new kinds of interaction and
 entertainment experiences to users.</p>
 
-<h3 id="display-manager">Display manager</h3>
+<h3 id="4.2-display-manager">Display manager</h3>
 
 <p>Apps interact with displays through a new display manager system service.
 Your app can enumerate the displays and check the capabilities of each,
@@ -189,7 +185,7 @@ Your app can also receive callbacks when displays are added or removed or when
 their capabilities change, to better manage your content on external
 displays.</p>
 
-<h3 id="presentation">Presentation window</h3>
+<h3 id="4.2-presentation">Presentation window</h3>
 
 <p>To make it easy to show content on an external display, the framework
 provides a new UI object called a <strong>Presentation</strong> &mdash; a type of dialog that
@@ -202,7 +198,7 @@ content according to the characteristics of the targeted display.</p>
 
 <img src="{@docRoot}images/external-display.png" alt="" width="569" style="padding-left:1em;margin-bottom:0">
 
-<p class="image-caption" style="padding:1.25em">You can take full use of two or more independent displays using <strong>Presentation</strong>.</p>
+<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>
 </div>
 
@@ -213,7 +209,7 @@ to create a UI and render content in the Presentation, from building an
 arbitrary view hierarchy to using SurfaceView or SurfaceTexture to draw directly
 into the window for streamed content or camera previews.</p>
 
-<h3 id="preferred display">Preferred display selection</h3>
+<h3 id="4.2-preferred display">Preferred display selection</h3>
 
 <p>When multiple external displays are available, you can create as many
 Presentations as you need, with each one showing unique content on a specific
@@ -231,7 +227,7 @@ Presentation content on the preferred display. Your apps can also use media
 router’s MediaRouteActionProvider and MediaRouteButton to offer standard
 display-selection UI.</p>
 
-<h3 id="protected-content">Protected content</h3>
+<h3 id="4.2-protected-content">Protected content</h3>
 
 <p>For apps that handle protected or encrypted content, the display API now
 reports the <strong>secure video capabilities</strong> of attached displays. Your app query a
@@ -241,7 +237,7 @@ make the content viewable. For additional security on SurfaceView objects, your
 app can set a secure flag to indicate that the contents should never appear in
 screenshots or on a non-secure display output, even when mirrored.</p>
 
-<h3 id="wireless-display">Wireless display</h3>
+<h3 id="4.2-wireless-display">Wireless display</h3>
 
 <p>Starting in Android 4.2, users on supported devices can connect to an
 external display over Wi-Fi, using <a
@@ -257,7 +253,7 @@ connection and streams your Presentation or other app content to the wireless
 display as needed.</p>
 
 
-<h2 id="native-rtl">Native RTL support</h2>
+<h2 id="4.2-native-rtl">Native RTL support</h2>
 
 <div style="float:right;margin:22px 0px 0px 24px;width:340px;">
 <div>
@@ -294,7 +290,7 @@ HierarchyViewer tool now lets you see start/end properties, layout direction,
 text direction, and text alignment for all the Views in the hierarchy,</p>
 
 
-<h2 id="intl">Enhancements for international languages</h2>
+<h2 id="4.2-intl">Enhancements for international languages</h2>
 
 <p>Android 4.2 includes a variety of <strong>font and character
 optimizations</strong> for international users:</p>
@@ -316,9 +312,9 @@ Slovenian, Serbian, Swedish, Turkish</li>
 </ul>
 
 
-<h2 id="ui-tools">New ways to create beautiful UI</h2>
+<h2 id="4.2-ui-tools">New ways to create beautiful UI</h2>
 
-<h3 id="nested-fragments">Nested Fragments</h3>
+<h3 id="4.2-nested-fragments">Nested Fragments</h3>
 
 <p>For more control over your UI components and to make them more modular,
 Android 4.2 lets you <strong>nest Fragments inside of Fragments</strong>. For
@@ -336,7 +332,7 @@ capability is added to the latest version of the <strong>Android Support
 Library</strong>.</p>
 
 
-<h2 id="accessibility">Accessibility</h2>
+<h2 id="4.2-accessibility">Accessibility</h2>
 
 <p>The system now helps accessibility services <strong>distinguish between touch
 exploration and accessibility gestures</strong> while in touch-exploration mode.
@@ -357,7 +353,7 @@ as the label for another View. The label for each View is available to
 accessibility services through AccessibilityNodeInfo.</p>
 
 
-<h2 id="camera">Improved Camera with HDR</h2>
+<h2 id="4.2-camera">Improved Camera with HDR</h2>
 
 <p>Android 4.2 introduces a <strong>new camera hardware interface and
 pipeline</strong> for improved performance. On supported devices, apps can use a
@@ -370,13 +366,13 @@ sound or choose an alternative sound  in place of the standard shutter sound,
 which is recommended.</p>
 
 
-<h2 id="renderscript">Renderscript Computation</h2>
+<h2 id="4.2-renderscript">Renderscript Computation</h2>
 
 <p>In Android 4.2, Renderscript Compute introduces new scripting features, new
 optimizations, and direct GPU integration for the highest performance in
 computation operations.</p>
 
-<h3 id="filterscript">Filterscript</h3>
+<h3 id="4.2-filterscript">Filterscript</h3>
 
 <p>Filterscript is a subset of Renderscript that is focused on <strong>optimized
 image processing across a broad range of device chipsets</strong>. Developers
@@ -390,7 +386,7 @@ fragment shaders. Because it places a relaxed set of constraints on hardware,
 your operations are optimized and accelerated on more types of device chipsets. 
 Any app targeting API level 17 or higher can make use of Filterscript.</p>
 
-<h3 id="rs-intrinsics">Script intrinsics</h3>
+<h3 id="4.2-rs-intrinsics">Script intrinsics</h3>
 
 <p>In Android 4.2, Renderscript adds support for a set of script intrinsics
 &mdash; pre-implemented <strong>filtering primitives that are
@@ -400,7 +396,7 @@ ensure that your app gets the maximum performance gain possible.</p>
 <p>Intrinsics are available for blends, blur, color matrix, 3x3  and 5x5 convolve,
 per-channel lookup table, and converting an Android YUV buffer to RGB.</p>
 
-<h3 id="rs-groups">Script groups</h3>
+<h3 id="4.2-rs-groups">Script groups</h3>
 
 <p>You can now create <strong>groups of Renderscript scripts</strong> and
 execute them all with a single call as though they were part of a single script.
@@ -423,7 +419,7 @@ execution time, Renderscript optimizes the run order and the connections between
 these operations for best performance.</p>
 
 
-<h3 id="rs-optimization">Ongoing optimization improvements</h3>
+<h3 id="4.2-rs-optimization">Ongoing optimization improvements</h3>
 
 <p>When you use Renderscript for computation operations, you apps benefit from
 <strong>ongoing performance and optimization improvements</strong> in the
@@ -435,11 +431,11 @@ chipsets, without any work on your part. The chart at right highlights
 the performance gain delivered by ongoing Renderscript optimization improvements
 across successive versions of the Android platform.</p>
 
-<h3 id="gpu-compute">GPU Compute</h3>
+<h3 id="4.2-gpu-compute">GPU Compute</h3>
 
-<p>Renderscript Compute is ported to run directly on a mobile device GPU. It now
+<p>Renderscript Compute is the first computation platform ported to run directly on a mobile device GPU. It now
 automatically takes advantage of <strong>GPU computation</strong> resources
-wherever possible to improve performance. With GPU integration, even the most
+whenver possible to improve performance. With GPU integration, even the most
 complex computations for graphics or image processing can execute with
 dramatically improved performance.</p>
 
@@ -447,7 +443,7 @@ dramatically improved performance.</p>
 this GPU integration, without recompiling. The Nexus 10 tablet is the first
 device to support this integration.</p>
 
-<h2  id="dev-options" style="clear:right;margin-top:1em;">New built-in developer options</h2>
+<h2  id="4.2-dev-options" style="clear:right;margin-top:1em;">New built-in developer options</h2>
 
 <p>The Android 4.2 system includes a variety of new developer options that make
 it easier to create great looking apps that perform well. The new options expose
@@ -493,14 +489,14 @@ display. You can control the simulated display’s size and density.</li>
 execution using Logcat, Systrace, or callstack on glGetError.</li>
 </ul>
 
-<h2 id="platform-tech" style="padding-top:1em;clear:left;">New Platform Technologies</h2>
+<h2 id="4.2-platform-tech" style="padding-top:1em;clear:left;">New Platform Technologies</h2>
 
 <p>Android 4.2 includes a variety of new and <strong>enhanced platform technologies</strong> to
 support innovative communications use-cases across a broad range of hardware
 devices. In most cases, the new platform technologies and enhancements do not directly
 affect your apps, so you can benefit from them without any modification.</p>
 
-<h3 id="security">Security enhancements</h3>
+<h3 id="4.2-security">Security enhancements</h3>
 
 <p>Every Android release includes dozens of security enhancements to protect
 users.  Here are some of the enhancements in Android 4.2:</p>
@@ -550,14 +546,14 @@ available in Android Open Source Project.  To improve security, some devices
 with earlier versions of Android may also include these fixes.</li>
 </ul>
 
-<h3 id="bt-stack">New Bluetooth stack</h3>
+<h3 id="4.2-bt-stack">New Bluetooth stack</h3>
 
 Android 4.2 introduces a new Bluetooth stack optimized for use with Android
 devices. The new Bluetooth stack developed in collaboration between Google and
 Broadcom replaces the stack based on BlueZ and provides improved compatibility
 and reliability.
 
-<h3 id="audio">Low-latency audio</h3>
+<h3 id="4.2-audio">Low-latency audio</h3>
 
 <p>Android 4.2 improves support for low-latency audio playback, starting from the
 improvements made in Android 4.1 release for audio output latency using OpenSL
@@ -567,20 +563,20 @@ advertise their support to apps through a hardware feature constant. New
 AudioManager APIs are provided to query the native audio sample rate and buffer
 size, for use on devices which claim this feature.</p>
 
-<h3 id="camera-interface">New camera hardware interface</h3>
+<h3 id="4.2-camera-interface">New camera hardware interface</h3>
 
 Android 4.2 introduces a new implementation of the camera stack. The camera
 subsystem includes the implementations for components in the camera pipeline
 such as burst mode capture with processing controls.
 
-<h3 id="nfc-interface">New NFC hardware interface and controller interface</h3>
+<h3 id="4.2-nfc-interface">New NFC hardware interface and controller interface</h3>
 
 Android 4.2 introduces support for controllers based on the NCI standard from
 the NFC-Forum. NCI provides a standard communication protocol between an NFC
 Controller (NFCC) and a device Host, and the new NFC stack developed in
 collaboration between Google and Broadcom supports it.  
 
-<h3 id="dalvik">Dalvik runtime optimizations</h3>
+<h3 id="4.2-dalvik">Dalvik runtime optimizations</h3>
 
 <p>The Dalvik runtime includes enhancements for performance and security across
 a wider range of architectures:</p>

docs/html/index.jd

@@ -17,14 +17,10 @@ page.metaDescription=The official site for Android developers. Provides the Andr
                         <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>Jelly Bean now available!</h1>
+                    <h1>A new version of Jelly Bean!</h1>
-                    <p>Android 4.1 (Jelly Bean) builds on what's great about Android
+                    <p>Android 4.2 is here, with performance optimizations, a refreshed UI, and great new features for developers. </p>
-                      with improvements to performance and user experience.</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>New APIs are also available that allow you to build richer and more
+                    <p><a href="{@docRoot}about/versions/jelly-bean.html" class="button">Read the Highlights</a></p>
-                      interactive notifications, transfer larger
-                    payloads through NFC, discover services over Wi-Fi, and much more.</p>
-                    <p><a href="{@docRoot}about/versions/jelly-bean.html" class="button">More 
-                        about Jelly Bean</a></p>
                     </div>
                 </li>
                 <li class="item carousel-home">