From 692cde5837c59ec4e00c1b4ded3f521eb9940e87 Mon Sep 17 00:00:00 2001
From: "taeyoon0.lee" <taeyoon0.lee@samsung.com>
Date: Mon, 24 Jul 2017 13:45:03 +0900
Subject: [PATCH] [Tizen] Restore behavior of Uploaded and LoadingFinished
 signal

This reverts commit be158213cf3791451871c3a08d7b13894279662d.

Change-Id: Ib260d45cf4f692f15b178d1b4e92a4670c8df16c
---
 .../internal/controls/image-view/image-view-impl.cpp     | 16 ++++++++++++++++
 .../internal/controls/image-view/image-view-impl.h       |  5 +++++
 2 files changed, 21 insertions(+)

diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
index 7934109..fabcf19 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.cpp
@@ -174,6 +174,22 @@ void ImageView::SetDepthIndex( int depthIndex )
   }
 }
 
+void ImageView::OnStageConnection( int depth )
+{
+  if( mImage )
+  {
+    mImage.UploadedSignal().Emit( mImage );
+  }
+
+  Dali::ResourceImage resourceImage = Dali::ResourceImage::DownCast( mImage );
+  if( resourceImage )
+  {
+    resourceImage.LoadingFinishedSignal().Emit( resourceImage );
+  }
+
+  Control::OnStageConnection( depth ); // Enabled visuals will be put on stage
+}
+
 Vector3 ImageView::GetNaturalSize()
 {
   if( mVisual )
diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h
index dc449e9..739876a 100644
--- a/dali-toolkit/internal/controls/image-view/image-view-impl.h
+++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h
@@ -128,6 +128,11 @@ private: // From Control
   void OnInitialize();
 
   /**
+   * @copydoc CustomActorImpl::OnStageConnection()
+   */
+  virtual void OnStageConnection( int depth );
+
+  /**
    * @copydoc Toolkit::Control::GetNaturalSize
    */
   virtual Vector3 GetNaturalSize();
-- 
2.7.4