diff options
| author | Jean-Baptiste Queru <jbq@google.com> | 2010-09-26 08:44:16 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-09-26 08:44:16 -0700 |
| commit | 81859bc3d4d18f558b903db1306e76d0db115cf6 (patch) | |
| tree | 2597a9cd2a175d17416595268996bf23bf09fb3b /graphics | |
| parent | 79d716f7dec8558e282d13c4372b8b2999bab06d (diff) | |
| parent | ca3f968c6f0acbf94988d00bf21a82a2e8f49b86 (diff) | |
| download | frameworks_base-81859bc3d4d18f558b903db1306e76d0db115cf6.zip frameworks_base-81859bc3d4d18f558b903db1306e76d0db115cf6.tar.gz frameworks_base-81859bc3d4d18f558b903db1306e76d0db115cf6.tar.bz2 | |
am ca3f968c: am 7d9c73fb: Merge "Prevent unhandled exception in NinePatchDrawable"
Merge commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86'
* commit 'ca3f968c6f0acbf94988d00bf21a82a2e8f49b86':
Prevent unhandled exception in NinePatchDrawable
Diffstat (limited to 'graphics')
| -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 9a98d53..23efcd1 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); } } |