Merge "docs: add developer guide cross-references, Project ACRE, Round 2" into ics-mr0 (471fa9d1) · Commits · e / os / android_frameworks_base

core/java/android/app/AlertDialog.java

+6 −0

Original line number	Diff line number	Diff line
		@@ -54,6 +54,12 @@ import android.widget.ListView;
		* without text editors, so that it will be placed on top of the current
		* input method UI. You can modify this behavior by forcing the flag to your
		* desired mode after calling {@link #onCreate}.
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about creating dialogs, read the
		* <a href="{@docRoot}guide/topics/ui/dialogs.html">Dialogs</a> developer guide.</p>
		* </div>
		*/
		public class AlertDialog extends Dialog implements DialogInterface {
		private AlertController mAlert;

+8 −3

Original line number	Diff line number	Diff line
		@@ -67,8 +67,13 @@ import java.lang.ref.WeakReference;
		*
		* <pre>
		* getWindow().setFlags(WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM,
		* WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);
		* </pre>
		* WindowManager.LayoutParams.FLAG_ALT_FOCUSABLE_IM);</pre>
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about creating dialogs, read the
		* <a href="{@docRoot}guide/topics/ui/dialogs.html">Dialogs</a> developer guide.</p>
		* </div>
		*/
		public class Dialog implements DialogInterface, Window.Callback,
		KeyEvent.Callback, OnCreateContextMenuListener {

+6 −3

Original line number	Diff line number	Diff line
		@@ -38,9 +38,12 @@ import java.text.NumberFormat;
		* <p>The {@link Notification.Builder Notification.Builder} has been added to make it
		* easier to construct Notifications.</p>
		*
		* <p>For a guide to creating notifications, see the
		* <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">Creating Status
		* Bar Notifications</a> document in the Dev Guide.</p>
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For a guide to creating notifications, read the
		* <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">Status Bar Notifications</a>
		* developer guide.</p>
		* </div>
		*/
		public class Notification implements Parcelable
		{

+7 −0

Original line number	Diff line number	Diff line
		@@ -55,6 +55,13 @@ import android.util.Log;
		* You do not instantiate this class directly; instead, retrieve it through
		* {@link android.content.Context#getSystemService}.
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For a guide to creating notifications, read the
		* <a href="{@docRoot}guide/topics/ui/notifiers/notifications.html">Status Bar Notifications</a>
		* developer guide.</p>
		* </div>
		*
		* @see android.app.Notification
		* @see android.content.Context#getSystemService
		*/

+6 −3

Original line number	Diff line number	Diff line
		@@ -45,9 +45,6 @@ import java.util.ArrayList;
		* multiple applications you can use a database directly via
		* {@link android.database.sqlite.SQLiteDatabase}.
		*
		* <p>For more information, read <a href="{@docRoot}guide/topics/providers/content-providers.html">Content
		* Providers</a>.</p>
		*
		* <p>When a request is made via
		* a {@link ContentResolver} the system inspects the authority of the given URI and passes the
		* request to the content provider registered with the authority. The content provider can interpret
		@@ -73,6 +70,12 @@ import java.util.ArrayList;
		* <p>Requests to {@link ContentResolver} are automatically forwarded to the appropriate
		* ContentProvider instance, so subclasses don't have to worry about the details of
		* cross-process calls.</p>
		*
		* <div class="special reference">
		* <h3>Developer Guides</h3>
		* <p>For more information about using content providers, read the
		* <a href="{@docRoot}guide/topics/providers/content-providers.html">Content Providers</a>
		* developer guide.</p>
		*/
		public abstract class ContentProvider implements ComponentCallbacks2 {
		private static final String TAG = "ContentProvider";