Merge \"Read translation and elevation attributes as floats\" into nyc-mr1-dev (54224d40) · Commits · e / os / android_frameworks_base

core/java/android/view/View.java

+6 −6

Original line number	Original line	Diff line number	Diff line
	@@ -4215,25 +4215,25 @@ public class View implements Drawable.Callback, KeyEvent.Callback,
	setAlpha(a.getFloat(attr, 1f));		setAlpha(a.getFloat(attr, 1f));
	break;		break;
	case com.android.internal.R.styleable.View_transformPivotX:		case com.android.internal.R.styleable.View_transformPivotX:
	setPivotX(a.getDimensionPixelOffset(attr, 0));		setPivotX(a.getDimension(attr, 0));
	break;		break;
	case com.android.internal.R.styleable.View_transformPivotY:		case com.android.internal.R.styleable.View_transformPivotY:
	setPivotY(a.getDimensionPixelOffset(attr, 0));		setPivotY(a.getDimension(attr, 0));
	break;		break;
	case com.android.internal.R.styleable.View_translationX:		case com.android.internal.R.styleable.View_translationX:
	tx = a.getDimensionPixelOffset(attr, 0);		tx = a.getDimension(attr, 0);
	transformSet = true;		transformSet = true;
	break;		break;
	case com.android.internal.R.styleable.View_translationY:		case com.android.internal.R.styleable.View_translationY:
	ty = a.getDimensionPixelOffset(attr, 0);		ty = a.getDimension(attr, 0);
	transformSet = true;		transformSet = true;
	break;		break;
	case com.android.internal.R.styleable.View_translationZ:		case com.android.internal.R.styleable.View_translationZ:
	tz = a.getDimensionPixelOffset(attr, 0);		tz = a.getDimension(attr, 0);
	transformSet = true;		transformSet = true;
	break;		break;
	case com.android.internal.R.styleable.View_elevation:		case com.android.internal.R.styleable.View_elevation:
	elevation = a.getDimensionPixelOffset(attr, 0);		elevation = a.getDimension(attr, 0);
	transformSet = true;		transformSet = true;
	break;		break;
	case com.android.internal.R.styleable.View_rotation:		case com.android.internal.R.styleable.View_rotation: