Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev (68e5b960) · Commits · e / os / android_frameworks_base

api/current.txt

+3 −15

Original line number	Diff line number	Diff line
		@@ -10101,27 +10101,22 @@ package android.content.res {
		method public final long skip(long) throws java.io.IOException;
		}

		public class ColorStateList extends android.content.res.ComplexColor implements android.os.Parcelable {
		public class ColorStateList implements android.os.Parcelable {
		ctor public ColorStateList(int[][], int[]);
		method public static deprecated android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int describeContents();
		method public int getChangingConfigurations();
		method public int getColorForState(int[], int);
		method public int getDefaultColor();
		method public boolean isOpaque();
		method public boolean isStateful();
		method public static android.content.res.ColorStateList valueOf(int);
		method public android.content.res.ColorStateList withAlpha(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.content.res.ColorStateList> CREATOR;
		}

		public abstract class ComplexColor {
		ctor public ComplexColor();
		method public int getChangingConfigurations();
		method public abstract int getDefaultColor();
		method public boolean isStateful();
		}

		public final class Configuration implements java.lang.Comparable android.os.Parcelable {
		ctor public Configuration();
		ctor public Configuration(android.content.res.Configuration);
		@@ -10225,11 +10220,6 @@ package android.content.res {
		field public int uiMode;
		}

		public class GradientColor extends android.content.res.ComplexColor {
		method public static android.content.res.GradientColor createFromXml(android.content.res.Resources, android.content.res.XmlResourceParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int getDefaultColor();
		}

		public class ObbInfo implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -10289,7 +10279,6 @@ package android.content.res {
		method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
		method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
		method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;
		method public android.content.res.ComplexColor loadComplexColor(android.util.TypedValue, int, android.content.res.Resources.Theme);
		method public final android.content.res.Resources.Theme newTheme();
		method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);
		method public android.content.res.TypedArray obtainTypedArray(int) throws android.content.res.Resources.NotFoundException;
		@@ -10325,7 +10314,6 @@ package android.content.res {
		method public int getChangingConfigurations();
		method public int getColor(int, int);
		method public android.content.res.ColorStateList getColorStateList(int);
		method public android.content.res.ComplexColor getComplexColor(int);
		method public float getDimension(int, float);
		method public int getDimensionPixelOffset(int, int);
		method public int getDimensionPixelSize(int, int);

api/system-current.txt

+3 −15

Original line number	Diff line number	Diff line
		@@ -10499,27 +10499,22 @@ package android.content.res {
		method public final long skip(long) throws java.io.IOException;
		}

		public class ColorStateList extends android.content.res.ComplexColor implements android.os.Parcelable {
		public class ColorStateList implements android.os.Parcelable {
		ctor public ColorStateList(int[][], int[]);
		method public static deprecated android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int describeContents();
		method public int getChangingConfigurations();
		method public int getColorForState(int[], int);
		method public int getDefaultColor();
		method public boolean isOpaque();
		method public boolean isStateful();
		method public static android.content.res.ColorStateList valueOf(int);
		method public android.content.res.ColorStateList withAlpha(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.content.res.ColorStateList> CREATOR;
		}

		public abstract class ComplexColor {
		ctor public ComplexColor();
		method public int getChangingConfigurations();
		method public abstract int getDefaultColor();
		method public boolean isStateful();
		}

		public final class Configuration implements java.lang.Comparable android.os.Parcelable {
		ctor public Configuration();
		ctor public Configuration(android.content.res.Configuration);
		@@ -10623,11 +10618,6 @@ package android.content.res {
		field public int uiMode;
		}

		public class GradientColor extends android.content.res.ComplexColor {
		method public static android.content.res.GradientColor createFromXml(android.content.res.Resources, android.content.res.XmlResourceParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int getDefaultColor();
		}

		public class ObbInfo implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -10687,7 +10677,6 @@ package android.content.res {
		method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
		method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
		method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;
		method public android.content.res.ComplexColor loadComplexColor(android.util.TypedValue, int, android.content.res.Resources.Theme);
		method public final android.content.res.Resources.Theme newTheme();
		method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);
		method public android.content.res.TypedArray obtainTypedArray(int) throws android.content.res.Resources.NotFoundException;
		@@ -10723,7 +10712,6 @@ package android.content.res {
		method public int getChangingConfigurations();
		method public int getColor(int, int);
		method public android.content.res.ColorStateList getColorStateList(int);
		method public android.content.res.ComplexColor getComplexColor(int);
		method public float getDimension(int, float);
		method public int getDimensionPixelOffset(int, int);
		method public int getDimensionPixelSize(int, int);

api/test-current.txt

+3 −15

Original line number	Diff line number	Diff line
		@@ -10111,27 +10111,22 @@ package android.content.res {
		method public final long skip(long) throws java.io.IOException;
		}

		public class ColorStateList extends android.content.res.ComplexColor implements android.os.Parcelable {
		public class ColorStateList implements android.os.Parcelable {
		ctor public ColorStateList(int[][], int[]);
		method public static deprecated android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public static android.content.res.ColorStateList createFromXml(android.content.res.Resources, org.xmlpull.v1.XmlPullParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int describeContents();
		method public int getChangingConfigurations();
		method public int getColorForState(int[], int);
		method public int getDefaultColor();
		method public boolean isOpaque();
		method public boolean isStateful();
		method public static android.content.res.ColorStateList valueOf(int);
		method public android.content.res.ColorStateList withAlpha(int);
		method public void writeToParcel(android.os.Parcel, int);
		field public static final android.os.Parcelable.Creator<android.content.res.ColorStateList> CREATOR;
		}

		public abstract class ComplexColor {
		ctor public ComplexColor();
		method public int getChangingConfigurations();
		method public abstract int getDefaultColor();
		method public boolean isStateful();
		}

		public final class Configuration implements java.lang.Comparable android.os.Parcelable {
		ctor public Configuration();
		ctor public Configuration(android.content.res.Configuration);
		@@ -10235,11 +10230,6 @@ package android.content.res {
		field public int uiMode;
		}

		public class GradientColor extends android.content.res.ComplexColor {
		method public static android.content.res.GradientColor createFromXml(android.content.res.Resources, android.content.res.XmlResourceParser, android.content.res.Resources.Theme) throws java.io.IOException, org.xmlpull.v1.XmlPullParserException;
		method public int getDefaultColor();
		}

		public class ObbInfo implements android.os.Parcelable {
		method public int describeContents();
		method public void writeToParcel(android.os.Parcel, int);
		@@ -10299,7 +10289,6 @@ package android.content.res {
		method public void getValue(java.lang.String, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
		method public void getValueForDensity(int, int, android.util.TypedValue, boolean) throws android.content.res.Resources.NotFoundException;
		method public android.content.res.XmlResourceParser getXml(int) throws android.content.res.Resources.NotFoundException;
		method public android.content.res.ComplexColor loadComplexColor(android.util.TypedValue, int, android.content.res.Resources.Theme);
		method public final android.content.res.Resources.Theme newTheme();
		method public android.content.res.TypedArray obtainAttributes(android.util.AttributeSet, int[]);
		method public android.content.res.TypedArray obtainTypedArray(int) throws android.content.res.Resources.NotFoundException;
		@@ -10335,7 +10324,6 @@ package android.content.res {
		method public int getChangingConfigurations();
		method public int getColor(int, int);
		method public android.content.res.ColorStateList getColorStateList(int);
		method public android.content.res.ComplexColor getComplexColor(int);
		method public float getDimension(int, float);
		method public int getDimensionPixelOffset(int, int);
		method public int getDimensionPixelSize(int, int);

core/java/android/content/res/ComplexColor.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -23,6 +23,7 @@ import android.graphics.Color;
		/**
		* Defines an abstract class for the complex color information, like
		* {@link android.content.res.ColorStateList} or {@link android.content.res.GradientColor}
		* @hide
		*/
		public abstract class ComplexColor {
		private int mChangingConfigurations;

core/java/android/content/res/GradientColor.java

+1 −0

Original line number	Diff line number	Diff line
		@@ -68,6 +68,7 @@ import java.lang.annotation.RetentionPolicy;
		*
		* Also note if any color "item" element is defined, then startColor, centerColor and endColor will
		* be ignored.
		* @hide
		*/
		public class GradientColor extends ComplexColor {
		private static final String TAG = "GradientColor";