diff --git a/docs/html/about/versions/android-4.2.jd b/docs/html/about/versions/android-4.2.jd index 326ace310207a..039e71efb4ce1 100644 --- a/docs/html/about/versions/android-4.2.jd +++ b/docs/html/about/versions/android-4.2.jd @@ -123,7 +123,7 @@ moved to {@link android.provider.Settings.Global} when running on Android 4.2 an

Daydream is a new interactive screensaver mode for Android devices. It activates automatically when the device is inserted into a dock or when the device is left idle while plugged in to a charger (instead of turning the screen off). Daydream displays one dream at a time, which may -be a purely visual, passive display that dismisses upon touch, or interactive and responsive +be a purely visual, passive display that dismisses upon touch, or may be interactive and responsive to the full suite of input events. Your dreams run in your app’s process and have full access to the Android UI toolkit, including views, layouts, and animations, so they are more flexible and powerful than either live wallpapers or app widgets.

@@ -133,25 +133,26 @@ android.service.dreams.DreamService}. The {@link android.service.dreams.DreamSer designed to be similar to those of {@link android.app.Activity}. To specify the UI for your dream, pass a layout resource ID or {@link android.view.View} to {@link android.service.dreams.DreamService#setContentView setContentView()} at any point after you have -a window (such as from the {@link android.service.dreams.DreamService#onAttachedToWindow()} -callback). You cannot initiate a {@link android.service.dreams.DreamService} from your -app—it is launched automatically by the system.

+a window, such as from the {@link android.service.dreams.DreamService#onAttachedToWindow()} +callback.

The {@link android.service.dreams.DreamService} class provides other important lifecycle callback methods on top of the base {@link android.app.Service} APIs, such as {@link android.service.dreams.DreamService#onDreamingStarted()}, {@link android.service.dreams.DreamService#onDreamingStopped()}, and {@link -android.service.dreams.DreamService#onDetachedFromWindow()}.

+android.service.dreams.DreamService#onDetachedFromWindow()}. +You cannot initiate a {@link android.service.dreams.DreamService} from your +app—it is launched automatically by the system.

If your dream is interactive, you can start an activity from the dream to send the user into -your full app’s UI for more detail or control. (Use {@link +your app’s full UI for more detail or control. You can use {@link android.service.dreams.DreamService#finish()} to end the dream so the user can see the -new Activity.)

+new Activity.

-

To make your daydream available to the system, in your manifest file, declare your {@link +

To make your daydream available to the system, declare your {@link android.service.dreams.DreamService} with a {@code <service>} element. -You must then include an intent filter with the action {@code +href="{@docRoot}guide/topics/manifest/service-element.html">{@code <service>} element +in your manifest file. You must then include an intent filter with the action {@code "android.service.dreams.DreamService"}. For example:

@@ -169,12 +170,12 @@ to be aware of: