Merge "Clarify FLAG_BUBBLE semantics." into qt-dev (e9e58774) · Commits · e / os / android_frameworks_base

core/java/android/app/Notification.java

+7 −5

Original line number	Original line	Diff line number	Diff line
	@@ -618,11 +618,13 @@ public class Notification implements Parcelable
	public static final int FLAG_CAN_COLORIZE = 0x00000800;		public static final int FLAG_CAN_COLORIZE = 0x00000800;

	/**		/**
	* Bit to be bitswised-ored into the {@link #flags} field that should be set if this		* Bit to be bitswised-ored into the {@link #flags} field that should be
	* notification is showing as a bubble. This will be set by the system if it is determined		* set by the system if this notification is showing as a bubble.
	* that your notification is allowed to be a bubble.
	*		*
	* @see {@link Notification.Builder#setBubbleMetadata(BubbleMetadata)}		* Applications cannot set this flag directly; they should instead call
			* {@link Notification.Builder#setBubbleMetadata(BubbleMetadata)} to
			* request that a notification be displayed as a bubble, and then check
			* this flag to see whether that request was honored by the system.
	*/		*/
	public static final int FLAG_BUBBLE = 0x00001000;		public static final int FLAG_BUBBLE = 0x00001000;

	@@ -6253,7 +6255,7 @@ public class Notification implements Parcelable
	}		}

	/**		/**
	* @return true if this is a notification that can show as a bubble.		* @return true if this notification is showing as a bubble
	*		*
	* @hide		* @hide
	*/		*/