(Animation) Updates following DestroyAction removal & DisconnectAction addition

Change-Id: I0eae8f62143138967b91130bb6e4c588229077f6

diff --git a/base/dali-toolkit/internal/builder/builder-animations.cpp b/base/dali-toolkit/internal/builder/builder-animations.cpp
index 72911b8..de6b380 100644 (file)
--- a/base/dali-toolkit/internal/builder/builder-animations.cpp
+++ b/base/dali-toolkit/internal/builder/builder-animations.cpp
@@ -201,19 +201,19 @@ Animation CreateAnimation( const TreeNode& child, const Replacement& constant, D
     }
   }
 
-  if( OptionalString endAction = constant.IsString(  IsChild(child, "destroy-action" ) ) )
+  if( OptionalString endAction = constant.IsString(  IsChild(child, "disconnect-action" ) ) )
   {
     if("BAKE" == *endAction)
     {
-      animation.SetDestroyAction( Animation::Bake );
+      animation.SetDisconnectAction( Animation::Bake );
     }
     else if("DISCARD" == *endAction)
     {
-      animation.SetDestroyAction( Animation::Discard );
+      animation.SetDisconnectAction( Animation::Discard );
     }
     else if("BAKE_FINAL" == *endAction)
     {
-      animation.SetDestroyAction( Animation::BakeFinal );
+      animation.SetDisconnectAction( Animation::BakeFinal );
     }
   }
 

diff --git a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
index 17aa375..a2fef08 100644 (file)
--- a/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
+++ b/base/dali-toolkit/public-api/controls/scrollable/item-view/grid-layout.cpp
@@ -623,7 +623,6 @@ void GridLayout::GetResizeAnimation(Animation& animation, Actor actor, Vector3 s
     // so that we can avoid the actors overlapping during orientation change.
     animation.Resize( actor, shrink, AlphaFunctions::EaseOut, 0.0f, durationSeconds * 0.5f );
     animation.Resize( actor, size, AlphaFunctions::EaseIn, 0.0f, durationSeconds );
-    animation.SetDestroyAction( Animation::Bake );
   }
 }
 

diff --git a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
index 7a04ae9..2ad6931 100644 (file)
--- a/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/navigation-frame/navigation-control-impl.cpp
@@ -253,7 +253,6 @@ void NavigationControl::OrientationChanged( int angle )
     }
 
     Animation animation = Animation::New( mOrientationAnimationDuration );
-    animation.SetDestroyAction( Animation::Bake );
     animation.RotateTo( Self(), Degree( -angle ), Vector3::ZAXIS, mOrientationAnimationAlphaFunc );
     animation.Play();
 

diff --git a/optional/dali-toolkit/internal/controls/view/view-impl.cpp b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
index fa2a9d6..8bf9811 100644 (file)
--- a/optional/dali-toolkit/internal/controls/view/view-impl.cpp
+++ b/optional/dali-toolkit/internal/controls/view/view-impl.cpp
@@ -231,8 +231,6 @@ void View::OrientationChanged( Dali::Orientation orientation )
     }
   }
 
-  mRotateAnimation.SetDestroyAction( Animation::Bake );
-
   Toolkit::View handle( GetOwner() );
   mOrientationAnimationStartedSignalV2.Emit( handle, mRotateAnimation, orientation );