From 9ebe36c305c736efca2d9dbb41f5c9c362793806 Mon Sep 17 00:00:00 2001 From: Mathew Inwood Date: Tue, 31 Jul 2018 14:21:52 +0100 Subject: Add @UnsupportedAppUsage annotations For packages: android.graphics android.graphics.drawable android.graphics.drawable.shapes android.graphics.fonts android.graphics.pdf This is an automatically generated CL. See go/UnsupportedAppUsage for more details. Exempted-From-Owner-Approval: Mechanical changes to the codebase which have been approved by Android API council and announced on android-eng@ Bug: 110868826 Test: m Merged-In: I7fc1162d2c63df8751a4660607e8ce72070efed8 Change-Id: I5d7739d2d1fc7bb12ee059bcc2a9ac9017ca35fb --- graphics/java/android/graphics/BaseCanvas.java | 2 ++ graphics/java/android/graphics/Bitmap.java | 18 ++++++++++++++++ graphics/java/android/graphics/BitmapFactory.java | 5 +++++ .../java/android/graphics/BitmapRegionDecoder.java | 3 +++ graphics/java/android/graphics/BitmapShader.java | 4 ++++ graphics/java/android/graphics/Camera.java | 3 +++ graphics/java/android/graphics/Canvas.java | 9 ++++++++ graphics/java/android/graphics/CanvasProperty.java | 3 +++ .../android/graphics/ColorMatrixColorFilter.java | 3 +++ graphics/java/android/graphics/FontFamily.java | 6 ++++++ graphics/java/android/graphics/GraphicBuffer.java | 5 +++++ graphics/java/android/graphics/ImageFormat.java | 3 +++ .../java/android/graphics/LightingColorFilter.java | 3 +++ graphics/java/android/graphics/LinearGradient.java | 10 +++++++++ graphics/java/android/graphics/Matrix.java | 3 +++ graphics/java/android/graphics/Movie.java | 3 +++ graphics/java/android/graphics/NinePatch.java | 5 +++++ graphics/java/android/graphics/Outline.java | 2 ++ graphics/java/android/graphics/Paint.java | 8 ++++++++ graphics/java/android/graphics/Path.java | 3 +++ graphics/java/android/graphics/Picture.java | 2 ++ graphics/java/android/graphics/PorterDuff.java | 3 +++ .../android/graphics/PorterDuffColorFilter.java | 3 +++ graphics/java/android/graphics/RadialGradient.java | 9 ++++++++ graphics/java/android/graphics/Rect.java | 3 +++ graphics/java/android/graphics/Region.java | 6 ++++++ graphics/java/android/graphics/Shader.java | 2 ++ graphics/java/android/graphics/SurfaceTexture.java | 7 +++++++ graphics/java/android/graphics/SweepGradient.java | 7 +++++++ .../java/android/graphics/TableMaskFilter.java | 3 +++ .../java/android/graphics/TemporaryBuffer.java | 3 +++ graphics/java/android/graphics/Typeface.java | 11 ++++++++++ graphics/java/android/graphics/Xfermode.java | 3 +++ .../graphics/drawable/AnimatedRotateDrawable.java | 3 +++ .../drawable/AnimatedStateListDrawable.java | 4 ++++ .../graphics/drawable/AnimatedVectorDrawable.java | 5 +++++ .../graphics/drawable/AnimationDrawable.java | 2 ++ .../android/graphics/drawable/BitmapDrawable.java | 6 ++++++ .../android/graphics/drawable/ClipDrawable.java | 2 ++ .../android/graphics/drawable/ColorDrawable.java | 3 +++ .../java/android/graphics/drawable/Drawable.java | 7 +++++++ .../graphics/drawable/DrawableContainer.java | 7 +++++++ .../graphics/drawable/DrawableInflater.java | 2 ++ .../android/graphics/drawable/DrawableWrapper.java | 2 ++ .../graphics/drawable/GradientDrawable.java | 24 ++++++++++++++++++++++ graphics/java/android/graphics/drawable/Icon.java | 10 +++++++++ .../android/graphics/drawable/InsetDrawable.java | 2 ++ .../android/graphics/drawable/LayerDrawable.java | 6 ++++++ .../graphics/drawable/NinePatchDrawable.java | 3 +++ .../android/graphics/drawable/RippleDrawable.java | 6 ++++++ .../android/graphics/drawable/RotateDrawable.java | 2 ++ .../android/graphics/drawable/ScaleDrawable.java | 2 ++ .../graphics/drawable/StateListDrawable.java | 5 +++++ .../graphics/drawable/TransitionDrawable.java | 4 ++++ .../android/graphics/drawable/VectorDrawable.java | 9 ++++++++ .../android/graphics/fonts/FontVariationAxis.java | 3 +++ .../java/android/graphics/pdf/PdfRenderer.java | 3 +++ 57 files changed, 285 insertions(+) (limited to 'graphics/java') diff --git a/graphics/java/android/graphics/BaseCanvas.java b/graphics/java/android/graphics/BaseCanvas.java index 1f339f7aaa54..d299ed8e9b76 100644 --- a/graphics/java/android/graphics/BaseCanvas.java +++ b/graphics/java/android/graphics/BaseCanvas.java @@ -20,6 +20,7 @@ import android.annotation.ColorInt; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; +import android.annotation.UnsupportedAppUsage; import android.graphics.Canvas.VertexMode; import android.text.GraphicsOperations; import android.text.SpannableString; @@ -41,6 +42,7 @@ public abstract class BaseCanvas { * Should only be assigned in constructors (or setBitmap if software canvas), * freed by NativeAllocation. */ + @UnsupportedAppUsage protected long mNativeCanvasWrapper; /** diff --git a/graphics/java/android/graphics/Bitmap.java b/graphics/java/android/graphics/Bitmap.java index 57c75490ec47..c2d6c55c7e9a 100644 --- a/graphics/java/android/graphics/Bitmap.java +++ b/graphics/java/android/graphics/Bitmap.java @@ -21,6 +21,7 @@ import android.annotation.ColorInt; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; +import android.annotation.UnsupportedAppUsage; import android.content.res.ResourcesImpl; import android.os.Parcel; import android.os.Parcelable; @@ -52,6 +53,7 @@ public final class Bitmap implements Parcelable { private static final long NATIVE_ALLOCATION_SIZE = 32; // Convenience for JNI access + @UnsupportedAppUsage private final long mNativePtr; private final boolean mIsMutable; @@ -70,9 +72,13 @@ public final class Bitmap implements Parcelable { */ private boolean mRequestPremultiplied; + @UnsupportedAppUsage private byte[] mNinePatchChunk; // may be null + @UnsupportedAppUsage private NinePatch.InsetStruct mNinePatchInsets; // may be null + @UnsupportedAppUsage private int mWidth; + @UnsupportedAppUsage private int mHeight; private boolean mRecycled; @@ -94,11 +100,13 @@ public final class Bitmap implements Parcelable { * density when running old apps. * @hide */ + @UnsupportedAppUsage public static void setDefaultDensity(int density) { sDefaultDensity = density; } @SuppressWarnings("deprecation") + @UnsupportedAppUsage static int getDefaultDensity() { if (sDefaultDensity >= 0) { return sDefaultDensity; @@ -155,6 +163,7 @@ public final class Bitmap implements Parcelable { * width/height values */ @SuppressWarnings("unused") // called from JNI + @UnsupportedAppUsage void reinit(int width, int height, boolean requestPremultiplied) { mWidth = width; mHeight = height; @@ -325,6 +334,7 @@ public final class Bitmap implements Parcelable { * * @hide */ + @UnsupportedAppUsage public void setNinePatchChunk(byte[] chunk) { mNinePatchChunk = chunk; } @@ -510,6 +520,7 @@ public final class Bitmap implements Parcelable { */ HARDWARE (7); + @UnsupportedAppUsage final int nativeInt; private static Config sConfigs[] = { @@ -520,6 +531,7 @@ public final class Bitmap implements Parcelable { this.nativeInt = ni; } + @UnsupportedAppUsage static Config nativeToConfig(int ni) { return sConfigs[ni]; } @@ -654,6 +666,7 @@ public final class Bitmap implements Parcelable { * * @hide */ + @UnsupportedAppUsage public Bitmap createAshmemBitmap() { checkRecycled("Can't copy a recycled bitmap"); noteHardwareBitmapSlowCall(); @@ -672,6 +685,7 @@ public final class Bitmap implements Parcelable { * * @hide */ + @UnsupportedAppUsage public Bitmap createAshmemBitmap(Config config) { checkRecycled("Can't copy a recycled bitmap"); noteHardwareBitmapSlowCall(); @@ -690,6 +704,7 @@ public final class Bitmap implements Parcelable { * currently PIXEL_FORMAT_RGBA_8888 is the only supported format * @hide */ + @UnsupportedAppUsage public static Bitmap createHardwareBitmap(@NonNull GraphicBuffer graphicBuffer) { return nativeCreateHardwareBitmap(graphicBuffer); } @@ -1390,6 +1405,7 @@ public final class Bitmap implements Parcelable { /** * @hide */ + @UnsupportedAppUsage static public int scaleFromDensity(int size, int sdensity, int tdensity) { if (sdensity == DENSITY_NONE || tdensity == DENSITY_NONE || sdensity == tdensity) { return size; @@ -1920,6 +1936,7 @@ public final class Bitmap implements Parcelable { * @return {@link GraphicBuffer} which is internally used by hardware bitmap * @hide */ + @UnsupportedAppUsage public GraphicBuffer createGraphicBufferHandle() { return nativeCreateGraphicBufferHandle(mNativePtr); } @@ -1937,6 +1954,7 @@ public final class Bitmap implements Parcelable { private static native Bitmap nativeCopyAshmemConfig(long nativeSrcBitmap, int nativeConfig); private static native long nativeGetNativeFinalizer(); private static native boolean nativeRecycle(long nativeBitmap); + @UnsupportedAppUsage private static native void nativeReconfigure(long nativeBitmap, int width, int height, int config, boolean isPremultiplied); diff --git a/graphics/java/android/graphics/BitmapFactory.java b/graphics/java/android/graphics/BitmapFactory.java index ffb39e339119..2d0be50364eb 100644 --- a/graphics/java/android/graphics/BitmapFactory.java +++ b/graphics/java/android/graphics/BitmapFactory.java @@ -18,6 +18,7 @@ package android.graphics; import static android.graphics.BitmapFactory.Options.validate; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.content.res.Resources; import android.os.Trace; @@ -822,11 +823,15 @@ public class BitmapFactory { return decodeFileDescriptor(fd, null, null); } + @UnsupportedAppUsage private static native Bitmap nativeDecodeStream(InputStream is, byte[] storage, Rect padding, Options opts); + @UnsupportedAppUsage private static native Bitmap nativeDecodeFileDescriptor(FileDescriptor fd, Rect padding, Options opts); + @UnsupportedAppUsage private static native Bitmap nativeDecodeAsset(long nativeAsset, Rect padding, Options opts); + @UnsupportedAppUsage private static native Bitmap nativeDecodeByteArray(byte[] data, int offset, int length, Options opts); private static native boolean nativeIsSeekable(FileDescriptor fd); diff --git a/graphics/java/android/graphics/BitmapRegionDecoder.java b/graphics/java/android/graphics/BitmapRegionDecoder.java index 2da27c7dfdbf..9b5027d71ad6 100644 --- a/graphics/java/android/graphics/BitmapRegionDecoder.java +++ b/graphics/java/android/graphics/BitmapRegionDecoder.java @@ -15,6 +15,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import java.io.FileDescriptor; @@ -165,6 +166,7 @@ public final class BitmapRegionDecoder { This can be called from JNI code. */ + @UnsupportedAppUsage private BitmapRegionDecoder(long decoder) { mNativeBitmapRegionDecoder = decoder; mRecycled = false; @@ -267,6 +269,7 @@ public final class BitmapRegionDecoder { private static native int nativeGetHeight(long lbm); private static native void nativeClean(long lbm); + @UnsupportedAppUsage private static native BitmapRegionDecoder nativeNewInstance( byte[] data, int offset, int length, boolean isShareable); private static native BitmapRegionDecoder nativeNewInstance( diff --git a/graphics/java/android/graphics/BitmapShader.java b/graphics/java/android/graphics/BitmapShader.java index 5577f53ee28b..bcf72298ba30 100644 --- a/graphics/java/android/graphics/BitmapShader.java +++ b/graphics/java/android/graphics/BitmapShader.java @@ -17,6 +17,7 @@ package android.graphics; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; /** * Shader used to draw a bitmap as a texture. The bitmap can be repeated or @@ -28,9 +29,12 @@ public class BitmapShader extends Shader { * @hide */ @SuppressWarnings({"FieldCanBeLocal", "UnusedDeclaration"}) + @UnsupportedAppUsage public Bitmap mBitmap; + @UnsupportedAppUsage private int mTileX; + @UnsupportedAppUsage private int mTileY; /** diff --git a/graphics/java/android/graphics/Camera.java b/graphics/java/android/graphics/Camera.java index 60588d07196c..33889410a54b 100644 --- a/graphics/java/android/graphics/Camera.java +++ b/graphics/java/android/graphics/Camera.java @@ -16,6 +16,8 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; + /** * A camera instance can be used to compute 3D transformations and * generate a matrix that can be applied, for instance, on a @@ -174,5 +176,6 @@ public class Camera { private native void nativeGetMatrix(long native_matrix); private native void nativeApplyToCanvas(long native_canvas); + @UnsupportedAppUsage long native_instance; } diff --git a/graphics/java/android/graphics/Canvas.java b/graphics/java/android/graphics/Canvas.java index 0301f2e6b555..c408e738586e 100644 --- a/graphics/java/android/graphics/Canvas.java +++ b/graphics/java/android/graphics/Canvas.java @@ -21,6 +21,7 @@ import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; +import android.annotation.UnsupportedAppUsage; import android.os.Build; import dalvik.annotation.optimization.CriticalNative; @@ -53,6 +54,7 @@ public class Canvas extends BaseCanvas { public static boolean sCompatibilitySetBitmap = false; /** @hide */ + @UnsupportedAppUsage public long getNativeCanvasWrapper() { return mNativeCanvasWrapper; } @@ -61,6 +63,7 @@ public class Canvas extends BaseCanvas { public boolean isRecordingFor(Object o) { return false; } // may be null + @UnsupportedAppUsage private Bitmap mBitmap; // optional field set by the caller @@ -122,6 +125,7 @@ public class Canvas extends BaseCanvas { } /** @hide */ + @UnsupportedAppUsage public Canvas(long nativeCanvas) { if (nativeCanvas == 0) { throw new IllegalStateException(); @@ -140,6 +144,7 @@ public class Canvas extends BaseCanvas { * @hide */ @Deprecated + @UnsupportedAppUsage protected GL getGL() { return null; } @@ -273,6 +278,7 @@ public class Canvas extends BaseCanvas { } /** @hide */ + @UnsupportedAppUsage public void setScreenDensity(int density) { mScreenDensity = density; } @@ -1198,6 +1204,7 @@ public class Canvas extends BaseCanvas { * * @hide */ + @UnsupportedAppUsage public void release() { mNativeCanvasWrapper = 0; if (mFinalizer != null) { @@ -1211,6 +1218,7 @@ public class Canvas extends BaseCanvas { * * @hide */ + @UnsupportedAppUsage public static void freeCaches() { nFreeCaches(); } @@ -1220,6 +1228,7 @@ public class Canvas extends BaseCanvas { * * @hide */ + @UnsupportedAppUsage public static void freeTextLayoutCaches() { nFreeTextLayoutCaches(); } diff --git a/graphics/java/android/graphics/CanvasProperty.java b/graphics/java/android/graphics/CanvasProperty.java index ea3886cde274..1275e0827580 100644 --- a/graphics/java/android/graphics/CanvasProperty.java +++ b/graphics/java/android/graphics/CanvasProperty.java @@ -16,6 +16,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import com.android.internal.util.VirtualRefBasePtr; /** @@ -26,10 +27,12 @@ public final class CanvasProperty { private VirtualRefBasePtr mProperty; + @UnsupportedAppUsage public static CanvasProperty createFloat(float initialValue) { return new CanvasProperty(nCreateFloat(initialValue)); } + @UnsupportedAppUsage public static CanvasProperty createPaint(Paint initialValue) { return new CanvasProperty(nCreatePaint(initialValue.getNativeInstance())); } diff --git a/graphics/java/android/graphics/ColorMatrixColorFilter.java b/graphics/java/android/graphics/ColorMatrixColorFilter.java index 9201a2e2310e..01911359a1e3 100644 --- a/graphics/java/android/graphics/ColorMatrixColorFilter.java +++ b/graphics/java/android/graphics/ColorMatrixColorFilter.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; /** * A color filter that transforms colors through a 4x5 color matrix. This filter @@ -26,6 +27,7 @@ import android.annotation.Nullable; * @see ColorMatrix */ public class ColorMatrixColorFilter extends ColorFilter { + @UnsupportedAppUsage private final ColorMatrix mMatrix = new ColorMatrix(); /** @@ -76,6 +78,7 @@ public class ColorMatrixColorFilter extends ColorFilter { * * @hide */ + @UnsupportedAppUsage public void setColorMatrix(@Nullable ColorMatrix matrix) { discardNativeInstance(); if (matrix == null) { diff --git a/graphics/java/android/graphics/FontFamily.java b/graphics/java/android/graphics/FontFamily.java index d9a77e752823..14f4ac24cff4 100644 --- a/graphics/java/android/graphics/FontFamily.java +++ b/graphics/java/android/graphics/FontFamily.java @@ -16,6 +16,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.graphics.fonts.FontVariationAxis; import android.text.FontConfig; @@ -44,6 +45,7 @@ public class FontFamily { // Points native font family builder. Must be zero after freezing this family. private long mBuilderPtr; + @UnsupportedAppUsage public FontFamily() { mBuilderPtr = nInitBuilder(null, 0); } @@ -58,6 +60,7 @@ public class FontFamily { * @return boolean returns false if some error happens in native code, e.g. broken font file is * passed, etc. */ + @UnsupportedAppUsage public boolean freeze() { if (mBuilderPtr == 0) { throw new IllegalStateException("This FontFamily is already frozen"); @@ -67,6 +70,7 @@ public class FontFamily { return mNativePtr != 0; } + @UnsupportedAppUsage public void abortCreation() { if (mBuilderPtr == 0) { throw new IllegalStateException("This FontFamily is already frozen or abandoned"); @@ -110,6 +114,7 @@ public class FontFamily { } } + @UnsupportedAppUsage public boolean addFontFromBuffer(ByteBuffer font, int ttcIndex, FontVariationAxis[] axes, int weight, int italic) { if (mBuilderPtr == 0) { @@ -135,6 +140,7 @@ public class FontFamily { * using the OS/2 table in the font. * @return */ + @UnsupportedAppUsage public boolean addFontFromAssetManager(AssetManager mgr, String path, int cookie, boolean isAsset, int ttcIndex, int weight, int isItalic, FontVariationAxis[] axes) { diff --git a/graphics/java/android/graphics/GraphicBuffer.java b/graphics/java/android/graphics/GraphicBuffer.java index 53d21776eed7..74086830fae2 100644 --- a/graphics/java/android/graphics/GraphicBuffer.java +++ b/graphics/java/android/graphics/GraphicBuffer.java @@ -16,6 +16,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; @@ -53,6 +54,7 @@ public class GraphicBuffer implements Parcelable { private final int mFormat; private final int mUsage; // Note: do not rename, this field is used by native code + @UnsupportedAppUsage private final long mNativeObject; // These two fields are only used by lock/unlockCanvas() @@ -84,6 +86,7 @@ public class GraphicBuffer implements Parcelable { /** * Private use only. See {@link #create(int, int, int, int)}. */ + @UnsupportedAppUsage private GraphicBuffer(int width, int height, int format, int usage, long nativeObject) { mWidth = width; mHeight = height; @@ -96,6 +99,7 @@ public class GraphicBuffer implements Parcelable { * For SurfaceControl JNI. * @hide */ + @UnsupportedAppUsage public static GraphicBuffer createFromExisting(int width, int height, int format, int usage, long unwrappedNativeObject) { long nativeObject = nWrapGraphicBuffer(unwrappedNativeObject); @@ -274,6 +278,7 @@ public class GraphicBuffer implements Parcelable { nWriteGraphicBufferToParcel(mNativeObject, dest); } + @UnsupportedAppUsage public static final Parcelable.Creator CREATOR = new Parcelable.Creator() { public GraphicBuffer createFromParcel(Parcel in) { diff --git a/graphics/java/android/graphics/ImageFormat.java b/graphics/java/android/graphics/ImageFormat.java index 43fd2708ee3e..9546a4aec330 100644 --- a/graphics/java/android/graphics/ImageFormat.java +++ b/graphics/java/android/graphics/ImageFormat.java @@ -16,6 +16,8 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; + public class ImageFormat { /* * these constants are chosen to be binary compatible with their previous @@ -103,6 +105,7 @@ public class ImageFormat { * * @hide */ + @UnsupportedAppUsage public static final int Y8 = 0x20203859; /** diff --git a/graphics/java/android/graphics/LightingColorFilter.java b/graphics/java/android/graphics/LightingColorFilter.java index 1578ffb873f0..62a890ff4f0b 100644 --- a/graphics/java/android/graphics/LightingColorFilter.java +++ b/graphics/java/android/graphics/LightingColorFilter.java @@ -22,6 +22,7 @@ package android.graphics; import android.annotation.ColorInt; +import android.annotation.UnsupportedAppUsage; /** * A color filter that can be used to simulate simple lighting effects. @@ -72,6 +73,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ + @UnsupportedAppUsage public void setColorMultiply(@ColorInt int mul) { if (mMul != mul) { mMul = mul; @@ -97,6 +99,7 @@ public class LightingColorFilter extends ColorFilter { * * @hide */ + @UnsupportedAppUsage public void setColorAdd(@ColorInt int add) { if (mAdd != add) { mAdd = add; diff --git a/graphics/java/android/graphics/LinearGradient.java b/graphics/java/android/graphics/LinearGradient.java index 7139efec9337..7e6fc353cf1e 100644 --- a/graphics/java/android/graphics/LinearGradient.java +++ b/graphics/java/android/graphics/LinearGradient.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; public class LinearGradient extends Shader { @@ -31,15 +32,24 @@ public class LinearGradient extends Shader { */ private int mType; + @UnsupportedAppUsage private float mX0; + @UnsupportedAppUsage private float mY0; + @UnsupportedAppUsage private float mX1; + @UnsupportedAppUsage private float mY1; + @UnsupportedAppUsage private int[] mColors; + @UnsupportedAppUsage private float[] mPositions; + @UnsupportedAppUsage private int mColor0; + @UnsupportedAppUsage private int mColor1; + @UnsupportedAppUsage private TileMode mTileMode; /** diff --git a/graphics/java/android/graphics/Matrix.java b/graphics/java/android/graphics/Matrix.java index 486070c99e3f..f8cb366c7b92 100644 --- a/graphics/java/android/graphics/Matrix.java +++ b/graphics/java/android/graphics/Matrix.java @@ -21,6 +21,7 @@ import dalvik.annotation.optimization.FastNative; import libcore.util.NativeAllocationRegistry; +import android.annotation.UnsupportedAppUsage; import java.io.PrintWriter; /** @@ -39,6 +40,7 @@ public class Matrix { public static final int MPERSP_2 = 8; //!< use with getValues/setValues /** @hide */ + @UnsupportedAppUsage public final static Matrix IDENTITY_MATRIX = new Matrix() { void oops() { throw new IllegalStateException("Matrix can not be modified"); @@ -231,6 +233,7 @@ public class Matrix { /** * @hide */ + @UnsupportedAppUsage public final long native_instance; /** diff --git a/graphics/java/android/graphics/Movie.java b/graphics/java/android/graphics/Movie.java index c8f86c607132..32be6b368858 100644 --- a/graphics/java/android/graphics/Movie.java +++ b/graphics/java/android/graphics/Movie.java @@ -16,13 +16,16 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import java.io.InputStream; import java.io.FileInputStream; public class Movie { + @UnsupportedAppUsage private long mNativeMovie; + @UnsupportedAppUsage private Movie(long nativeMovie) { if (nativeMovie == 0) { throw new RuntimeException("native movie creation failed"); diff --git a/graphics/java/android/graphics/NinePatch.java b/graphics/java/android/graphics/NinePatch.java index b6a209f25df9..800247af4927 100644 --- a/graphics/java/android/graphics/NinePatch.java +++ b/graphics/java/android/graphics/NinePatch.java @@ -16,6 +16,8 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; + /** * The NinePatch class permits drawing a bitmap in nine or more sections. * Essentially, it allows the creation of custom graphics that will scale the @@ -41,6 +43,7 @@ public class NinePatch { */ public static class InsetStruct { @SuppressWarnings({"UnusedDeclaration"}) // called from JNI + @UnsupportedAppUsage InsetStruct(int opticalLeft, int opticalTop, int opticalRight, int opticalBottom, int outlineLeft, int outlineTop, int outlineRight, int outlineBottom, float outlineRadius, int outlineAlpha, float decodeScale) { @@ -77,6 +80,7 @@ public class NinePatch { } } + @UnsupportedAppUsage private final Bitmap mBitmap; /** @@ -84,6 +88,7 @@ public class NinePatch { * * @hide */ + @UnsupportedAppUsage public long mNativeChunk; private Paint mPaint; diff --git a/graphics/java/android/graphics/Outline.java b/graphics/java/android/graphics/Outline.java index 1c85df0de590..98c990a71601 100644 --- a/graphics/java/android/graphics/Outline.java +++ b/graphics/java/android/graphics/Outline.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.FloatRange; import android.annotation.IntDef; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.graphics.drawable.Drawable; import java.lang.annotation.Retention; @@ -66,6 +67,7 @@ public final class Outline { public Path mPath; /** @hide */ + @UnsupportedAppUsage public final Rect mRect = new Rect(); /** @hide */ public float mRadius = RADIUS_UNDEFINED; diff --git a/graphics/java/android/graphics/Paint.java b/graphics/java/android/graphics/Paint.java index aa9227c9bb08..94fde27631f9 100644 --- a/graphics/java/android/graphics/Paint.java +++ b/graphics/java/android/graphics/Paint.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; import android.annotation.Size; +import android.annotation.UnsupportedAppUsage; import android.graphics.FontListParser; import android.graphics.fonts.FontVariationAxis; import android.os.LocaleList; @@ -47,6 +48,7 @@ import libcore.util.NativeAllocationRegistry; */ public class Paint { + @UnsupportedAppUsage private long mNativePaint; private long mNativeShader; private long mNativeColorFilter; @@ -69,6 +71,7 @@ public class Paint { private MaskFilter mMaskFilter; private PathEffect mPathEffect; private Shader mShader; + @UnsupportedAppUsage private Typeface mTypeface; private Xfermode mXfermode; @@ -628,6 +631,7 @@ public class Paint { } /** @hide */ + @UnsupportedAppUsage public void setCompatibilityScaling(float factor) { if (factor == 1.0) { mHasCompatScaling = false; @@ -645,6 +649,7 @@ public class Paint { * * @hide */ + @UnsupportedAppUsage public long getNativeInstance() { long newNativeShader = mShader == null ? 0 : mShader.getNativeInstance(); if (newNativeShader != mNativeShader) { @@ -1732,6 +1737,7 @@ public class Paint { * * @hide */ + @UnsupportedAppUsage public void setHyphenEdit(int hyphen) { nSetHyphenEdit(mNativePaint, hyphen); } @@ -2264,6 +2270,7 @@ public class Paint { * @see #getTextRunAdvances(String, int, int, int, int, boolean, float[], int) * @hide */ + @UnsupportedAppUsage public float getTextRunAdvances(char[] chars, int index, int count, int contextIndex, int contextCount, boolean isRtl, float[] advances, int advancesIndex) { @@ -2457,6 +2464,7 @@ public class Paint { * @return the offset of the next position, or -1 * @hide */ + @UnsupportedAppUsage public int getTextRunCursor(char[] text, int contextStart, int contextLength, int dir, int offset, int cursorOpt) { int contextEnd = contextStart + contextLength; diff --git a/graphics/java/android/graphics/Path.java b/graphics/java/android/graphics/Path.java index 098cdc67555d..fa8ba5b194d6 100644 --- a/graphics/java/android/graphics/Path.java +++ b/graphics/java/android/graphics/Path.java @@ -20,6 +20,7 @@ import android.annotation.FloatRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.Size; +import android.annotation.UnsupportedAppUsage; import dalvik.annotation.optimization.CriticalNative; import dalvik.annotation.optimization.FastNative; @@ -40,10 +41,12 @@ public class Path { /** * @hide */ + @UnsupportedAppUsage public boolean isSimplePath = true; /** * @hide */ + @UnsupportedAppUsage public Region rects; private Direction mLastDirection = null; diff --git a/graphics/java/android/graphics/Picture.java b/graphics/java/android/graphics/Picture.java index 08eeaff69f9b..d8bb1d787ea8 100644 --- a/graphics/java/android/graphics/Picture.java +++ b/graphics/java/android/graphics/Picture.java @@ -16,6 +16,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import java.io.InputStream; import java.io.OutputStream; @@ -32,6 +33,7 @@ import java.io.OutputStream; */ public class Picture { private Canvas mRecordingCanvas; + @UnsupportedAppUsage private long mNativePicture; private static final int WORKING_STREAM_STORAGE = 16 * 1024; diff --git a/graphics/java/android/graphics/PorterDuff.java b/graphics/java/android/graphics/PorterDuff.java index d7d3049b0efa..fba50430f2ef 100644 --- a/graphics/java/android/graphics/PorterDuff.java +++ b/graphics/java/android/graphics/PorterDuff.java @@ -16,6 +16,8 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; + /** *

This class contains the list of alpha compositing and blending modes * that can be passed to {@link PorterDuffXfermode}, a specialized implementation @@ -364,6 +366,7 @@ public class PorterDuff { /** * @hide */ + @UnsupportedAppUsage public final int nativeInt; } diff --git a/graphics/java/android/graphics/PorterDuffColorFilter.java b/graphics/java/android/graphics/PorterDuffColorFilter.java index 01d5825dd1e0..3c90b72eaed0 100644 --- a/graphics/java/android/graphics/PorterDuffColorFilter.java +++ b/graphics/java/android/graphics/PorterDuffColorFilter.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; /** * A color filter that can be used to tint the source pixels using a single @@ -53,6 +54,7 @@ public class PorterDuffColorFilter extends ColorFilter { * @hide */ @ColorInt + @UnsupportedAppUsage public int getColor() { return mColor; } @@ -85,6 +87,7 @@ public class PorterDuffColorFilter extends ColorFilter { * * @hide */ + @UnsupportedAppUsage public PorterDuff.Mode getMode() { return mMode; } diff --git a/graphics/java/android/graphics/RadialGradient.java b/graphics/java/android/graphics/RadialGradient.java index f4b11917a415..41d26281b723 100644 --- a/graphics/java/android/graphics/RadialGradient.java +++ b/graphics/java/android/graphics/RadialGradient.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.ColorInt; +import android.annotation.UnsupportedAppUsage; public class RadialGradient extends Shader { @@ -31,14 +32,22 @@ public class RadialGradient extends Shader { */ private int mType; + @UnsupportedAppUsage private float mX; + @UnsupportedAppUsage private float mY; + @UnsupportedAppUsage private float mRadius; + @UnsupportedAppUsage private int[] mColors; + @UnsupportedAppUsage private float[] mPositions; + @UnsupportedAppUsage private int mCenterColor; + @UnsupportedAppUsage private int mEdgeColor; + @UnsupportedAppUsage private TileMode mTileMode; /** diff --git a/graphics/java/android/graphics/Rect.java b/graphics/java/android/graphics/Rect.java index deafb6638ece..584117711d2d 100644 --- a/graphics/java/android/graphics/Rect.java +++ b/graphics/java/android/graphics/Rect.java @@ -20,6 +20,7 @@ import android.annotation.CheckResult; import android.os.Parcel; import android.os.Parcelable; +import android.annotation.UnsupportedAppUsage; import android.text.TextUtils; import java.io.PrintWriter; import java.util.regex.Matcher; @@ -189,6 +190,7 @@ public final class Rect implements Parcelable { * Print short representation to given writer. * @hide */ + @UnsupportedAppUsage public void printShortString(PrintWriter pw) { pw.print('['); pw.print(left); pw.print(','); pw.print(top); pw.print("]["); pw.print(right); @@ -643,6 +645,7 @@ public final class Rect implements Parcelable { * Scales up the rect by the given scale. * @hide */ + @UnsupportedAppUsage public void scale(float scale) { if (scale != 1.0f) { left = (int) (left * scale + 0.5f); diff --git a/graphics/java/android/graphics/Region.java b/graphics/java/android/graphics/Region.java index dca6d9ed3b2f..db6ebd5f22c3 100644 --- a/graphics/java/android/graphics/Region.java +++ b/graphics/java/android/graphics/Region.java @@ -16,6 +16,7 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import android.os.Parcel; import android.os.Parcelable; import android.util.Pools.SynchronizedPool; @@ -30,6 +31,7 @@ public class Region implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public long mNativeRegion; // the native values for these must match up with the enum in SkRegion.h @@ -48,6 +50,7 @@ public class Region implements Parcelable { /** * @hide */ + @UnsupportedAppUsage public final int nativeInt; } @@ -236,6 +239,7 @@ public class Region implements Parcelable { * * @hide */ + @UnsupportedAppUsage public void scale(float scale) { scale(scale, null); } @@ -327,6 +331,7 @@ public class Region implements Parcelable { * * @hide */ + @UnsupportedAppUsage public void recycle() { setEmpty(); sPool.release(this); @@ -395,6 +400,7 @@ public class Region implements Parcelable { /* add dummy parameter so constructor can be called from jni without triggering 'not cloneable' exception */ + @UnsupportedAppUsage private Region(long ni, int dummy) { this(ni); } diff --git a/graphics/java/android/graphics/Shader.java b/graphics/java/android/graphics/Shader.java index 40288f5ec8af..40bcc9e26a3d 100644 --- a/graphics/java/android/graphics/Shader.java +++ b/graphics/java/android/graphics/Shader.java @@ -18,6 +18,7 @@ package android.graphics; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import libcore.util.NativeAllocationRegistry; @@ -72,6 +73,7 @@ public class Shader { TileMode(int nativeInt) { this.nativeInt = nativeInt; } + @UnsupportedAppUsage final int nativeInt; } diff --git a/graphics/java/android/graphics/SurfaceTexture.java b/graphics/java/android/graphics/SurfaceTexture.java index 97edf220e242..675bb47520ba 100644 --- a/graphics/java/android/graphics/SurfaceTexture.java +++ b/graphics/java/android/graphics/SurfaceTexture.java @@ -17,6 +17,7 @@ package android.graphics; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.os.Handler; import android.os.Looper; import android.os.Message; @@ -68,13 +69,17 @@ import java.lang.ref.WeakReference; */ public class SurfaceTexture { private final Looper mCreatorLooper; + @UnsupportedAppUsage private Handler mOnFrameAvailableHandler; /** * These fields are used by native code, do not access or modify. */ + @UnsupportedAppUsage private long mSurfaceTexture; + @UnsupportedAppUsage private long mProducer; + @UnsupportedAppUsage private long mFrameAvailableListener; private boolean mIsSingleBuffered; @@ -374,6 +379,7 @@ public class SurfaceTexture { * This method is invoked from native code only. */ @SuppressWarnings({"UnusedDeclaration"}) + @UnsupportedAppUsage private static void postEventFromNative(WeakReference weakSelf) { SurfaceTexture st = weakSelf.get(); if (st != null) { @@ -401,6 +407,7 @@ public class SurfaceTexture { private native void nativeSetDefaultBufferSize(int width, int height); private native void nativeUpdateTexImage(); private native void nativeReleaseTexImage(); + @UnsupportedAppUsage private native int nativeDetachFromGLContext(); private native int nativeAttachToGLContext(int texName); private native void nativeRelease(); diff --git a/graphics/java/android/graphics/SweepGradient.java b/graphics/java/android/graphics/SweepGradient.java index b6b80b4f57dc..f944d85d3cf2 100644 --- a/graphics/java/android/graphics/SweepGradient.java +++ b/graphics/java/android/graphics/SweepGradient.java @@ -19,6 +19,7 @@ package android.graphics; import android.annotation.ColorInt; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; public class SweepGradient extends Shader { @@ -31,11 +32,17 @@ public class SweepGradient extends Shader { */ private int mType; + @UnsupportedAppUsage private float mCx; + @UnsupportedAppUsage private float mCy; + @UnsupportedAppUsage private int[] mColors; + @UnsupportedAppUsage private float[] mPositions; + @UnsupportedAppUsage private int mColor0; + @UnsupportedAppUsage private int mColor1; /** diff --git a/graphics/java/android/graphics/TableMaskFilter.java b/graphics/java/android/graphics/TableMaskFilter.java index d0c1438285a8..d81c491e07e0 100644 --- a/graphics/java/android/graphics/TableMaskFilter.java +++ b/graphics/java/android/graphics/TableMaskFilter.java @@ -16,6 +16,8 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; + /** * @hide */ @@ -32,6 +34,7 @@ public class TableMaskFilter extends MaskFilter { native_instance = ni; } + @UnsupportedAppUsage public static TableMaskFilter CreateClipTable(int min, int max) { return new TableMaskFilter(nativeNewClip(min, max)); } diff --git a/graphics/java/android/graphics/TemporaryBuffer.java b/graphics/java/android/graphics/TemporaryBuffer.java index 36a2275738c2..0ae2c703c21c 100644 --- a/graphics/java/android/graphics/TemporaryBuffer.java +++ b/graphics/java/android/graphics/TemporaryBuffer.java @@ -16,12 +16,14 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; import com.android.internal.util.ArrayUtils; /** * @hide */ public class TemporaryBuffer { + @UnsupportedAppUsage public static char[] obtain(int len) { char[] buf; @@ -37,6 +39,7 @@ public class TemporaryBuffer { return buf; } + @UnsupportedAppUsage public static void recycle(char[] temp) { if (temp.length > 1000) return; diff --git a/graphics/java/android/graphics/Typeface.java b/graphics/java/android/graphics/Typeface.java index c4b56c333c64..7b8876496710 100644 --- a/graphics/java/android/graphics/Typeface.java +++ b/graphics/java/android/graphics/Typeface.java @@ -27,6 +27,7 @@ import android.annotation.IntDef; import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.AssetManager; import android.graphics.FontListParser; import android.graphics.fonts.FontVariationAxis; @@ -94,6 +95,7 @@ public class Typeface { /** The NORMAL style of the default monospace typeface. */ public static final Typeface MONOSPACE; + @UnsupportedAppUsage static Typeface[] sDefaults; private static final LongSparseArray> sTypefaceCache = new LongSparseArray<>(3); @@ -105,6 +107,7 @@ public class Typeface { private static final LruCache sDynamicTypefaceCache = new LruCache<>(16); static Typeface sDefaultTypeface; + @UnsupportedAppUsage static Map sSystemFontMap; static FontFamily[] sFallbackFonts; private static final Object sLock = new Object(); @@ -114,6 +117,7 @@ public class Typeface { /** * @hide */ + @UnsupportedAppUsage public long native_instance; // Style @@ -122,6 +126,7 @@ public class Typeface { public static final int ITALIC = 2; public static final int BOLD_ITALIC = 3; + @UnsupportedAppUsage private int mStyle = 0; private int mWeight = 0; @@ -137,6 +142,7 @@ public class Typeface { private int[] mSupportedAxes; private static final int[] EMPTY_AXES = {}; + @UnsupportedAppUsage private static void setDefault(Typeface t) { sDefaultTypeface = t; nativeSetDefault(t.native_instance); @@ -840,6 +846,7 @@ public class Typeface { * * @param families array of font families */ + @UnsupportedAppUsage private static Typeface createFromFamilies(FontFamily[] families) { long[] ptrArray = new long[families.length]; for (int i = 0; i < families.length; i++) { @@ -862,6 +869,7 @@ public class Typeface { * upright font is used. * @param families array of font families */ + @UnsupportedAppUsage private static Typeface createFromFamiliesWithDefault(FontFamily[] families, int weight, int italic) { long[] ptrArray = new long[families.length + sFallbackFonts.length]; @@ -875,6 +883,7 @@ public class Typeface { } // don't allow clients to call this directly + @UnsupportedAppUsage private Typeface(long ni) { if (ni == 0) { throw new RuntimeException("native typeface cannot be made"); @@ -1065,10 +1074,12 @@ public class Typeface { // TODO: clean up: change List to FontVariationAxis[] private static native long nativeCreateFromTypefaceWithVariation( long native_instance, List axes); + @UnsupportedAppUsage private static native long nativeCreateWeightAlias(long native_instance, int weight); private static native void nativeUnref(long native_instance); private static native int nativeGetStyle(long native_instance); private static native int nativeGetWeight(long native_instance); + @UnsupportedAppUsage private static native long nativeCreateFromArray(long[] familyArray, int weight, int italic); private static native void nativeSetDefault(long native_instance); private static native int[] nativeGetSupportedAxes(long native_instance); diff --git a/graphics/java/android/graphics/Xfermode.java b/graphics/java/android/graphics/Xfermode.java index a5da5d09ebaf..6f4adfde7ff9 100644 --- a/graphics/java/android/graphics/Xfermode.java +++ b/graphics/java/android/graphics/Xfermode.java @@ -21,6 +21,8 @@ package android.graphics; +import android.annotation.UnsupportedAppUsage; + /** * Xfermode is the base class for objects that are called to implement custom * "transfer-modes" in the drawing pipeline. The static function Create(Modes) @@ -30,5 +32,6 @@ package android.graphics; */ public class Xfermode { static final int DEFAULT = PorterDuff.Mode.SRC_OVER.nativeInt; + @UnsupportedAppUsage int porterDuffMode = DEFAULT; } diff --git a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java index d714ca830976..b29fd4db5803 100644 --- a/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedRotateDrawable.java @@ -18,6 +18,7 @@ package android.graphics.drawable; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.graphics.Canvas; import android.graphics.Rect; import android.content.res.Resources; @@ -202,11 +203,13 @@ public class AnimatedRotateDrawable extends DrawableWrapper implements Animatabl R.styleable.AnimatedRotateDrawable_frameDuration, state.mFrameDuration)); } + @UnsupportedAppUsage public void setFramesCount(int framesCount) { mState.mFramesCount = framesCount; mIncrement = 360.0f / mState.mFramesCount; } + @UnsupportedAppUsage public void setFramesDuration(int framesDuration) { mState.mFrameDuration = framesDuration; } diff --git a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java index 3ed6a788b640..00380c5d0d95 100644 --- a/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedStateListDrawable.java @@ -20,6 +20,7 @@ import android.animation.ObjectAnimator; import android.animation.TimeInterpolator; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; @@ -66,6 +67,7 @@ public class AnimatedStateListDrawable extends StateListDrawable { private static final String ELEMENT_TRANSITION = "transition"; private static final String ELEMENT_ITEM = "item"; + @UnsupportedAppUsage private AnimatedStateListState mState; /** The currently running transition, if any. */ @@ -558,7 +560,9 @@ public class AnimatedStateListDrawable extends StateListDrawable { int[] mAnimThemeAttrs; + @UnsupportedAppUsage LongSparseLongArray mTransitions; + @UnsupportedAppUsage SparseIntArray mStateIds; AnimatedStateListState(@Nullable AnimatedStateListState orig, diff --git a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java index 90d6ab867fe1..bc00b43ddc96 100644 --- a/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimatedVectorDrawable.java @@ -25,6 +25,7 @@ import android.animation.TimeInterpolator; import android.animation.ValueAnimator; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.app.ActivityThread; import android.app.Application; import android.content.pm.ActivityInfo.Config; @@ -301,6 +302,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { private static final boolean DBG_ANIMATION_VECTOR_DRAWABLE = false; /** Local, mutable animator set. */ + @UnsupportedAppUsage private VectorDrawableAnimator mAnimatorSet; /** @@ -309,6 +311,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { */ private Resources mRes; + @UnsupportedAppUsage private AnimatedVectorDrawableState mAnimatedVectorState; /** The animator set that is parsed from the xml. */ @@ -638,6 +641,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { * Force to animate on UI thread. * @hide */ + @UnsupportedAppUsage public void forceAnimationOnUI() { if (mAnimatorSet instanceof VectorDrawableAnimatorRT) { VectorDrawableAnimatorRT animator = (VectorDrawableAnimatorRT) mAnimatorSet; @@ -1768,6 +1772,7 @@ public class AnimatedVectorDrawable extends Drawable implements Animatable2 { } // onFinished: should be called from native + @UnsupportedAppUsage private static void callOnFinished(VectorDrawableAnimatorRT set, int id) { set.onAnimationEnd(id); } diff --git a/graphics/java/android/graphics/drawable/AnimationDrawable.java b/graphics/java/android/graphics/drawable/AnimationDrawable.java index 0fd1741610ec..57764c2cb693 100644 --- a/graphics/java/android/graphics/drawable/AnimationDrawable.java +++ b/graphics/java/android/graphics/drawable/AnimationDrawable.java @@ -24,6 +24,7 @@ import org.xmlpull.v1.XmlPullParser; import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.Resources.Theme; @@ -88,6 +89,7 @@ public class AnimationDrawable extends DrawableContainer implements Runnable, An private AnimationState mAnimationState; /** The current frame, ranging from 0 to {@link #mAnimationState#getChildCount() - 1} */ + @UnsupportedAppUsage private int mCurFrame = 0; /** Whether the drawable has an animation callback posted. */ diff --git a/graphics/java/android/graphics/drawable/BitmapDrawable.java b/graphics/java/android/graphics/drawable/BitmapDrawable.java index 7ad062a6f6f9..9d278ad189e5 100644 --- a/graphics/java/android/graphics/drawable/BitmapDrawable.java +++ b/graphics/java/android/graphics/drawable/BitmapDrawable.java @@ -17,6 +17,7 @@ package android.graphics.drawable; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -86,9 +87,11 @@ public class BitmapDrawable extends Drawable { private final Rect mDstRect = new Rect(); // #updateDstRectAndInsetsIfDirty() sets this + @UnsupportedAppUsage private BitmapState mBitmapState; private PorterDuffColorFilter mTintFilter; + @UnsupportedAppUsage private int mTargetDensity = DisplayMetrics.DENSITY_DEFAULT; private boolean mDstRectAndInsetsDirty = true; @@ -222,6 +225,7 @@ public class BitmapDrawable extends Drawable { } /** @hide */ + @UnsupportedAppUsage public void setBitmap(Bitmap bitmap) { if (mBitmapState.mBitmap != bitmap) { mBitmapState.mBitmap = bitmap; @@ -680,6 +684,7 @@ public class BitmapDrawable extends Drawable { /** * @hide only needed by a hack within ProgressBar */ + @UnsupportedAppUsage public ColorStateList getTint() { return mBitmapState.mTint; } @@ -687,6 +692,7 @@ public class BitmapDrawable extends Drawable { /** * @hide only needed by a hack within ProgressBar */ + @UnsupportedAppUsage public Mode getTintMode() { return mBitmapState.mTintMode; } diff --git a/graphics/java/android/graphics/drawable/ClipDrawable.java b/graphics/java/android/graphics/drawable/ClipDrawable.java index d925b6b95c66..31fdb025bbc5 100644 --- a/graphics/java/android/graphics/drawable/ClipDrawable.java +++ b/graphics/java/android/graphics/drawable/ClipDrawable.java @@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.Resources.Theme; @@ -58,6 +59,7 @@ public class ClipDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); + @UnsupportedAppUsage private ClipState mState; ClipDrawable() { diff --git a/graphics/java/android/graphics/drawable/ColorDrawable.java b/graphics/java/android/graphics/drawable/ColorDrawable.java index 9ae747de2f82..7cbe92910f57 100644 --- a/graphics/java/android/graphics/drawable/ColorDrawable.java +++ b/graphics/java/android/graphics/drawable/ColorDrawable.java @@ -20,6 +20,7 @@ import android.annotation.ColorInt; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.graphics.*; import android.graphics.PorterDuff.Mode; @@ -46,6 +47,7 @@ import java.io.IOException; * @attr ref android.R.styleable#ColorDrawable_color */ public class ColorDrawable extends Drawable { + @UnsupportedAppUsage private final Paint mPaint = new Paint(Paint.ANTI_ALIAS_FLAG); @ViewDebug.ExportedProperty(deepExport = true, prefix = "state_") @@ -319,6 +321,7 @@ public class ColorDrawable extends Drawable { int[] mThemeAttrs; int mBaseColor; // base color, independent of setAlpha() @ViewDebug.ExportedProperty + @UnsupportedAppUsage int mUseColor; // basecolor modulated by setAlpha() @Config int mChangingConfigurations; ColorStateList mTint = null; diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index f17cd768c386..2a6d9129e13f 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -27,6 +27,7 @@ import android.annotation.IntRange; import android.annotation.NonNull; import android.annotation.Nullable; import android.annotation.TestApi; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -183,6 +184,7 @@ public abstract class Drawable { private int mLevel = 0; private @Config int mChangingConfigurations = 0; private Rect mBounds = ZERO_BOUNDS_RECT; // lazily becomes a new Rect() + @UnsupportedAppUsage private WeakReference mCallback = null; private boolean mVisible = true; @@ -201,6 +203,7 @@ public abstract class Drawable { * * @hide */ + @UnsupportedAppUsage protected int mSrcDensityOverride = 0; /** @@ -711,6 +714,7 @@ public abstract class Drawable { * * @hide magic! */ + @UnsupportedAppUsage public boolean isProjected() { return false; } @@ -1354,6 +1358,7 @@ public abstract class Drawable { * @throws XmlPullParserException * @throws IOException */ + @UnsupportedAppUsage void inflateWithAttributes(@NonNull @SuppressWarnings("unused") Resources r, @NonNull @SuppressWarnings("unused") XmlPullParser parser, @NonNull TypedArray attrs, @AttrRes int visibleAttr) throws XmlPullParserException, IOException { @@ -1473,6 +1478,7 @@ public abstract class Drawable { * Ensures the tint filter is consistent with the current tint color and * mode. */ + @UnsupportedAppUsage @Nullable PorterDuffColorFilter updateTintFilter(@Nullable PorterDuffColorFilter tintFilter, @Nullable ColorStateList tint, @Nullable PorterDuff.Mode tintMode) { if (tint == null || tintMode == null) { @@ -1579,6 +1585,7 @@ public abstract class Drawable { * * @hide */ + @UnsupportedAppUsage public static PorterDuff.Mode parseTintMode(int value, Mode defaultMode) { switch (value) { case 3: return Mode.SRC_OVER; diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index aa4cd9cba4a7..8c893e0d88f3 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -17,6 +17,7 @@ package android.graphics.drawable; import android.annotation.NonNull; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -54,9 +55,11 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { * to improve the quality at negligible cost. */ private static final boolean DEFAULT_DITHER = true; + @UnsupportedAppUsage private DrawableContainerState mDrawableContainerState; private Rect mHotspotBounds; private Drawable mCurrDrawable; + @UnsupportedAppUsage private Drawable mLastDrawable; private int mAlpha = 0xFF; @@ -689,11 +692,13 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { @Config int mChildrenChangingConfigurations; SparseArray mDrawableFutures; + @UnsupportedAppUsage Drawable[] mDrawables; int mNumChildren; boolean mVariablePadding = false; boolean mCheckedPadding; + @UnsupportedAppUsage Rect mConstantPadding; boolean mConstantSize = false; @@ -723,6 +728,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { boolean mAutoMirrored; ColorFilter mColorFilter; + @UnsupportedAppUsage boolean mHasColorFilter; ColorStateList mTintList; @@ -733,6 +739,7 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { /** * @hide */ + @UnsupportedAppUsage protected DrawableContainerState(DrawableContainerState orig, DrawableContainer owner, Resources res) { mOwner = owner; diff --git a/graphics/java/android/graphics/drawable/DrawableInflater.java b/graphics/java/android/graphics/drawable/DrawableInflater.java index eea7048ca534..0fea256f5010 100644 --- a/graphics/java/android/graphics/drawable/DrawableInflater.java +++ b/graphics/java/android/graphics/drawable/DrawableInflater.java @@ -22,6 +22,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.DrawableRes; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.Context; import android.content.res.Resources; import android.content.res.Resources.Theme; @@ -49,6 +50,7 @@ public final class DrawableInflater { new HashMap<>(); private final Resources mRes; + @UnsupportedAppUsage private final ClassLoader mClassLoader; /** diff --git a/graphics/java/android/graphics/drawable/DrawableWrapper.java b/graphics/java/android/graphics/drawable/DrawableWrapper.java index cf821bb6ac8b..8e5151117115 100644 --- a/graphics/java/android/graphics/drawable/DrawableWrapper.java +++ b/graphics/java/android/graphics/drawable/DrawableWrapper.java @@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -45,6 +46,7 @@ import java.io.IOException; * Drawable container with only one child element. */ public abstract class DrawableWrapper extends Drawable implements Drawable.Callback { + @UnsupportedAppUsage private DrawableWrapperState mState; private Drawable mDrawable; private boolean mMutated; diff --git a/graphics/java/android/graphics/drawable/GradientDrawable.java b/graphics/java/android/graphics/drawable/GradientDrawable.java index 6c3aea2202a2..3da12209e333 100644 --- a/graphics/java/android/graphics/drawable/GradientDrawable.java +++ b/graphics/java/android/graphics/drawable/GradientDrawable.java @@ -20,6 +20,7 @@ import android.annotation.ColorInt; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -154,10 +155,14 @@ public class GradientDrawable extends Drawable { private static final float DEFAULT_INNER_RADIUS_RATIO = 3.0f; private static final float DEFAULT_THICKNESS_RATIO = 9.0f; + @UnsupportedAppUsage private GradientState mGradientState; + @UnsupportedAppUsage private final Paint mFillPaint = new Paint(Paint.ANTI_ALIAS_FLAG); + @UnsupportedAppUsage private Rect mPadding; + @UnsupportedAppUsage private Paint mStrokePaint; // optional, set by the caller private ColorFilter mColorFilter; // optional, set by the caller private PorterDuffColorFilter mTintFilter; @@ -1774,27 +1779,46 @@ public class GradientDrawable extends Drawable { final static class GradientState extends ConstantState { public @Config int mChangingConfigurations; + @UnsupportedAppUsage public @Shape int mShape = RECTANGLE; + @UnsupportedAppUsage public @GradientType int mGradient = LINEAR_GRADIENT; + @UnsupportedAppUsage public int mAngle = 0; + @UnsupportedAppUsage public Orientation mOrientation; + @UnsupportedAppUsage public ColorStateList mSolidColors; public ColorStateList mStrokeColors; + @UnsupportedAppUsage public @ColorInt int[] mGradientColors; public @ColorInt int[] mTempColors; // no need to copy public float[] mTempPositions; // no need to copy + @UnsupportedAppUsage public float[] mPositions; + @UnsupportedAppUsage public int mStrokeWidth = -1; // if >= 0 use stroking. + @UnsupportedAppUsage public float mStrokeDashWidth = 0.0f; + @UnsupportedAppUsage public float mStrokeDashGap = 0.0f; + @UnsupportedAppUsage public float mRadius = 0.0f; // use this if mRadiusArray is null + @UnsupportedAppUsage public float[] mRadiusArray = null; + @UnsupportedAppUsage public Rect mPadding = null; + @UnsupportedAppUsage public int mWidth = -1; + @UnsupportedAppUsage public int mHeight = -1; + @UnsupportedAppUsage public float mInnerRadiusRatio = DEFAULT_INNER_RADIUS_RATIO; + @UnsupportedAppUsage public float mThicknessRatio = DEFAULT_THICKNESS_RATIO; + @UnsupportedAppUsage public int mInnerRadius = -1; + @UnsupportedAppUsage public int mThickness = -1; public boolean mDither = false; public Insets mOpticalInsets = Insets.NONE; diff --git a/graphics/java/android/graphics/drawable/Icon.java b/graphics/java/android/graphics/drawable/Icon.java index c329918afc27..7c4fb7c59faa 100644 --- a/graphics/java/android/graphics/drawable/Icon.java +++ b/graphics/java/android/graphics/drawable/Icon.java @@ -18,6 +18,7 @@ package android.graphics.drawable; import android.annotation.ColorInt; import android.annotation.DrawableRes; +import android.annotation.UnsupportedAppUsage; import android.content.res.ColorStateList; import android.content.ContentResolver; import android.content.Context; @@ -73,6 +74,7 @@ public final class Icon implements Parcelable { private static final int VERSION_STREAM_SERIALIZER = 1; + @UnsupportedAppUsage private final int mType; private ColorStateList mTintList; @@ -89,6 +91,7 @@ public final class Icon implements Parcelable { // TYPE_RESOURCE: package name // TYPE_URI: uri string + @UnsupportedAppUsage private String mString1; // TYPE_RESOURCE: resId @@ -115,6 +118,7 @@ public final class Icon implements Parcelable { * @return The {@link android.graphics.Bitmap} held by this {@link #TYPE_BITMAP} Icon. * @hide */ + @UnsupportedAppUsage public Bitmap getBitmap() { if (mType != TYPE_BITMAP && mType != TYPE_ADAPTIVE_BITMAP) { throw new IllegalStateException("called getBitmap() on " + this); @@ -130,6 +134,7 @@ public final class Icon implements Parcelable { * @return The length of the compressed bitmap byte array held by this {@link #TYPE_DATA} Icon. * @hide */ + @UnsupportedAppUsage public int getDataLength() { if (mType != TYPE_DATA) { throw new IllegalStateException("called getDataLength() on " + this); @@ -144,6 +149,7 @@ public final class Icon implements Parcelable { * valid compressed bitmap data is found. * @hide */ + @UnsupportedAppUsage public int getDataOffset() { if (mType != TYPE_DATA) { throw new IllegalStateException("called getDataOffset() on " + this); @@ -158,6 +164,7 @@ public final class Icon implements Parcelable { * bitmap data. * @hide */ + @UnsupportedAppUsage public byte[] getDataBytes() { if (mType != TYPE_DATA) { throw new IllegalStateException("called getDataBytes() on " + this); @@ -171,6 +178,7 @@ public final class Icon implements Parcelable { * @return The {@link android.content.res.Resources} for this {@link #TYPE_RESOURCE} Icon. * @hide */ + @UnsupportedAppUsage public Resources getResources() { if (mType != TYPE_RESOURCE) { throw new IllegalStateException("called getResources() on " + this); @@ -524,6 +532,7 @@ public final class Icon implements Parcelable { * Version of createWithResource that takes Resources. Do not use. * @hide */ + @UnsupportedAppUsage public static Icon createWithResource(Resources res, @DrawableRes int resId) { if (res == null) { throw new IllegalArgumentException("Resource must not be null."); @@ -656,6 +665,7 @@ public final class Icon implements Parcelable { } /** @hide */ + @UnsupportedAppUsage public boolean hasTint() { return (mTintList != null) || (mTintMode != DEFAULT_TINT_MODE); } diff --git a/graphics/java/android/graphics/drawable/InsetDrawable.java b/graphics/java/android/graphics/drawable/InsetDrawable.java index 443aa4931ee3..f342dde24d01 100644 --- a/graphics/java/android/graphics/drawable/InsetDrawable.java +++ b/graphics/java/android/graphics/drawable/InsetDrawable.java @@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; @@ -57,6 +58,7 @@ public class InsetDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); private final Rect mTmpInsetRect = new Rect(); + @UnsupportedAppUsage private InsetState mState; /** diff --git a/graphics/java/android/graphics/drawable/LayerDrawable.java b/graphics/java/android/graphics/drawable/LayerDrawable.java index 4725c2c4c0e5..b4392c8d023f 100644 --- a/graphics/java/android/graphics/drawable/LayerDrawable.java +++ b/graphics/java/android/graphics/drawable/LayerDrawable.java @@ -18,6 +18,7 @@ package android.graphics.drawable; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -93,6 +94,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { public static final int INSET_UNDEFINED = Integer.MIN_VALUE; @NonNull + @UnsupportedAppUsage LayerState mLayerState; private int[] mPaddingL; @@ -428,6 +430,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { * @param layer The layer to add. * @return The index of the layer. */ + @UnsupportedAppUsage int addLayer(@NonNull ChildDrawable layer) { final LayerState st = mLayerState; final int N = st.mChildren != null ? st.mChildren.length : 0; @@ -1739,6 +1742,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { /** * Ensures the child padding caches are large enough. */ + @UnsupportedAppUsage void ensurePadding() { final int N = mLayerState.mNumChildren; if (mPaddingL != null && mPaddingL.length >= N) { @@ -1820,6 +1824,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { } static class ChildDrawable { + @UnsupportedAppUsage public Drawable mDrawable; public int[] mThemeAttrs; public int mDensity = DisplayMetrics.DENSITY_DEFAULT; @@ -1922,6 +1927,7 @@ public class LayerDrawable extends Drawable implements Drawable.Callback { private int[] mThemeAttrs; int mNumChildren; + @UnsupportedAppUsage ChildDrawable[] mChildren; int mDensity; diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index 17900204fa22..492851cf8a75 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -18,6 +18,7 @@ package android.graphics.drawable; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -70,6 +71,7 @@ public class NinePatchDrawable extends Drawable { /** Temporary rect used for density scaling. */ private Rect mTempRect; + @UnsupportedAppUsage private NinePatchState mNinePatchState; private PorterDuffColorFilter mTintFilter; private Rect mPadding; @@ -584,6 +586,7 @@ public class NinePatchDrawable extends Drawable { @Config int mChangingConfigurations; // Values loaded during inflation. + @UnsupportedAppUsage NinePatch mNinePatch = null; ColorStateList mTint = null; Mode mTintMode = DEFAULT_TINT_MODE; diff --git a/graphics/java/android/graphics/drawable/RippleDrawable.java b/graphics/java/android/graphics/drawable/RippleDrawable.java index 8f314c9c36aa..2cf26ee7a929 100644 --- a/graphics/java/android/graphics/drawable/RippleDrawable.java +++ b/graphics/java/android/graphics/drawable/RippleDrawable.java @@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.Resources; @@ -120,6 +121,7 @@ public class RippleDrawable extends LayerDrawable { private final Rect mDirtyBounds = new Rect(); /** Mirrors mLayerState with some extra information. */ + @UnsupportedAppUsage private RippleState mState; /** The masking layer, e.g. the layer with id R.id.mask. */ @@ -160,6 +162,7 @@ public class RippleDrawable extends LayerDrawable { private Paint mRipplePaint; /** Target density of the display into which ripples are drawn. */ + @UnsupportedAppUsage private int mDensity; /** Whether bounds are being overridden. */ @@ -910,6 +913,7 @@ public class RippleDrawable extends LayerDrawable { mMask.draw(canvas); } + @UnsupportedAppUsage private Paint getRipplePaint() { if (mRipplePaint == null) { mRipplePaint = new Paint(); @@ -960,6 +964,7 @@ public class RippleDrawable extends LayerDrawable { * @param forceSoftware true if RenderThread animations should be disabled, false otherwise * @hide */ + @UnsupportedAppUsage public void setForceSoftware(boolean forceSoftware) { mForceSoftware = forceSoftware; } @@ -990,6 +995,7 @@ public class RippleDrawable extends LayerDrawable { static class RippleState extends LayerState { int[] mTouchThemeAttrs; + @UnsupportedAppUsage ColorStateList mColor = ColorStateList.valueOf(Color.MAGENTA); int mMaxRadius = RADIUS_AUTO; diff --git a/graphics/java/android/graphics/drawable/RotateDrawable.java b/graphics/java/android/graphics/drawable/RotateDrawable.java index c0dfe77cf4f3..db5f082bd853 100644 --- a/graphics/java/android/graphics/drawable/RotateDrawable.java +++ b/graphics/java/android/graphics/drawable/RotateDrawable.java @@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.graphics.Canvas; import android.graphics.Rect; import android.content.res.Resources; @@ -54,6 +55,7 @@ import java.io.IOException; public class RotateDrawable extends DrawableWrapper { private static final int MAX_LEVEL = 10000; + @UnsupportedAppUsage private RotateState mState; /** diff --git a/graphics/java/android/graphics/drawable/ScaleDrawable.java b/graphics/java/android/graphics/drawable/ScaleDrawable.java index 51e143baeac4..91ed061e511d 100644 --- a/graphics/java/android/graphics/drawable/ScaleDrawable.java +++ b/graphics/java/android/graphics/drawable/ScaleDrawable.java @@ -23,6 +23,7 @@ import org.xmlpull.v1.XmlPullParserException; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.Resources.Theme; import android.content.res.TypedArray; @@ -66,6 +67,7 @@ public class ScaleDrawable extends DrawableWrapper { private final Rect mTmpRect = new Rect(); + @UnsupportedAppUsage private ScaleState mState; ScaleDrawable() { diff --git a/graphics/java/android/graphics/drawable/StateListDrawable.java b/graphics/java/android/graphics/drawable/StateListDrawable.java index c98f1608c665..fa18f64981b9 100644 --- a/graphics/java/android/graphics/drawable/StateListDrawable.java +++ b/graphics/java/android/graphics/drawable/StateListDrawable.java @@ -26,6 +26,7 @@ import java.util.Arrays; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.res.Resources; import android.content.res.TypedArray; import android.content.res.Resources.Theme; @@ -63,6 +64,7 @@ public class StateListDrawable extends DrawableContainer { private static final boolean DEBUG = false; + @UnsupportedAppUsage private StateListState mStateListState; private boolean mMutated; @@ -127,6 +129,7 @@ public class StateListDrawable extends DrawableContainer { /** * Updates the constant state from the values in the typed array. */ + @UnsupportedAppUsage private void updateStateFromTypedArray(TypedArray a) { final StateListState state = mStateListState; @@ -204,6 +207,7 @@ public class StateListDrawable extends DrawableContainer { * @param attrs The attribute set. * @return An array of state_ attributes. */ + @UnsupportedAppUsage int[] extractStateSet(AttributeSet attrs) { int j = 0; final int numAttrs = attrs.getAttributeCount(); @@ -331,6 +335,7 @@ public class StateListDrawable extends DrawableContainer { mStateSets = stateSets; } + @UnsupportedAppUsage int addStateSet(int[] stateSet, Drawable drawable) { final int pos = addChild(drawable); mStateSets[pos] = stateSet; diff --git a/graphics/java/android/graphics/drawable/TransitionDrawable.java b/graphics/java/android/graphics/drawable/TransitionDrawable.java index 3dfd68018a6b..276f3662189b 100644 --- a/graphics/java/android/graphics/drawable/TransitionDrawable.java +++ b/graphics/java/android/graphics/drawable/TransitionDrawable.java @@ -16,6 +16,7 @@ package android.graphics.drawable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.Resources; import android.graphics.Canvas; @@ -65,10 +66,13 @@ public class TransitionDrawable extends LayerDrawable implements Drawable.Callba private boolean mReverse; private long mStartTimeMillis; private int mFrom; + @UnsupportedAppUsage private int mTo; private int mDuration; private int mOriginalDuration; + @UnsupportedAppUsage private int mAlpha = 0; + @UnsupportedAppUsage private boolean mCrossFade; /** diff --git a/graphics/java/android/graphics/drawable/VectorDrawable.java b/graphics/java/android/graphics/drawable/VectorDrawable.java index ceac3253e178..7832832c30d4 100644 --- a/graphics/java/android/graphics/drawable/VectorDrawable.java +++ b/graphics/java/android/graphics/drawable/VectorDrawable.java @@ -16,6 +16,7 @@ package android.graphics.drawable; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.content.pm.ActivityInfo.Config; import android.content.res.ColorStateList; import android.content.res.ComplexColor; @@ -243,6 +244,7 @@ public class VectorDrawable extends Drawable { private VectorDrawableState mVectorState; + @UnsupportedAppUsage private PorterDuffColorFilter mTintFilter; private ColorFilter mColorFilter; @@ -311,6 +313,7 @@ public class VectorDrawable extends Drawable { mMutated = false; } + @UnsupportedAppUsage Object getTargetByName(String name) { return mVectorState.mVGTargetsMap.get(name); } @@ -790,6 +793,7 @@ public class VectorDrawable extends Drawable { return super.getChangingConfigurations() | mVectorState.getChangingConfigurations(); } + @UnsupportedAppUsage void setAllowCaching(boolean allowCaching) { nSetAllowCaching(mVectorState.getNativeRenderer(), allowCaching); } @@ -1414,6 +1418,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setRotation(float rotation) { if (isTreeValid()) { nSetRotation(mNativePtr, rotation); @@ -1426,6 +1431,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setPivotX(float pivotX) { if (isTreeValid()) { nSetPivotX(mNativePtr, pivotX); @@ -1438,6 +1444,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setPivotY(float pivotY) { if (isTreeValid()) { nSetPivotY(mNativePtr, pivotY); @@ -1474,6 +1481,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setTranslateX(float translateX) { if (isTreeValid()) { nSetTranslateX(mNativePtr, translateX); @@ -1486,6 +1494,7 @@ public class VectorDrawable extends Drawable { } @SuppressWarnings("unused") + @UnsupportedAppUsage public void setTranslateY(float translateY) { if (isTreeValid()) { nSetTranslateY(mNativePtr, translateY); diff --git a/graphics/java/android/graphics/fonts/FontVariationAxis.java b/graphics/java/android/graphics/fonts/FontVariationAxis.java index 99564fab94cd..f12b31f1c419 100644 --- a/graphics/java/android/graphics/fonts/FontVariationAxis.java +++ b/graphics/java/android/graphics/fonts/FontVariationAxis.java @@ -18,6 +18,7 @@ package android.graphics.fonts; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.text.TextUtils; import java.util.ArrayList; @@ -27,8 +28,10 @@ import java.util.regex.Pattern; * Class that holds information about single font variation axis. */ public final class FontVariationAxis { + @UnsupportedAppUsage private final int mTag; private final String mTagString; + @UnsupportedAppUsage private final float mStyleValue; /** diff --git a/graphics/java/android/graphics/pdf/PdfRenderer.java b/graphics/java/android/graphics/pdf/PdfRenderer.java index 29e1ea0fee5d..5aca478f0d49 100644 --- a/graphics/java/android/graphics/pdf/PdfRenderer.java +++ b/graphics/java/android/graphics/pdf/PdfRenderer.java @@ -19,6 +19,7 @@ package android.graphics.pdf; import android.annotation.IntDef; import android.annotation.NonNull; import android.annotation.Nullable; +import android.annotation.UnsupportedAppUsage; import android.graphics.Bitmap; import android.graphics.Bitmap.Config; import android.graphics.Matrix; @@ -116,6 +117,7 @@ public final class PdfRenderer implements AutoCloseable { private ParcelFileDescriptor mInput; + @UnsupportedAppUsage private Page mCurrentPage; /** @hide */ @@ -242,6 +244,7 @@ public final class PdfRenderer implements AutoCloseable { } } + @UnsupportedAppUsage private void doClose() { if (mCurrentPage != null) { mCurrentPage.close(); -- cgit v1.2.3-59-g8ed1b