Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7318a263 authored by Teng-Hui Zhu's avatar Teng-Hui Zhu Committed by android-build-merger
Browse files

Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev am: 68e5b960 

am: a9c417e8

* commit 'a9c417e8':
  API review: Hide ComplexColor and GradientColor
parents a35e36bb a9c417e8

api/current.txt

+3 −15
Original line number Diff line number Diff line
@@ -10114,27 +10114,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);










@@ -10238,11 +10233,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);










@@ -10302,7 +10292,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;










@@ -10338,7 +10327,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








@@ -10512,27 +10512,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);










@@ -10636,11 +10631,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);










@@ -10700,7 +10690,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;










@@ -10736,7 +10725,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








@@ -10124,27 +10124,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);










@@ -10248,11 +10243,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);










@@ -10312,7 +10302,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;










@@ -10348,7 +10337,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";