Merge "Deprecate unnecessairy Notification.Style constructors" into nyc-dev... (8406ea9c) · Commits · e / os / android_frameworks_base

api/current.txt

+4 −6

Original line number	Diff line number	Diff line
		@@ -5050,7 +5050,7 @@ package android.app {

		public static class Notification.BigPictureStyle extends android.app.Notification.Style {
		ctor public Notification.BigPictureStyle();
		ctor public Notification.BigPictureStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.BigPictureStyle(android.app.Notification.Builder);
		method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap);
		method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.drawable.Icon);
		method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap);
		@@ -5060,7 +5060,7 @@ package android.app {

		public static class Notification.BigTextStyle extends android.app.Notification.Style {
		ctor public Notification.BigTextStyle();
		ctor public Notification.BigTextStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.BigTextStyle(android.app.Notification.Builder);
		method public android.app.Notification.BigTextStyle bigText(java.lang.CharSequence);
		method public android.app.Notification.BigTextStyle setBigContentTitle(java.lang.CharSequence);
		method public android.app.Notification.BigTextStyle setSummaryText(java.lang.CharSequence);
		@@ -5161,12 +5161,10 @@ package android.app {

		public static class Notification.DecoratedCustomViewStyle extends android.app.Notification.Style {
		ctor public Notification.DecoratedCustomViewStyle();
		ctor public Notification.DecoratedCustomViewStyle(android.app.Notification.Builder);
		}

		public static class Notification.DecoratedMediaCustomViewStyle extends android.app.Notification.MediaStyle {
		ctor public Notification.DecoratedMediaCustomViewStyle();
		ctor public Notification.DecoratedMediaCustomViewStyle(android.app.Notification.Builder);
		}

		public static abstract interface Notification.Extender {
		@@ -5175,7 +5173,7 @@ package android.app {

		public static class Notification.InboxStyle extends android.app.Notification.Style {
		ctor public Notification.InboxStyle();
		ctor public Notification.InboxStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.InboxStyle(android.app.Notification.Builder);
		method public android.app.Notification.InboxStyle addLine(java.lang.CharSequence);
		method public android.app.Notification.InboxStyle setBigContentTitle(java.lang.CharSequence);
		method public android.app.Notification.InboxStyle setSummaryText(java.lang.CharSequence);
		@@ -5183,7 +5181,7 @@ package android.app {

		public static class Notification.MediaStyle extends android.app.Notification.Style {
		ctor public Notification.MediaStyle();
		ctor public Notification.MediaStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.MediaStyle(android.app.Notification.Builder);
		method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token);
		method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
		}

api/system-current.txt

+4 −6

Original line number	Diff line number	Diff line
		@@ -5197,7 +5197,7 @@ package android.app {

		public static class Notification.BigPictureStyle extends android.app.Notification.Style {
		ctor public Notification.BigPictureStyle();
		ctor public Notification.BigPictureStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.BigPictureStyle(android.app.Notification.Builder);
		method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap);
		method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.drawable.Icon);
		method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap);
		@@ -5207,7 +5207,7 @@ package android.app {

		public static class Notification.BigTextStyle extends android.app.Notification.Style {
		ctor public Notification.BigTextStyle();
		ctor public Notification.BigTextStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.BigTextStyle(android.app.Notification.Builder);
		method public android.app.Notification.BigTextStyle bigText(java.lang.CharSequence);
		method public android.app.Notification.BigTextStyle setBigContentTitle(java.lang.CharSequence);
		method public android.app.Notification.BigTextStyle setSummaryText(java.lang.CharSequence);
		@@ -5308,12 +5308,10 @@ package android.app {

		public static class Notification.DecoratedCustomViewStyle extends android.app.Notification.Style {
		ctor public Notification.DecoratedCustomViewStyle();
		ctor public Notification.DecoratedCustomViewStyle(android.app.Notification.Builder);
		}

		public static class Notification.DecoratedMediaCustomViewStyle extends android.app.Notification.MediaStyle {
		ctor public Notification.DecoratedMediaCustomViewStyle();
		ctor public Notification.DecoratedMediaCustomViewStyle(android.app.Notification.Builder);
		}

		public static abstract interface Notification.Extender {
		@@ -5322,7 +5320,7 @@ package android.app {

		public static class Notification.InboxStyle extends android.app.Notification.Style {
		ctor public Notification.InboxStyle();
		ctor public Notification.InboxStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.InboxStyle(android.app.Notification.Builder);
		method public android.app.Notification.InboxStyle addLine(java.lang.CharSequence);
		method public android.app.Notification.InboxStyle setBigContentTitle(java.lang.CharSequence);
		method public android.app.Notification.InboxStyle setSummaryText(java.lang.CharSequence);
		@@ -5330,7 +5328,7 @@ package android.app {

		public static class Notification.MediaStyle extends android.app.Notification.Style {
		ctor public Notification.MediaStyle();
		ctor public Notification.MediaStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.MediaStyle(android.app.Notification.Builder);
		method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token);
		method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
		}

api/test-current.txt

+4 −6

Original line number	Diff line number	Diff line
		@@ -5051,7 +5051,7 @@ package android.app {

		public static class Notification.BigPictureStyle extends android.app.Notification.Style {
		ctor public Notification.BigPictureStyle();
		ctor public Notification.BigPictureStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.BigPictureStyle(android.app.Notification.Builder);
		method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.Bitmap);
		method public android.app.Notification.BigPictureStyle bigLargeIcon(android.graphics.drawable.Icon);
		method public android.app.Notification.BigPictureStyle bigPicture(android.graphics.Bitmap);
		@@ -5061,7 +5061,7 @@ package android.app {

		public static class Notification.BigTextStyle extends android.app.Notification.Style {
		ctor public Notification.BigTextStyle();
		ctor public Notification.BigTextStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.BigTextStyle(android.app.Notification.Builder);
		method public android.app.Notification.BigTextStyle bigText(java.lang.CharSequence);
		method public android.app.Notification.BigTextStyle setBigContentTitle(java.lang.CharSequence);
		method public android.app.Notification.BigTextStyle setSummaryText(java.lang.CharSequence);
		@@ -5162,12 +5162,10 @@ package android.app {

		public static class Notification.DecoratedCustomViewStyle extends android.app.Notification.Style {
		ctor public Notification.DecoratedCustomViewStyle();
		ctor public Notification.DecoratedCustomViewStyle(android.app.Notification.Builder);
		}

		public static class Notification.DecoratedMediaCustomViewStyle extends android.app.Notification.MediaStyle {
		ctor public Notification.DecoratedMediaCustomViewStyle();
		ctor public Notification.DecoratedMediaCustomViewStyle(android.app.Notification.Builder);
		}

		public static abstract interface Notification.Extender {
		@@ -5176,7 +5174,7 @@ package android.app {

		public static class Notification.InboxStyle extends android.app.Notification.Style {
		ctor public Notification.InboxStyle();
		ctor public Notification.InboxStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.InboxStyle(android.app.Notification.Builder);
		method public android.app.Notification.InboxStyle addLine(java.lang.CharSequence);
		method public android.app.Notification.InboxStyle setBigContentTitle(java.lang.CharSequence);
		method public android.app.Notification.InboxStyle setSummaryText(java.lang.CharSequence);
		@@ -5184,7 +5182,7 @@ package android.app {

		public static class Notification.MediaStyle extends android.app.Notification.Style {
		ctor public Notification.MediaStyle();
		ctor public Notification.MediaStyle(android.app.Notification.Builder);
		ctor public deprecated Notification.MediaStyle(android.app.Notification.Builder);
		method public android.app.Notification.MediaStyle setMediaSession(android.media.session.MediaSession.Token);
		method public android.app.Notification.MediaStyle setShowActionsInCompactView(int...);
		}

core/java/android/app/Notification.java

+16 −8

Original line number	Diff line number	Diff line
		@@ -4087,6 +4087,10 @@ public class Notification implements Parcelable
		public BigPictureStyle() {
		}

		/**
		* @deprecated use {@code BigPictureStyle()}.
		*/
		@Deprecated
		public BigPictureStyle(Builder builder) {
		setBuilder(builder);
		}
		@@ -4243,6 +4247,10 @@ public class Notification implements Parcelable
		public BigTextStyle() {
		}

		/**
		* @deprecated use {@code BigTextStyle()}.
		*/
		@Deprecated
		public BigTextStyle(Builder builder) {
		setBuilder(builder);
		}
		@@ -4785,6 +4793,10 @@ public class Notification implements Parcelable
		public InboxStyle() {
		}

		/**
		* @deprecated use {@code InboxStyle()}.
		*/
		@Deprecated
		public InboxStyle(Builder builder) {
		setBuilder(builder);
		}
		@@ -4957,6 +4969,10 @@ public class Notification implements Parcelable
		public MediaStyle() {
		}

		/**
		* @deprecated use {@code MediaStyle()}.
		*/
		@Deprecated
		public MediaStyle(Builder builder) {
		setBuilder(builder);
		}
		@@ -5164,10 +5180,6 @@ public class Notification implements Parcelable
		public DecoratedCustomViewStyle() {
		}

		public DecoratedCustomViewStyle(Builder builder) {
		setBuilder(builder);
		}

		/**
		* @hide
		*/
		@@ -5284,10 +5296,6 @@ public class Notification implements Parcelable
		public DecoratedMediaCustomViewStyle() {
		}

		public DecoratedMediaCustomViewStyle(Builder builder) {
		setBuilder(builder);
		}

		/**
		* @hide
		*/