Merge pull request #4154 from Akylas/TC-2127

[TIMOB-13536] Android: Size animation broken
tidev · Jun 6, 2013 · 9eed840 · 9eed840
2 parents 9e3c548 + 4aac558
commit 9eed840
Showing 1 changed file with 10 additions and 3 deletions.
diff --git a/android/titanium/src/java/org/appcelerator/titanium/util/TiAnimationBuilder.java b/android/titanium/src/java/org/appcelerator/titanium/util/TiAnimationBuilder.java
@@ -404,12 +404,19 @@ public AnimationSet render(TiViewProxy viewProxy, View view, int x, int y, int w
 			if (height != null) {
 				optionHeight = new TiDimension(height, TiDimension.TYPE_HEIGHT);
 			} else {
-				optionHeight = new TiDimension(w, TiDimension.TYPE_HEIGHT);
+				optionHeight = new TiDimension(h, TiDimension.TYPE_HEIGHT);
 				optionHeight.setUnits(TypedValue.COMPLEX_UNIT_PX);
 			}
+
+			ViewParent parent = view.getParent();
+			View parentView = null;
+
+			if (parent instanceof View) {
+				parentView = (View) parent;
+			}
 
-			int toWidth = optionWidth.getAsPixels(view);
-			int toHeight = optionHeight.getAsPixels(view);
+			int toWidth = optionWidth.getAsPixels((parentView != null)?parentView:view);
+			int toHeight = optionHeight.getAsPixels((parentView != null)?parentView:view);
 
 			SizeAnimation sizeAnimation = new SizeAnimation(view, w, h, toWidth, toHeight);