diff options
| author | Fabrice Di Meglio <fdimeglio@google.com> | 2013-11-07 15:13:09 -0800 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-11-07 15:13:09 -0800 |
| commit | 8e0fb6e9c3cf8d73449ae63757a675f00b9aa820 (patch) | |
| tree | 722727f7bc154bed923dfdd4f82ba1910016b681 /graphics | |
| parent | d528d48e5d8444de0730d62b9f621b9cc2df5fbd (diff) | |
| parent | 4833a6ce44becf0d73e9727da64d8c7bd0f89549 (diff) | |
| download | frameworks_base-8e0fb6e9c3cf8d73449ae63757a675f00b9aa820.zip frameworks_base-8e0fb6e9c3cf8d73449ae63757a675f00b9aa820.tar.gz frameworks_base-8e0fb6e9c3cf8d73449ae63757a675f00b9aa820.tar.bz2 | |
am 4833a6ce: am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev
* commit '4833a6ce44becf0d73e9727da64d8c7bd0f89549':
Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
Diffstat (limited to 'graphics')
| -rw-r--r-- | graphics/java/android/graphics/drawable/DrawableContainer.java | 3 | ||||
| -rw-r--r-- | graphics/java/android/graphics/drawable/NinePatchDrawable.java | 2 |
2 files changed, 3 insertions, 2 deletions
diff --git a/graphics/java/android/graphics/drawable/DrawableContainer.java b/graphics/java/android/graphics/drawable/DrawableContainer.java index af8441a..aac7876 100644 --- a/graphics/java/android/graphics/drawable/DrawableContainer.java +++ b/graphics/java/android/graphics/drawable/DrawableContainer.java @@ -88,9 +88,10 @@ public class DrawableContainer extends Drawable implements Drawable.Callback { @Override public boolean getPadding(Rect padding) { final Rect r = mDrawableContainerState.getConstantPadding(); - boolean result = true; + boolean result; if (r != null) { padding.set(r); + result = (r.left | r.top | r.bottom | r.right) != 0; } else { if (mCurrDrawable != null) { result = mCurrDrawable.getPadding(padding); diff --git a/graphics/java/android/graphics/drawable/NinePatchDrawable.java b/graphics/java/android/graphics/drawable/NinePatchDrawable.java index ab34c0f..9c57a2c 100644 --- a/graphics/java/android/graphics/drawable/NinePatchDrawable.java +++ b/graphics/java/android/graphics/drawable/NinePatchDrawable.java @@ -244,7 +244,7 @@ public class NinePatchDrawable extends Drawable { } else { padding.set(mPadding); } - return true; + return (padding.left | padding.top | padding.right | padding.bottom) != 0; } /** |