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

Commit 70ebe6dc authored by Chris Banes's avatar Chris Banes Committed by android-build-merger
Browse files

Merge \\"Read translation and elevation attributes as floats\\" into nyc-mr1-dev am: 64873125 

am: 54224d40

Change-Id: Iaa17584e9309b38fcaf81de62e9e3c13c94a1721
parents 19e0f615 54224d40

core/java/android/view/View.java

+6 −6
Original line number Diff line number Diff line
@@ -4217,25 +4217,25 @@ public class View implements Drawable.Callback, KeyEvent.Callback, 
                    setAlpha(a.getFloat(attr, 1f));

                    break;

                case com.android.internal.R.styleable.View_transformPivotX:

                    setPivotX(a.getDimensionPixelOffset(attr, 0));

                    setPivotX(a.getDimension(attr, 0));

                    break;

                case com.android.internal.R.styleable.View_transformPivotY:

                    setPivotY(a.getDimensionPixelOffset(attr, 0));

                    setPivotY(a.getDimension(attr, 0));

                    break;

                case com.android.internal.R.styleable.View_translationX:

                    tx = a.getDimensionPixelOffset(attr, 0);

                    tx = a.getDimension(attr, 0);

                    transformSet = true;

                    break;

                case com.android.internal.R.styleable.View_translationY:

                    ty = a.getDimensionPixelOffset(attr, 0);

                    ty = a.getDimension(attr, 0);

                    transformSet = true;

                    break;

                case com.android.internal.R.styleable.View_translationZ:

                    tz = a.getDimensionPixelOffset(attr, 0);

                    tz = a.getDimension(attr, 0);

                    transformSet = true;

                    break;

                case com.android.internal.R.styleable.View_elevation:

                    elevation = a.getDimensionPixelOffset(attr, 0);

                    elevation = a.getDimension(attr, 0);

                    transformSet = true;

                    break;

                case com.android.internal.R.styleable.View_rotation: