diff options
| -rw-r--r-- | graphics/java/android/graphics/drawable/NinePatchDrawable.java | 18 |
1 files changed, 10 insertions, 8 deletions
diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index bad94fb..00416d8 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -164,15 +164,17 @@ public class NinePatchDrawable extends Drawable { sdensity, tdensity); mBitmapHeight = Bitmap.scaleFromDensity(mNinePatch.getHeight(), sdensity, tdensity); - Rect dest = mPadding; - Rect src = mNinePatchState.mPadding; - if (dest == src) { - mPadding = dest = new Rect(src); + if (mNinePatchState.mPadding != null && mPadding != null) { + 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); } - 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); } } |