drgreen/android_frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge change 6478 into donut

Browse Source 
* changes:
  Fix ShapeDrawable.inflateTag() to accept proper dimension specs for padding
This commit is contained in:
Android (Google) Code Review
2009-07-08 10:43:44 -07:00
parent 831ea07dab 90cfa9df3f
commit 6b5328006f
1 changed files with 9 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
graphics/java/android/graphics/drawable/ShapeDrawable.java
View File

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