am a4487e1b: Merge "Clean up API docs for Notification." into jb-dev (d634b77b) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −6

Original line number	Diff line number	Diff line
		@@ -3722,10 +3722,6 @@ package android.app {
		field public static final int FLAG_ONGOING_EVENT = 2; // 0x2
		field public static final int FLAG_ONLY_ALERT_ONCE = 8; // 0x8
		field public static final int FLAG_SHOW_LIGHTS = 1; // 0x1
		field public static final java.lang.String KIND_CALL = "android.call";
		field public static final java.lang.String KIND_EMAIL = "android.email";
		field public static final java.lang.String KIND_EVENT = "android.event";
		field public static final java.lang.String KIND_MESSAGE = "android.message";
		field public static final java.lang.String KIND_PROMO = "android.promo";
		field public static final int PRIORITY_DEFAULT = 0; // 0x0
		field public static final int PRIORITY_HIGH = 1; // 0x1
		@@ -3743,7 +3739,6 @@ package android.app {
		field public android.app.PendingIntent fullScreenIntent;
		field public int icon;
		field public int iconLevel;
		field public java.lang.String[] kind;
		field public android.graphics.Bitmap largeIcon;
		field public int ledARGB;
		field public int ledOffMS;
		@@ -3778,7 +3773,6 @@ package android.app {
		public static class Notification.Builder {
		ctor public Notification.Builder(android.content.Context);
		method public android.app.Notification.Builder addAction(int, java.lang.CharSequence, android.app.PendingIntent);
		method public android.app.Notification.Builder addKind(java.lang.String);
		method public android.app.Notification build();
		method public deprecated android.app.Notification getNotification();
		method public android.app.Notification.Builder setAutoCancel(boolean);

core/java/android/app/Notification.java

+14 −1

Original line number	Diff line number	Diff line
		@@ -390,21 +390,25 @@ public class Notification implements Parcelable
		public int priority;

		/**
		* @hide
		* Notification type: incoming call (voice or video) or similar synchronous communication request.
		*/
		public static final String KIND_CALL = "android.call";

		/**
		* @hide
		* Notification type: incoming direct message (SMS, instant message, etc.).
		*/
		public static final String KIND_MESSAGE = "android.message";

		/**
		* @hide
		* Notification type: asynchronous bulk message (email).
		*/
		public static final String KIND_EMAIL = "android.email";

		/**
		* @hide
		* Notification type: calendar event.
		*/
		public static final String KIND_EVENT = "android.event";
		@@ -415,6 +419,7 @@ public class Notification implements Parcelable
		public static final String KIND_PROMO = "android.promo";

		/**
		* @hide
		* If this notification matches of one or more special types (see the <code>KIND_*</code>
		* constants), add them here, best match first.
		*/
		@@ -977,8 +982,14 @@ public class Notification implements Parcelable
		}

		/**
		* Show the {@link Notification#when} field as a countdown (or count-up) timer instead of a timestamp.
		* Show the {@link Notification#when} field as a stopwatch.
		*
		* Instead of presenting <code>when</code> as a timestamp, the notification will show an
		* automatically updating display of the minutes and seconds since <code>when</code>.
		*
		* Useful when showing an elapsed time (like an ongoing phone call).
		*
		* @see android.widget.Chronometer
		* @see Notification#when
		*/
		public Builder setUsesChronometer(boolean b) {
		@@ -1303,6 +1314,8 @@ public class Notification implements Parcelable
		}

		/**
		* @hide
		*
		* Add a kind (category) to this notification. Optional.
		*
		* @see Notification#kind