Changes required after TextLabel Devel properties were made public

Conflicts:
	Tizen.NUI/src/public/BaseComponents/TextLabel.cs

Change-Id: I84627df3ee0bceaca7152ee356d7bb4de47aeed5

diff --git a/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
index eb3584d..cf9662c 100755 (executable)
--- a/Tizen.NUI/src/internal/NDalicPINVOKE.cs
+++ b/Tizen.NUI/src/internal/NDalicPINVOKE.cs
@@ -9322,9 +9322,6 @@ class NDalicPINVOKE {
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TextLabel_Property_TEXT_COLOR_get")]
   public static extern int TextLabel_Property_TEXT_COLOR_get();
 
-  [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TextLabel_Property_TEXT_COLOR_ANIMATABLE_get")]
-  public static extern int TextLabel_Property_TEXT_COLOR_ANIMATABLE_get();
-
   [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TextLabel_Property_SHADOW_OFFSET_get")]
   public static extern int TextLabel_Property_SHADOW_OFFSET_get();
 

diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index 32ca8f3..5bbe44d 100755 (executable)
--- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@ -388,6 +388,8 @@ namespace Tizen.NUI.BaseComponents
         /// <summary>
         /// The TextColor property.<br>
         /// The color of the text.<br>
+        /// Animation framework can be used to change the color of the text when not using mark up.<br>
+        /// Cannot animate the color when text is auto scrolling.<br>
         /// </summary>
         public Color TextColor
         {
@@ -757,25 +759,6 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
-        /// The TextColorAnimatable property.<br>
-        /// The color of the text that can be animatated.<br>
-        /// Animation framework can be used to change the color of the text when not using mark up.<br>
-        /// Not possible when text is auto scrolling. <br>
-        /// </summary>
-        public Color TextColorAnimatable
-        {
-            get
-            {
-                Color animatableColor = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-                GetProperty(TextLabel.Property.TEXT_COLOR_ANIMATABLE).Get(animatableColor);
-                return animatableColor;
-            }
-            set
-            {
-                SetProperty(TextLabel.Property.TEXT_COLOR_ANIMATABLE, new Tizen.NUI.PropertyValue(value));
-            }
-        }
-
         /// The line count of the text.
         /// </summary>
         public int LineCount