Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
* commit 'e34c477060bf7e212177029598bea0b04adc6f80':
  Fix bug #11537133 Hideycling looks broken (KOT36), missing left padding
This commit is contained in:
Fabrice Di Meglio
2013-11-07 11:23:29 -08:00
committed by Android Git Automerger
parent c3eef19047 e34c477060
commit 4833a6ce44
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
graphics/java/android/graphics/drawable/DrawableContainer.java
View File

@@ -88,9 +88,10 @@ public class DrawableContainer extends Drawable implements Drawable.Callback {
@Override @Override
public boolean getPadding(Rect padding) { public boolean getPadding(Rect padding) {
final Rect r = mDrawableContainerState.getConstantPadding(); final Rect r = mDrawableContainerState.getConstantPadding();
boolean result = true; boolean result;
if (r != null) { if (r != null) {
padding.set(r); padding.set(r);
result = (r.left | r.top | r.bottom | r.right) != 0;
} else { } else {
if (mCurrDrawable != null) { if (mCurrDrawable != null) {
result = mCurrDrawable.getPadding(padding); result = mCurrDrawable.getPadding(padding);

2
graphics/java/android/graphics/drawable/NinePatchDrawable.java
View File

@@ -244,7 +244,7 @@ public class NinePatchDrawable extends Drawable {
} else { } else {
padding.set(mPadding); padding.set(mPadding);
} }
return true; return (padding.left | padding.top | padding.right | padding.bottom) != 0;
} }
/** /**