[NUI] Sync with dalihub (#969)

* [NUI] Layout transitions support

Change-Id: I66558d54a865544b123f2ad91554b9146f480118

* [NUI] Remove APIs deprecated in Tizen 3.0

Change-Id: I3a61a27e4c9d7a9790d8457c9a60459205d1d372

* [NUI] Make public-API as Hidden-API before ACR

- no logic changed, but only "[EditorBrowsable(EditorBrowsableState.Never)]" is added
- before ACR is completed, we need to make new added public-API as hidden-API which is usually considered as Inhouse-API
- when adding new API, need to add this "[EditorBrowsable(EditorBrowsableState.Never)]", otherwise not accepted in Samsung/TizenFX because API checker gives API break error
- comment also required to be added, such as like this. "Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed."

Signed-off-by: dongsug.song <dongsug.song@samsung.com>
Change-Id: I8a707efd4c5ebb637f2928b123eabd9f702d2151

diff --git a/src/Tizen.NUI/src/internal/GaussianBlurView.cs b/src/Tizen.NUI/src/internal/GaussianBlurView.cs
index fc3c24f..57be582 100755 (executable)
--- a/src/Tizen.NUI/src/internal/GaussianBlurView.cs
+++ b/src/Tizen.NUI/src/internal/GaussianBlurView.cs
@@ -226,13 +226,13 @@ namespace Tizen.NUI
             return ret;
         }
 
-        public new void SetBackgroundColor(Vector4 color)
+        public void SetBackgroundColor(Vector4 color)
         {
             Interop.GaussianBlurView.GaussianBlurView_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        public new Vector4 GetBackgroundColor()
+        public Vector4 GetBackgroundColor()
         {
             Vector4 ret = new Vector4(Interop.GaussianBlurView.GaussianBlurView_GetBackgroundColor(swigCPtr), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Button.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Button.cs
index 86ed29b..8158504 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.Button.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.Button.cs
@@ -32,35 +32,9 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_SELECTED_get")]
             public static extern int Button_Property_SELECTED_get();
 
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_UNSELECTED_STATE_IMAGE_get")]
-            public static extern int Button_Property_UNSELECTED_STATE_IMAGE_get();
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_SELECTED_STATE_IMAGE_get")]
-            public static extern int Button_Property_SELECTED_STATE_IMAGE_get();
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_DISABLED_STATE_IMAGE_get")]
-            public static extern int Button_Property_DISABLED_STATE_IMAGE_get();
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_UNSELECTED_COLOR_get")]
-            public static extern int Button_Property_UNSELECTED_COLOR_get();
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_SELECTED_COLOR_get")]
-            public static extern int Button_Property_SELECTED_COLOR_get();
-
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_LABEL_get")]
             public static extern int Button_Property_LABEL_get();
 
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_Property_LABEL_TEXT_get")]
-            public static extern int Button_Property_LABEL_TEXT_get();
-
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Button_Property")]
             public static extern global::System.IntPtr new_Button_Property();
 
@@ -112,35 +86,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_IsSelected")]
             public static extern bool Button_IsSelected(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_GetAnimationTime")]
-            public static extern float Button_GetAnimationTime(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_GetLabelText")]
-            public static extern string Button_GetLabelText(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_SetLabel")]
-            public static extern void Button_SetLabel(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_SetButtonImage")]
-            public static extern void Button_SetButtonImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_SetSelectedImage")]
-            public static extern void Button_SetSelectedImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_GetButtonImage")]
-            public static extern global::System.IntPtr Button_GetButtonImage(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_GetSelectedImage")]
-            public static extern global::System.IntPtr Button_GetSelectedImage(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_PressedSignal")]
             public static extern global::System.IntPtr Button_PressedSignal(global::System.Runtime.InteropServices.HandleRef jarg1);
 
@@ -199,7 +144,7 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Button_Property_VISUAL_PADDING_get")]
             public static extern int Button_Property_VISUAL_PADDING_get();
-            
+
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Button_SWIGUpcast")]
             public static extern global::System.IntPtr Button_SWIGUpcast(global::System.IntPtr jarg1);

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ImageView.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ImageView.cs
index 5e9075c..f5420b1 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.ImageView.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.ImageView.cs
@@ -8,10 +8,6 @@ namespace Tizen.NUI
     {
         internal static partial class ImageView
         {
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_Property_RESOURCE_URL_get")]
-            public static extern int ImageView_Property_RESOURCE_URL_get();
-
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ImageView_Property_IMAGE_get")]
             public static extern int ImageView_Property_IMAGE_get();
 

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.PushButton.cs b/src/Tizen.NUI/src/internal/Interop/Interop.PushButton.cs
index 0f3a78a..424c355 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.PushButton.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.PushButton.cs
@@ -64,43 +64,6 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_DownCast")]
             public static extern global::System.IntPtr PushButton_DownCast(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetButtonImage__SWIG_0_0")]
-            public static extern void PushButton_SetButtonImage__SWIG_0_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetButtonImage__SWIG_1")]
-            public static extern void PushButton_SetButtonImage__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetBackgroundImage")]
-            public static extern void PushButton_SetBackgroundImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetSelectedImage__SWIG_0_0")]
-            public static extern void PushButton_SetSelectedImage__SWIG_0_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetSelectedImage__SWIG_1")]
-            public static extern void PushButton_SetSelectedImage__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetSelectedBackgroundImage")]
-            public static extern void PushButton_SetSelectedBackgroundImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetDisabledBackgroundImage")]
-            public static extern void PushButton_SetDisabledBackgroundImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetDisabledImage")]
-            public static extern void PushButton_SetDisabledImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PushButton_SetDisabledSelectedImage")]
-            public static extern void PushButton_SetDisabledSelectedImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
         }
     }
 }

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ViewImpl.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ViewImpl.cs
index e6b043f..ca7eeb7 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.ViewImpl.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.ViewImpl.cs
@@ -29,11 +29,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_GetBackgroundColor")]
             public static extern global::System.IntPtr ViewImpl_GetBackgroundColor(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_SetBackgroundImage")]
-            public static extern void ViewImpl_SetBackgroundImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
-
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ViewImpl_SetBackground")]
             public static extern void ViewImpl_SetBackground(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ViewInternal.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ViewInternal.cs
index 4058503..b96af92 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.ViewInternal.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.ViewInternal.cs
@@ -43,11 +43,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_SetBackgroundColor")]
             public static extern void View_SetBackgroundColor(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_GetBackgroundColor")]
-            public static extern global::System.IntPtr View_GetBackgroundColor(global::System.Runtime.InteropServices.HandleRef jarg1);
-
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_SetBackgroundImage")]
             public static extern void View_SetBackgroundImage(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs
index 56043e0..bbbe66d 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs
@@ -11,15 +11,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_Property_STYLE_NAME_get")]
             public static extern int View_Property_STYLE_NAME_get();
 
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_Property_BACKGROUND_COLOR_get")]
-            public static extern int View_Property_BACKGROUND_COLOR_get();
-
-
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_Property_BACKGROUND_IMAGE_get")]
-            public static extern int View_Property_BACKGROUND_IMAGE_get();
-
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_Property_KEY_INPUT_FOCUS_get")]
             public static extern int View_Property_KEY_INPUT_FOCUS_get();
 

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs
index 0979d8c..0ae5047 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs
@@ -24,10 +24,9 @@ namespace Tizen.NUI
     /// <summary>
     /// The conditions for transitions.
     /// </summary>
-    [FlagsAttribute]
     /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
     [EditorBrowsable(EditorBrowsableState.Never)]
-    public enum TransitionCondition
+    [FlagsAttribute] public enum TransitionCondition
     {
         /// <summary>
         /// Default when a condition has not been set.
@@ -35,35 +34,30 @@ namespace Tizen.NUI
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Unspecified = 0,
-
         /// <summary>
         /// Animate changing layout to another layout.
         /// </summary>
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         LayoutChanged = 1,
-
         /// <summary>
         /// Animate adding item.
         /// </summary>
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Add = 2,
-
         /// <summary>
         /// Animate removing item.
         /// </summary>
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         Remove = 4,
-
         /// <summary>
         /// Animation when an item changes due to a sibbling being added.
         /// </summary>
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         ChangeOnAdd = 8,
-
         /// <summary>
         /// Animation when an item changes due to a sibbling being removed.
         /// </summary>

diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutTransition.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutTransition.cs
index 3f9543c..98cf30f 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Layouting/LayoutTransition.cs
+++ b/src/Tizen.NUI/src/internal/Layouting/LayoutTransition.cs
@@ -95,14 +95,12 @@ namespace Tizen.NUI
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public int Duration;
-
         /// <summary>
         /// Delay before the transition executes. Milliseconds.
         /// </summary>
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public int Delay;
-
         /// <summary>
         /// Function to alter the transition path over time.
         /// </summary>
@@ -130,7 +128,6 @@ namespace Tizen.NUI
           Animator = null;
           TargetValue = 0;
         }
-
         /// <summary>
         /// LayoutTransition constructor.
         /// </summary>
@@ -157,21 +154,18 @@ namespace Tizen.NUI
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public TransitionCondition Condition{get; set;}
-
         /// <summary>
         /// Property to animate.
         /// </summary>
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public AnimatableProperties AnimatableProperty{get; set;}
-
         /// <summary>
         /// Components of the Animator.
         /// </summary>
         /// Hidden-API which is usually used as Inhouse-API. If required to be opened as Public-API, ACR process is needed.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public TransitionComponents Animator{get; set;}
-
         /// <summary>
         /// Target value to animate to.
         /// </summary>

diff --git a/src/Tizen.NUI/src/internal/ViewImpl.cs b/src/Tizen.NUI/src/internal/ViewImpl.cs
index 60ee521..a7a2827 100755 (executable)
--- a/src/Tizen.NUI/src/internal/ViewImpl.cs
+++ b/src/Tizen.NUI/src/internal/ViewImpl.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2018 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -102,13 +102,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
-
-        internal void SetBackgroundImage(Image image)
-        {
-            Interop.ViewImpl.ViewImpl_SetBackgroundImage(swigCPtr, Image.getCPtr(image));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
         public void SetBackground(PropertyMap map)
         {
             Interop.ViewImpl.ViewImpl_SetBackground(swigCPtr, PropertyMap.getCPtr(map));

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 7bf3f2a..efeb2f4 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@ -1,5 +1,5 @@
 /*
-* Copyright(c) 2018 Samsung Electronics Co., Ltd.
+* Copyright(c) 2019 Samsung Electronics Co., Ltd.
 *
 * Licensed under the Apache License, Version 2.0 (the "License");
 * you may not use this file except in compliance with the License.
@@ -1008,7 +1008,6 @@ namespace Tizen.NUI.BaseComponents
 
         internal new class Property
         {
-            internal static readonly int RESOURCE_URL = Interop.ImageView.ImageView_Property_RESOURCE_URL_get();
             internal static readonly int IMAGE = Interop.ImageView.ImageView_Property_IMAGE_get();
             internal static readonly int PRE_MULTIPLIED_ALPHA = Interop.ImageView.ImageView_Property_PRE_MULTIPLIED_ALPHA_get();
             internal static readonly int PIXEL_AREA = Interop.ImageView.ImageView_Property_PIXEL_AREA_get();

diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs
index 21cbf48..133654f 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/View.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs
@@ -4070,7 +4070,7 @@ namespace Tizen.NUI.BaseComponents
                 return;
 
             bool hasLayout = (_layout != null);
-            Log.Info("NUI","Removing View:" + child.Name + "layout[" + hasLayout.ToString() +"]\n");
+            Log.Info("NUI","Removing View:" + child.Name + " layout[" + hasLayout.ToString() +"]\n");
 
             // If View has a layout then do a deferred child removal
             // Actual child removal is performed by the layouting system so
@@ -4080,7 +4080,7 @@ namespace Tizen.NUI.BaseComponents
                 (_layout as LayoutGroup)?.RemoveChildFromLayoutGroup( child );
             }
             else
-                {
+            {
                 RemoveChild(child);
             }
         }
@@ -5236,25 +5236,6 @@ namespace Tizen.NUI.BaseComponents
             return ret;
         }
 
-        internal void SetBackgroundColor(Vector4 color)
-        {
-            Interop.ViewInternal.View_SetBackgroundColor(swigCPtr, Vector4.getCPtr(color));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        internal Vector4 GetBackgroundColor()
-        {
-            Vector4 ret = new Vector4(Interop.ViewInternal.View_GetBackgroundColor(swigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
-        internal void SetBackgroundImage(Image image)
-        {
-            Interop.ViewInternal.View_SetBackgroundImage(swigCPtr, Image.getCPtr(image));
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
         internal ControlKeySignal KeyEventSignal()
         {
             ControlKeySignal ret = new ControlKeySignal(Interop.ViewSignal.View_KeyEventSignal(swigCPtr), false);

diff --git a/src/Tizen.NUI/src/public/UIComponents/Button.cs b/src/Tizen.NUI/src/public/UIComponents/Button.cs
index f596deb..3ce7dce 100755 (executable)
--- a/src/Tizen.NUI/src/public/UIComponents/Button.cs
+++ b/src/Tizen.NUI/src/public/UIComponents/Button.cs
@@ -1,5 +1,5 @@
 /*
- * Copyright(c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright(c) 2019 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -336,14 +336,20 @@ namespace Tizen.NUI.UIComponents
             var button = (Button)bindable;
             if (newValue != null)
             {
-                Tizen.NUI.Object.SetProperty(button.swigCPtr, Button.Property.UNSELECTED_COLOR, new Tizen.NUI.PropertyValue((Color)newValue));
+                PropertyMap background = new PropertyMap();
+                background.Add( Visual.Property.Type, new PropertyValue((int)Visual.Type.Color) )
+                          .Add( ColorVisualProperty.MixColor, new PropertyValue((Color)newValue) );
+                Tizen.NUI.Object.SetProperty(button.swigCPtr, Button.Property.UNSELECTED_BACKGROUND_VISUAL, new Tizen.NUI.PropertyValue(background));
             }
         },
         defaultValueCreator:(bindable) =>
         {
             var button = (Button)bindable;
             Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty(button.swigCPtr, Button.Property.UNSELECTED_COLOR).Get(temp);
+            Tizen.NUI.PropertyMap map = new Tizen.NUI.PropertyMap();
+            Tizen.NUI.Object.GetProperty(button.swigCPtr, Button.Property.UNSELECTED_BACKGROUND_VISUAL).Get(map);
+            Tizen.NUI.PropertyValue value = map.Find( Visual.Property.MixColor);
+            value?.Get(temp);
             return temp;
         });
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -353,14 +359,20 @@ namespace Tizen.NUI.UIComponents
             var button = (Button)bindable;
             if (newValue != null)
             {
-                Tizen.NUI.Object.SetProperty(button.swigCPtr, Button.Property.SELECTED_COLOR, new Tizen.NUI.PropertyValue((Color)newValue));
+                PropertyMap background = new PropertyMap();
+                background.Add( Visual.Property.Type, new PropertyValue((int)Visual.Type.Color) )
+                          .Add( ColorVisualProperty.MixColor, new PropertyValue((Color)newValue) );
+                Tizen.NUI.Object.SetProperty(button.swigCPtr, Button.Property.SELECTED_BACKGROUND_VISUAL, new Tizen.NUI.PropertyValue(background));
             }
         },
         defaultValueCreator:(bindable) =>
         {
             var button = (Button)bindable;
             Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty(button.swigCPtr, Button.Property.SELECTED_COLOR).Get(temp);
+            Tizen.NUI.PropertyMap map = new Tizen.NUI.PropertyMap();
+            Tizen.NUI.Object.GetProperty(button.swigCPtr, Button.Property.SELECTED_BACKGROUND_VISUAL).Get(map);
+            Tizen.NUI.PropertyValue value = map.Find( Visual.Property.MixColor);
+            value?.Get(temp);
             return temp;
         });
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -1051,8 +1063,6 @@ namespace Tizen.NUI.UIComponents
             internal static readonly int NEXT_AUTO_REPEATING_DELAY = Interop.Button.Button_Property_NEXT_AUTO_REPEATING_DELAY_get();
             internal static readonly int TOGGLABLE = Interop.Button.Button_Property_TOGGLABLE_get();
             internal static readonly int SELECTED = Interop.Button.Button_Property_SELECTED_get();
-            internal static readonly int UNSELECTED_COLOR = Interop.Button.Button_Property_UNSELECTED_COLOR_get();
-            internal static readonly int SELECTED_COLOR = Interop.Button.Button_Property_SELECTED_COLOR_get();
             internal static readonly int LABEL = Interop.Button.Button_Property_LABEL_get();
         }
     }