Merge change 6478 into donut
* changes: Fix ShapeDrawable.inflateTag() to accept proper dimension specs for padding
This commit is contained in:
@ -278,10 +278,15 @@ public class ShapeDrawable extends Drawable {
|
|||||||
if (name.equals("padding")) {
|
if (name.equals("padding")) {
|
||||||
TypedArray a = r.obtainAttributes(attrs,
|
TypedArray a = r.obtainAttributes(attrs,
|
||||||
com.android.internal.R.styleable.ShapeDrawablePadding);
|
com.android.internal.R.styleable.ShapeDrawablePadding);
|
||||||
setPadding(a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_left, 0),
|
setPadding(
|
||||||
a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_top, 0),
|
a.getDimensionPixelOffset(
|
||||||
a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_right, 0),
|
com.android.internal.R.styleable.ShapeDrawablePadding_left, 0),
|
||||||
a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_bottom, 0));
|
a.getDimensionPixelOffset(
|
||||||
|
com.android.internal.R.styleable.ShapeDrawablePadding_top, 0),
|
||||||
|
a.getDimensionPixelOffset(
|
||||||
|
com.android.internal.R.styleable.ShapeDrawablePadding_right, 0),
|
||||||
|
a.getDimensionPixelOffset(
|
||||||
|
com.android.internal.R.styleable.ShapeDrawablePadding_bottom, 0));
|
||||||
a.recycle();
|
a.recycle();
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user