Merge change 26636 into eclair (7475be4b) · Commits · e / os / android_frameworks_base

graphics/java/android/graphics/drawable/NinePatchDrawable.java

+20 −6

Original line number	Diff line number	Diff line
		@@ -156,10 +156,24 @@ public class NinePatchDrawable extends Drawable {
		private void computeBitmapSize() {
		final int sdensity = mNinePatch.getDensity();
		final int tdensity = mTargetDensity;
		if (sdensity == tdensity) {
		mBitmapWidth = mNinePatch.getWidth();
		mBitmapHeight = mNinePatch.getHeight();
		} else {
		mBitmapWidth = Bitmap.scaleFromDensity(mNinePatch.getWidth(),
		sdensity, tdensity);
		mBitmapHeight = Bitmap.scaleFromDensity(mNinePatch.getHeight(),
		sdensity, tdensity);
		Rect dest = mPadding;
		Rect src = mNinePatchState.mPadding;
		if (dest == src) {
		mPadding = dest = new Rect(src);
		}
		dest.left = Bitmap.scaleFromDensity(src.left, sdensity, tdensity);
		dest.top = Bitmap.scaleFromDensity(src.top, sdensity, tdensity);
		dest.right = Bitmap.scaleFromDensity(src.right, sdensity, tdensity);
		dest.bottom = Bitmap.scaleFromDensity(src.bottom, sdensity, tdensity);
		}
		}

		// overrides
		@@ -320,7 +334,6 @@ public class NinePatchDrawable extends Drawable {
		if (!mMutated && super.mutate() == this) {
		mNinePatchState = new NinePatchState(mNinePatchState);
		mNinePatch = mNinePatchState.mNinePatch;
		mPadding = mNinePatchState.mPadding;
		mMutated = true;
		}
		return this;
		@@ -345,7 +358,8 @@ public class NinePatchDrawable extends Drawable {

		NinePatchState(NinePatchState state) {
		mNinePatch = new NinePatch(state.mNinePatch);
		mPadding = new Rect(state.mPadding);
		// Note we don't copy the padding because it is immutable.
		mPadding = state.mPadding;
		mDither = state.mDither;
		mChangingConfigurations = state.mChangingConfigurations;
		mTargetDensity = state.mTargetDensity;