Merge "Adds support for MessagingStyle" into nyc-dev (52546b01) · Commits · e / os / android_frameworks_base

api/current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -4915,6 +4915,7 @@ package android.app {
		field public static final int DEFAULT_LIGHTS = 4; // 0x4
		field public static final int DEFAULT_SOUND = 1; // 0x1
		field public static final int DEFAULT_VIBRATE = 2; // 0x2
		field public static final java.lang.String EXTRA_ALLOW_GENERATED_REPLIES = "android.allowGeneratedReplies";
		field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
		field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";
		field public static final java.lang.String EXTRA_CHRONOMETER_COUNTS_DOWN = "android.chronometerCountsDown";
		@@ -4923,12 +4924,14 @@ package android.app {
		field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";
		field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";
		field public static final java.lang.String EXTRA_MEDIA_SESSION = "android.mediaSession";
		field public static final java.lang.String EXTRA_MESSAGES = "android.messages";
		field public static final java.lang.String EXTRA_PEOPLE = "android.people";
		field public static final java.lang.String EXTRA_PICTURE = "android.picture";
		field public static final java.lang.String EXTRA_PROGRESS = "android.progress";
		field public static final java.lang.String EXTRA_PROGRESS_INDETERMINATE = "android.progressIndeterminate";
		field public static final java.lang.String EXTRA_PROGRESS_MAX = "android.progressMax";
		field public static final java.lang.String EXTRA_REMOTE_INPUT_HISTORY = "android.remoteInputHistory";
		field public static final java.lang.String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";
		field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";
		field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";
		field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";
		@@ -4937,6 +4940,7 @@ package android.app {
		field public static final java.lang.String EXTRA_TEMPLATE = "android.template";
		field public static final java.lang.String EXTRA_TEXT = "android.text";
		field public static final java.lang.String EXTRA_TEXT_LINES = "android.textLines";
		field public static final java.lang.String EXTRA_THREAD_TITLE = "android.threadTitle";
		field public static final java.lang.String EXTRA_TITLE = "android.title";
		field public static final java.lang.String EXTRA_TITLE_BIG = "android.title.big";
		field public static final int FLAG_AUTO_CANCEL = 16; // 0x10
		@@ -5176,6 +5180,32 @@ package android.app {
		method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
		}

		public static class Notification.MessagingStyle extends android.app.Notification.Style {
		ctor public Notification.MessagingStyle(java.lang.CharSequence);
		method public android.app.Notification.MessagingStyle addMessage(java.lang.CharSequence, long, java.lang.CharSequence);
		method public android.app.Notification.MessagingStyle addMessage(android.app.Notification.MessagingStyle.Message);
		method public boolean getAllowGeneratedReplies();
		method public java.lang.CharSequence getConversationTitle();
		method public java.util.List<android.app.Notification.MessagingStyle.Message> getMessages();
		method public java.lang.CharSequence getUserDisplayName();
		method public android.app.Notification.MessagingStyle setAllowGeneratedReplies(boolean);
		method public android.app.Notification.MessagingStyle setConversationTitle(java.lang.CharSequence);
		field public static final int MAXIMUM_RETAINED_MESSAGES = 25; // 0x19
		}

		public static final class Notification.MessagingStyle.Message implements android.os.Parcelable {
		ctor public Notification.MessagingStyle.Message(java.lang.CharSequence, long, java.lang.CharSequence);
		method public int describeContents();
		method public java.lang.String getDataMimeType();
		method public android.net.Uri getDataUri();
		method public java.lang.CharSequence getSender();
		method public java.lang.CharSequence getText();
		method public long getTimestamp();
		method public android.app.Notification.MessagingStyle.Message setData(java.lang.String, android.net.Uri);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.Notification.MessagingStyle.Message> CREATOR;
		}

		public static abstract class Notification.Style {
		ctor public Notification.Style();
		method public android.app.Notification build();

api/system-current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -5048,6 +5048,7 @@ package android.app {
		field public static final int DEFAULT_LIGHTS = 4; // 0x4
		field public static final int DEFAULT_SOUND = 1; // 0x1
		field public static final int DEFAULT_VIBRATE = 2; // 0x2
		field public static final java.lang.String EXTRA_ALLOW_GENERATED_REPLIES = "android.allowGeneratedReplies";
		field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
		field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";
		field public static final java.lang.String EXTRA_CHRONOMETER_COUNTS_DOWN = "android.chronometerCountsDown";
		@@ -5056,12 +5057,14 @@ package android.app {
		field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";
		field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";
		field public static final java.lang.String EXTRA_MEDIA_SESSION = "android.mediaSession";
		field public static final java.lang.String EXTRA_MESSAGES = "android.messages";
		field public static final java.lang.String EXTRA_PEOPLE = "android.people";
		field public static final java.lang.String EXTRA_PICTURE = "android.picture";
		field public static final java.lang.String EXTRA_PROGRESS = "android.progress";
		field public static final java.lang.String EXTRA_PROGRESS_INDETERMINATE = "android.progressIndeterminate";
		field public static final java.lang.String EXTRA_PROGRESS_MAX = "android.progressMax";
		field public static final java.lang.String EXTRA_REMOTE_INPUT_HISTORY = "android.remoteInputHistory";
		field public static final java.lang.String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";
		field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";
		field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";
		field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";
		@@ -5070,6 +5073,7 @@ package android.app {
		field public static final java.lang.String EXTRA_TEMPLATE = "android.template";
		field public static final java.lang.String EXTRA_TEXT = "android.text";
		field public static final java.lang.String EXTRA_TEXT_LINES = "android.textLines";
		field public static final java.lang.String EXTRA_THREAD_TITLE = "android.threadTitle";
		field public static final java.lang.String EXTRA_TITLE = "android.title";
		field public static final java.lang.String EXTRA_TITLE_BIG = "android.title.big";
		field public static final int FLAG_AUTO_CANCEL = 16; // 0x10
		@@ -5309,6 +5313,32 @@ package android.app {
		method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
		}

		public static class Notification.MessagingStyle extends android.app.Notification.Style {
		ctor public Notification.MessagingStyle(java.lang.CharSequence);
		method public android.app.Notification.MessagingStyle addMessage(java.lang.CharSequence, long, java.lang.CharSequence);
		method public android.app.Notification.MessagingStyle addMessage(android.app.Notification.MessagingStyle.Message);
		method public boolean getAllowGeneratedReplies();
		method public java.lang.CharSequence getConversationTitle();
		method public java.util.List<android.app.Notification.MessagingStyle.Message> getMessages();
		method public java.lang.CharSequence getUserDisplayName();
		method public android.app.Notification.MessagingStyle setAllowGeneratedReplies(boolean);
		method public android.app.Notification.MessagingStyle setConversationTitle(java.lang.CharSequence);
		field public static final int MAXIMUM_RETAINED_MESSAGES = 25; // 0x19
		}

		public static final class Notification.MessagingStyle.Message implements android.os.Parcelable {
		ctor public Notification.MessagingStyle.Message(java.lang.CharSequence, long, java.lang.CharSequence);
		method public int describeContents();
		method public java.lang.String getDataMimeType();
		method public android.net.Uri getDataUri();
		method public java.lang.CharSequence getSender();
		method public java.lang.CharSequence getText();
		method public long getTimestamp();
		method public android.app.Notification.MessagingStyle.Message setData(java.lang.String, android.net.Uri);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.Notification.MessagingStyle.Message> CREATOR;
		}

		public static abstract class Notification.Style {
		ctor public Notification.Style();
		method public android.app.Notification build();

api/test-current.txt

+30 −0

Original line number	Diff line number	Diff line
		@@ -4915,6 +4915,7 @@ package android.app {
		field public static final int DEFAULT_LIGHTS = 4; // 0x4
		field public static final int DEFAULT_SOUND = 1; // 0x1
		field public static final int DEFAULT_VIBRATE = 2; // 0x2
		field public static final java.lang.String EXTRA_ALLOW_GENERATED_REPLIES = "android.allowGeneratedReplies";
		field public static final java.lang.String EXTRA_BACKGROUND_IMAGE_URI = "android.backgroundImageUri";
		field public static final java.lang.String EXTRA_BIG_TEXT = "android.bigText";
		field public static final java.lang.String EXTRA_CHRONOMETER_COUNTS_DOWN = "android.chronometerCountsDown";
		@@ -4923,12 +4924,14 @@ package android.app {
		field public static final java.lang.String EXTRA_LARGE_ICON = "android.largeIcon";
		field public static final java.lang.String EXTRA_LARGE_ICON_BIG = "android.largeIcon.big";
		field public static final java.lang.String EXTRA_MEDIA_SESSION = "android.mediaSession";
		field public static final java.lang.String EXTRA_MESSAGES = "android.messages";
		field public static final java.lang.String EXTRA_PEOPLE = "android.people";
		field public static final java.lang.String EXTRA_PICTURE = "android.picture";
		field public static final java.lang.String EXTRA_PROGRESS = "android.progress";
		field public static final java.lang.String EXTRA_PROGRESS_INDETERMINATE = "android.progressIndeterminate";
		field public static final java.lang.String EXTRA_PROGRESS_MAX = "android.progressMax";
		field public static final java.lang.String EXTRA_REMOTE_INPUT_HISTORY = "android.remoteInputHistory";
		field public static final java.lang.String EXTRA_SELF_DISPLAY_NAME = "android.selfDisplayName";
		field public static final java.lang.String EXTRA_SHOW_CHRONOMETER = "android.showChronometer";
		field public static final java.lang.String EXTRA_SHOW_WHEN = "android.showWhen";
		field public static final java.lang.String EXTRA_SMALL_ICON = "android.icon";
		@@ -4937,6 +4940,7 @@ package android.app {
		field public static final java.lang.String EXTRA_TEMPLATE = "android.template";
		field public static final java.lang.String EXTRA_TEXT = "android.text";
		field public static final java.lang.String EXTRA_TEXT_LINES = "android.textLines";
		field public static final java.lang.String EXTRA_THREAD_TITLE = "android.threadTitle";
		field public static final java.lang.String EXTRA_TITLE = "android.title";
		field public static final java.lang.String EXTRA_TITLE_BIG = "android.title.big";
		field public static final int FLAG_AUTO_CANCEL = 16; // 0x10
		@@ -5176,6 +5180,32 @@ package android.app {
		method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
		}

		public static class Notification.MessagingStyle extends android.app.Notification.Style {
		ctor public Notification.MessagingStyle(java.lang.CharSequence);
		method public android.app.Notification.MessagingStyle addMessage(java.lang.CharSequence, long, java.lang.CharSequence);
		method public android.app.Notification.MessagingStyle addMessage(android.app.Notification.MessagingStyle.Message);
		method public boolean getAllowGeneratedReplies();
		method public java.lang.CharSequence getConversationTitle();
		method public java.util.List<android.app.Notification.MessagingStyle.Message> getMessages();
		method public java.lang.CharSequence getUserDisplayName();
		method public android.app.Notification.MessagingStyle setAllowGeneratedReplies(boolean);
		method public android.app.Notification.MessagingStyle setConversationTitle(java.lang.CharSequence);
		field public static final int MAXIMUM_RETAINED_MESSAGES = 25; // 0x19
		}

		public static final class Notification.MessagingStyle.Message implements android.os.Parcelable {
		ctor public Notification.MessagingStyle.Message(java.lang.CharSequence, long, java.lang.CharSequence);
		method public int describeContents();
		method public java.lang.String getDataMimeType();
		method public android.net.Uri getDataUri();
		method public java.lang.CharSequence getSender();
		method public java.lang.CharSequence getText();
		method public long getTimestamp();
		method public android.app.Notification.MessagingStyle.Message setData(java.lang.String, android.net.Uri);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.app.Notification.MessagingStyle.Message> CREATOR;
		}

		public static abstract class Notification.Style {
		ctor public Notification.Style();
		method public android.app.Notification build();

core/java/android/app/Notification.java

+374 −1

File changed.

Preview size limit exceeded, changes collapsed.