From f7e38f301ce48e28fa817d3db3e930e8143edd17 Mon Sep 17 00:00:00 2001 From: John Reck Date: Thu, 17 Sep 2020 16:22:36 -0700 Subject: [PATCH] Expose ParcelableColorSpace Bug: 148412652 Test: ParcelableColorSpaceTest CTS Change-Id: I3749fe903b2644b8a0d1e44893ee38a0b0a4e0a1 --- api/current.txt | 14 ++++++++++++++ .../android/graphics/ParcelableColorSpace.java | 2 -- non-updatable-api/current.txt | 14 ++++++++++++++ 3 files changed, 28 insertions(+), 2 deletions(-) diff --git a/api/current.txt b/api/current.txt index 922e89c3efd9f..b270c8318eca1 100644 --- a/api/current.txt +++ b/api/current.txt @@ -15187,6 +15187,20 @@ package android.graphics { ctor public PaintFlagsDrawFilter(int, int); } + public final class ParcelableColorSpace extends android.graphics.ColorSpace implements android.os.Parcelable { + ctor public ParcelableColorSpace(@NonNull android.graphics.ColorSpace); + method public int describeContents(); + method @NonNull public float[] fromXyz(@NonNull float[]); + method @NonNull public android.graphics.ColorSpace getColorSpace(); + method public float getMaxValue(int); + method public float getMinValue(int); + method public static boolean isParcelable(@NonNull android.graphics.ColorSpace); + method public boolean isWideGamut(); + method @NonNull public float[] toXyz(@NonNull float[]); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator CREATOR; + } + public class Path { ctor public Path(); ctor public Path(@Nullable android.graphics.Path); diff --git a/graphics/java/android/graphics/ParcelableColorSpace.java b/graphics/java/android/graphics/ParcelableColorSpace.java index f9033a53d7e60..d408ac3718ca9 100644 --- a/graphics/java/android/graphics/ParcelableColorSpace.java +++ b/graphics/java/android/graphics/ParcelableColorSpace.java @@ -25,8 +25,6 @@ import android.os.Parcelable; * A {@link Parcelable} {@link ColorSpace}. In order to enable parceling, the ColorSpace * must be either a {@link ColorSpace.Named Named} ColorSpace or a {@link ColorSpace.Rgb} instance * that has an ICC parametric transfer function as returned by {@link Rgb#getTransferParameters()}. - * TODO: Make public - * @hide */ public final class ParcelableColorSpace extends ColorSpace implements Parcelable { private final ColorSpace mColorSpace; diff --git a/non-updatable-api/current.txt b/non-updatable-api/current.txt index 8a2976fb9e852..d489c20c434da 100644 --- a/non-updatable-api/current.txt +++ b/non-updatable-api/current.txt @@ -15169,6 +15169,20 @@ package android.graphics { ctor public PaintFlagsDrawFilter(int, int); } + public final class ParcelableColorSpace extends android.graphics.ColorSpace implements android.os.Parcelable { + ctor public ParcelableColorSpace(@NonNull android.graphics.ColorSpace); + method public int describeContents(); + method @NonNull public float[] fromXyz(@NonNull float[]); + method @NonNull public android.graphics.ColorSpace getColorSpace(); + method public float getMaxValue(int); + method public float getMinValue(int); + method public static boolean isParcelable(@NonNull android.graphics.ColorSpace); + method public boolean isWideGamut(); + method @NonNull public float[] toXyz(@NonNull float[]); + method public void writeToParcel(@NonNull android.os.Parcel, int); + field @NonNull public static final android.os.Parcelable.Creator CREATOR; + } + public class Path { ctor public Path(); ctor public Path(@Nullable android.graphics.Path);