diff options
| author | Tenghui Zhu <ztenghui@google.com> | 2016-03-21 18:19:52 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-03-21 18:19:54 +0000 |
| commit | 68e5b9601a9730dfccc5ce8412be3fbe087a3bfc (patch) | |
| tree | d25af3a1e0c383167f3514ccec0d3d03b91b87f9 /core/java | |
| parent | 104138198feffc8ef5069c16c210eb8684bf8662 (diff) | |
| parent | e03c469fd416cf68c9d27268140f058028cd8666 (diff) | |
Merge "API review: Hide ComplexColor and GradientColor" into nyc-dev
Diffstat (limited to 'core/java')
| -rw-r--r-- | core/java/android/content/res/ComplexColor.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/res/GradientColor.java | 1 | ||||
| -rw-r--r-- | core/java/android/content/res/Resources.java | 3 | ||||
| -rw-r--r-- | core/java/android/content/res/TypedArray.java | 1 |
4 files changed, 6 insertions, 0 deletions
diff --git a/core/java/android/content/res/ComplexColor.java b/core/java/android/content/res/ComplexColor.java index b297764629cf..58c6fc5174d3 100644 --- a/core/java/android/content/res/ComplexColor.java +++ b/core/java/android/content/res/ComplexColor.java @@ -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; diff --git a/core/java/android/content/res/GradientColor.java b/core/java/android/content/res/GradientColor.java index f29656abe6c3..c49c4b28a413 100644 --- a/core/java/android/content/res/GradientColor.java +++ b/core/java/android/content/res/GradientColor.java @@ -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"; diff --git a/core/java/android/content/res/Resources.java b/core/java/android/content/res/Resources.java index fb706fcb3c94..387fda717e48 100644 --- a/core/java/android/content/res/Resources.java +++ b/core/java/android/content/res/Resources.java @@ -999,6 +999,9 @@ public class Resources { return mResourcesImpl.loadColorStateList(this, value, id, theme); } + /** + * @hide + */ @Nullable public ComplexColor loadComplexColor(@NonNull TypedValue value, int id, @Nullable Theme theme) { return mResourcesImpl.loadComplexColor(this, value, id, theme); diff --git a/core/java/android/content/res/TypedArray.java b/core/java/android/content/res/TypedArray.java index f6ac0bac125a..92134ee01de8 100644 --- a/core/java/android/content/res/TypedArray.java +++ b/core/java/android/content/res/TypedArray.java @@ -475,6 +475,7 @@ public class TypedArray { * been recycled. * @throws UnsupportedOperationException if the attribute is defined but is * not an integer color, color state list or GradientColor. + * @hide */ @Nullable public ComplexColor getComplexColor(@StyleableRes int index) { |