diff options
Diffstat (limited to 'graphics/java/android')
4 files changed, 34 insertions, 20 deletions
diff --git a/graphics/java/android/graphics/drawable/Drawable.java b/graphics/java/android/graphics/drawable/Drawable.java index f9392e4..54d1bf5 100644 --- a/graphics/java/android/graphics/drawable/Drawable.java +++ b/graphics/java/android/graphics/drawable/Drawable.java @@ -715,7 +715,7 @@ public abstract class Drawable { * * @hide */ - public Insets getLayoutInsets() { + public Insets getOpticalInsets() { return Insets.NONE; } diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index 41b272d..3af2969 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -95,8 +95,8 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { * @hide */ @Override - public Insets getLayoutInsets() { - return (mCurrDrawable == null) ? Insets.NONE : mCurrDrawable.getLayoutInsets(); + public Insets getOpticalInsets() { + return (mCurrDrawable == null) ? Insets.NONE : mCurrDrawable.getOpticalInsets(); } @Override diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index 2ee6233..a9dc22b 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -56,7 +56,7 @@ public class NinePatchDrawable extends Drawable { private NinePatchState mNinePatchState; private NinePatch mNinePatch; private Rect mPadding; - private Insets mLayoutInsets = Insets.NONE; + private Insets mOpticalInsets = Insets.NONE; private Paint mPaint; private boolean mMutated; @@ -96,8 +96,8 @@ public class NinePatchDrawable extends Drawable { * @hide */ public NinePatchDrawable(Resources res, Bitmap bitmap, byte[] chunk, - Rect padding, Rect layoutInsets, String srcName) { - this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding, layoutInsets), res); + Rect padding, Rect opticalInsets, String srcName) { + this(new NinePatchState(new NinePatch(bitmap, chunk, srcName), padding, opticalInsets), res); mNinePatchState.mTargetDensity = mTargetDensity; } @@ -195,7 +195,7 @@ public class NinePatchDrawable extends Drawable { if (sdensity == tdensity) { mBitmapWidth = mNinePatch.getWidth(); mBitmapHeight = mNinePatch.getHeight(); - mLayoutInsets = mNinePatchState.mLayoutInsets; + mOpticalInsets = mNinePatchState.mOpticalInsets; } else { mBitmapWidth = Bitmap.scaleFromDensity(mNinePatch.getWidth(), sdensity, tdensity); @@ -212,7 +212,7 @@ public class NinePatchDrawable extends Drawable { dest.right = Bitmap.scaleFromDensity(src.right, sdensity, tdensity); dest.bottom = Bitmap.scaleFromDensity(src.bottom, sdensity, tdensity); } - mLayoutInsets = scaleFromDensity(mNinePatchState.mLayoutInsets, sdensity, tdensity); + mOpticalInsets = scaleFromDensity(mNinePatchState.mOpticalInsets, sdensity, tdensity); } } @@ -236,8 +236,8 @@ public class NinePatchDrawable extends Drawable { * @hide */ @Override - public Insets getLayoutInsets() { - return mLayoutInsets; + public Insets getOpticalInsets() { + return mOpticalInsets; } @Override @@ -299,7 +299,7 @@ public class NinePatchDrawable extends Drawable { options.inScreenDensity = r.getDisplayMetrics().noncompatDensityDpi; final Rect padding = new Rect(); - final Rect layoutInsets = new Rect(); + final Rect opticalInsets = new Rect(); Bitmap bitmap = null; try { @@ -323,7 +323,7 @@ public class NinePatchDrawable extends Drawable { setNinePatchState(new NinePatchState( new NinePatch(bitmap, bitmap.getNinePatchChunk(), "XML 9-patch"), - padding, layoutInsets, dither), r); + padding, opticalInsets, dither), r); mNinePatchState.mTargetDensity = mTargetDensity; a.recycle(); @@ -397,7 +397,7 @@ public class NinePatchDrawable extends Drawable { private final static class NinePatchState extends ConstantState { final NinePatch mNinePatch; final Rect mPadding; - final Insets mLayoutInsets; + final Insets mOpticalInsets; final boolean mDither; int mChangingConfigurations; int mTargetDensity = DisplayMetrics.DENSITY_DEFAULT; @@ -406,14 +406,14 @@ public class NinePatchDrawable extends Drawable { this(ninePatch, padding, new Rect(), DEFAULT_DITHER); } - NinePatchState(NinePatch ninePatch, Rect padding, Rect layoutInsets) { - this(ninePatch, padding, layoutInsets, DEFAULT_DITHER); + NinePatchState(NinePatch ninePatch, Rect padding, Rect opticalInsets) { + this(ninePatch, padding, opticalInsets, DEFAULT_DITHER); } - NinePatchState(NinePatch ninePatch, Rect rect, Rect layoutInsets, boolean dither) { + NinePatchState(NinePatch ninePatch, Rect rect, Rect opticalInsets, boolean dither) { mNinePatch = ninePatch; mPadding = rect; - mLayoutInsets = Insets.of(layoutInsets); + mOpticalInsets = Insets.of(opticalInsets); mDither = dither; } @@ -423,7 +423,7 @@ public class NinePatchDrawable extends Drawable { mNinePatch = new NinePatch(state.mNinePatch); // Note we don't copy the padding because it is immutable. mPadding = state.mPadding; - mLayoutInsets = state.mLayoutInsets; + mOpticalInsets = state.mOpticalInsets; mDither = state.mDither; mChangingConfigurations = state.mChangingConfigurations; mTargetDensity = state.mTargetDensity; diff --git a/graphics/java/android/renderscript/Allocation.java b/graphics/java/android/renderscript/Allocation.java index 10ccb87..e44a3ef 100644 --- a/graphics/java/android/renderscript/Allocation.java +++ b/graphics/java/android/renderscript/Allocation.java @@ -568,6 +568,21 @@ public class Allocation extends BaseObj { } /** + * Copy an allocation from an allocation. The types of both allocations + * must be identical. + * + * @param a the source allocation + */ + public void copyFrom(Allocation a) { + mRS.validate(); + if (!mType.equals(a.getType())) { + throw new RSIllegalArgumentException("Types of allocations must match."); + } + copy2DRangeFrom(0, 0, mCurrentDimX, mCurrentDimY, a, 0, 0); + } + + + /** * This is only intended to be used by auto-generate code reflected from the * renderscript script files. * @@ -971,11 +986,10 @@ public class Allocation extends BaseObj { * * A new type will be created with the new dimension. * - * @hide * @param dimX The new size of the allocation. * @param dimY The new size of the allocation. */ - public void resize(int dimX, int dimY) { + public synchronized void resize(int dimX, int dimY) { if ((mType.getZ() > 0) || mType.hasFaces() || mType.hasMipmaps()) { throw new RSInvalidStateException( "Resize only support for 2D allocations at this time."); |