Merge pull request tidev#4382 from bijupmb/TIMOB-13671-AnimateCrashes…

…AppIfIthasBorder TIMOB-13671- add checking only for TicompositLayout.LayoutParam
GroupeConitech · Aug 29, 2013 · 788cfa1 · 788cfa1
2 parents 211af30 + b787e94
commit 788cfa1
Showing 1 changed file with 8 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
@@ -619,9 +619,14 @@ protected class AnimationListener implements Animation.AnimationListener
 		public void onAnimationEnd(Animation a)
 		{
 			if (relayoutChild) {
-				LayoutParams params = (LayoutParams) view.getLayoutParams();
-				TiConvert.fillLayout(options, params);
-				view.setLayoutParams(params);
+				// Do it only for TiCompositeLayout.LayoutParams, for border views
+				// height and width are defined as 'MATCH_PARENT' and no change is
+				// needed
+				if (view.getLayoutParams() instanceof TiCompositeLayout.LayoutParams) {
+					LayoutParams params = (LayoutParams) view.getLayoutParams();
+					TiConvert.fillLayout(options, params);
+					view.setLayoutParams(params);
+				}
 				view.clearAnimation();
 				relayoutChild = false;
 				// TIMOB-11298 Propagate layout property changes to proxy