Merge pull request #6683 from hieupham007/timob-18392

[TIMOB-18392]: Fire 'stop' when animation finishes
tidev · Mar 5, 2015 · 5371433 · 5371433
2 parents 4aa40be + e5649c6
commit 5371433
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java b/android/modules/ui/src/java/ti/modules/titanium/ui/widget/TiUIImageView.java
@@ -517,8 +517,12 @@ public void run()
 						wait();
 					}
 				}
-
-				BitmapWithIndex b = loader.getBitmapQueue().take();
+				ArrayBlockingQueue<BitmapWithIndex> bitmapQueue = loader.getBitmapQueue();
+				//Fire stop event when animation finishes
+				if (!isLoading.get() && bitmapQueue.isEmpty()) {
+					fireStop();
+				}
+				BitmapWithIndex b = bitmapQueue.take();
 				Log.d(TAG, "set image: " + b.index, Log.DEBUG_MODE);
 				setImage(b.bitmap);
 				fireChange(b.index);