Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4833a6ce authored by Fabrice Di Meglio's avatar Fabrice Di Meglio Committed by Android Git Automerger
Browse files

am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken... 

am e34c4770: am 435c0ee1: Merge "Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding" into klp-dev

* commit 'e34c4770':
  Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
parents c3eef190 e34c4770

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

+2 −1
Original line number Diff line number Diff line
@@ -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);

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

+1 −1
Original line number Diff line number Diff line
@@ -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;

    }



    /**