am 81f89278: am bd27ea2e: Merge "Update javadocs for DreamService." into jb-mr1-dev

* commit '81f8927884610ea7bf9a7af59738eb3e3d0a4798':
  Update javadocs for DreamService.

core/java/android/service/dreams/DreamService.java

@@ -47,24 +47,30 @@ import com.android.internal.policy.PolicyManager;
  *
  * <p>Dreams should be declared in the manifest as follows:</p>
  * <pre>
- * {@code
+ * &lt;service
- * <service
  *     android:name=".MyDream"
  *     android:exported="true"
  *     android:icon="@drawable/my_icon"
  *     android:label="@string/my_dream_label" >
  *
- *     <intent-filter>
+ *     &lt;intent-filter>
- *         <action android:name="android.intent.action.MAIN" />
+ *         &lt;action android:name="android.service.dreams.DreamService" />
- *         <category android:name="android.intent.category.DREAM" />
+ *         &lt;category android:name="android.intent.category.DEFAULT" />
- *     </intent-filter>
+ *     &lt;/intent-filter>
  *
- *     <!-- Point to additional information for this dream (optional) -->
+ *     &lt;!-- Point to additional information for this dream (optional) -->
- *     <meta-data
+ *     &lt;meta-data
  *         android:name="android.service.dream"
  *         android:resource="@xml/my_dream" />
- * </service>
+ * &lt;/service>
- * }
+ * </pre>
+ * <p>If specified, additional information for the dream is defined using the
+ * <code>&lt;{@link android.R.styleable#Dream dream}&gt;</code> element.  For example:</p>
+ * <pre>
+ * (in res/xml/my_dream.xml)
+ *
+ * &lt;dream xmlns:android="http://schemas.android.com/apk/res/android"
+ *     android:settingsActivity="com.example.app/.MyDreamSettingsActivity" />
  * </pre>
  */
 public class DreamService extends Service implements Window.Callback {