commit 8e0fb6e9c3cf8d73449ae63757a675f00b9aa820
author Fabrice Di Meglio <fdimeglio@google.com> Thu Nov 07 15:13:09 2013 -0800
committer Android Git Automerger <android-git-automerger@android.com> Thu Nov 07 15:13:09 2013 -0800
tree 722727f7bc154bed923dfdd4f82ba1910016b681
parent d528d48e5d8444de0730d62b9f621b9cc2df5fbd
parent 4833a6ce44becf0d73e9727da64d8c7bd0f89549

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

graphics/java/android/graphics/drawable/DrawableContainer.java

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 @@
     @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);

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

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 @@
         } else {
             padding.set(mPadding);
         }
-        return true;
+        return (padding.left | padding.top | padding.right | padding.bottom) != 0;
     }
 
     /**