Merge "Remove old slice APIs for color" (d71d0fc5) · Commits · e / os / android_frameworks_base

api/current.txt

+0 −4

Original line number	Diff line number	Diff line
		@@ -7128,8 +7128,6 @@ package android.app.slice {
		method public android.app.slice.Slice.Builder addAction(android.app.PendingIntent, android.app.slice.Slice, java.lang.String);
		method public android.app.slice.Slice.Builder addBundle(android.os.Bundle, java.lang.String, java.lang.String...);
		method public android.app.slice.Slice.Builder addBundle(android.os.Bundle, java.lang.String, java.util.List<java.lang.String>);
		method public deprecated android.app.slice.Slice.Builder addColor(int, java.lang.String, java.lang.String...);
		method public deprecated android.app.slice.Slice.Builder addColor(int, java.lang.String, java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addHints(java.lang.String...);
		method public android.app.slice.Slice.Builder addHints(java.util.List<java.lang.String>);
		method public android.app.slice.Slice.Builder addIcon(android.graphics.drawable.Icon, java.lang.String, java.lang.String...);
		@@ -7152,7 +7150,6 @@ package android.app.slice {
		method public int describeContents();
		method public android.app.PendingIntent getAction();
		method public android.os.Bundle getBundle();
		method public deprecated int getColor();
		method public java.lang.String getFormat();
		method public java.util.List<java.lang.String> getHints();
		method public android.graphics.drawable.Icon getIcon();
		@@ -7167,7 +7164,6 @@ package android.app.slice {
		field public static final android.os.Parcelable.Creator<android.app.slice.SliceItem> CREATOR;
		field public static final java.lang.String FORMAT_ACTION = "action";
		field public static final java.lang.String FORMAT_BUNDLE = "bundle";
		field public static final deprecated java.lang.String FORMAT_COLOR = "color";
		field public static final java.lang.String FORMAT_IMAGE = "image";
		field public static final java.lang.String FORMAT_INT = "int";
		field public static final java.lang.String FORMAT_REMOTE_INPUT = "input";

core/java/android/app/slice/Slice.java

+0 −22

Original line number	Diff line number	Diff line
		@@ -425,28 +425,6 @@ public final class Slice implements Parcelable {
		return this;
		}

		/**
		* Add a color to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @deprecated will be removed once supportlib updates
		*/
		public Builder addColor(int color, @Nullable String subType, @SliceHint String... hints) {
		mItems.add(new SliceItem(color, SliceItem.FORMAT_INT, subType, hints));
		return this;
		}

		/**
		* Add a color to the slice being constructed
		* @param subType Optional template-specific type information
		* @see {@link SliceItem#getSubType()}
		* @deprecated will be removed once supportlib updates
		*/
		public Builder addColor(int color, @Nullable String subType,
		@SliceHint List<String> hints) {
		return addColor(color, subType, hints.toArray(new String[hints.size()]));
		}

		/**
		* Add a color to the slice being constructed
		* @param subType Optional template-specific type information

core/java/android/app/slice/SliceItem.java

+0 −12

Original line number	Diff line number	Diff line
		@@ -97,11 +97,6 @@ public final class SliceItem implements Parcelable {
		* A {@link SliceItem} that contains an int.
		*/
		public static final String FORMAT_INT = "int";
		/**
		* A {@link SliceItem} that contains an int.
		* @deprecated to be removed
		*/
		public static final String FORMAT_COLOR = "color";
		/**
		* A {@link SliceItem} that contains a timestamp.
		*/
		@@ -230,13 +225,6 @@ public final class SliceItem implements Parcelable {
		return (Integer) mObj;
		}

		/**
		* @deprecated to be removed.
		*/
		public int getColor() {
		return (Integer) mObj;
		}

		/**
		* @return The slice held by this {@link #FORMAT_ACTION} or {@link #FORMAT_SLICE} SliceItem
		*/