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

Commit eabdb7c2 authored by Android (Google) Code Review's avatar Android (Google) Code Review Committed by The Android Open Source Project
Browse files

am 6b532800: Merge change 6478 into donut 

Merge commit '6b532800'

* commit '6b532800':
  Fix ShapeDrawable.inflateTag() to accept proper dimension specs for padding
parents 286dda8d 6b532800

graphics/java/android/graphics/drawable/ShapeDrawable.java

+9 −4
Original line number Diff line number Diff line
@@ -278,10 +278,15 @@ public class ShapeDrawable extends Drawable { 
        if (name.equals("padding")) {

            TypedArray a = r.obtainAttributes(attrs,

                    com.android.internal.R.styleable.ShapeDrawablePadding);

            setPadding(a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_left, 0),

                       a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_top, 0),

                       a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_right, 0),

                       a.getInt(com.android.internal.R.styleable.ShapeDrawablePadding_bottom, 0));

            setPadding(

                    a.getDimensionPixelOffset(

                            com.android.internal.R.styleable.ShapeDrawablePadding_left, 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();

            return true;

        }