Merge remote-tracking branch 'upstream/master' into tizen
authordongsug.song <dongsug.song@samsung.com>
Thu, 24 Nov 2022 04:32:14 +0000 (13:32 +0900)
committerdongsug.song <dongsug.song@samsung.com>
Thu, 24 Nov 2022 04:33:34 +0000 (13:33 +0900)
Change-Id: I516ae120a3e95685d61a646c921603c3b1f0c66d

54 files changed:
packaging/csapi-tizenfx.spec
packaging/version.txt
src/Tizen.Multimedia.Remoting/WebRTC/WebRTC.Events.cs
src/Tizen.NUI.Scene3D/src/internal/CameraBindableProperty.cs
src/Tizen.NUI.Scene3D/src/internal/Interop/Interop.Camera.cs
src/Tizen.NUI.Scene3D/src/public/Controls/Camera.cs
src/Tizen.NUI.Scene3D/src/public/Controls/SceneView.cs
src/Tizen.NUI/Tizen.NUI.csproj
src/Tizen.NUI/src/internal/Common/Object.cs
src/Tizen.NUI/src/internal/Common/PropertyHelper.cs
src/Tizen.NUI/src/internal/Interop/Interop.Actor.cs
src/Tizen.NUI/src/internal/Interop/Interop.ActorInternal.cs
src/Tizen.NUI/src/internal/Interop/Interop.Animation.cs
src/Tizen.NUI/src/internal/Interop/Interop.Matrix.cs
src/Tizen.NUI/src/internal/Interop/Interop.PropertyValue.cs
src/Tizen.NUI/src/internal/Interop/Interop.TextEditor.cs
src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs
src/Tizen.NUI/src/internal/Interop/Interop.TextLabel.cs
src/Tizen.NUI/src/internal/Interop/Interop.View.cs
src/Tizen.NUI/src/public/Animation/Animation.cs
src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/LottieAnimationView.cs
src/Tizen.NUI/src/public/BaseComponents/Style/TextEditorStyle.cs
src/Tizen.NUI/src/public/BaseComponents/Style/TextFieldStyle.cs
src/Tizen.NUI/src/public/BaseComponents/Style/TextLabelStyle.cs
src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs
src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/TextField.cs
src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/View.cs
src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
src/Tizen.NUI/src/public/BaseComponents/ViewBindableProperty.cs
src/Tizen.NUI/src/public/BaseComponents/ViewInternal.cs
src/Tizen.NUI/src/public/BaseComponents/ViewPublicMethods.cs
src/Tizen.NUI/src/public/Common/Matrix.cs [moved from src/Tizen.NUI/src/internal/Common/Matrix.cs with 79% similarity]
src/Tizen.NUI/src/public/Common/Matrix3.cs [moved from src/Tizen.NUI/src/internal/Common/Matrix3.cs with 66% similarity]
src/Tizen.NUI/src/public/Common/PropertyValue.cs
src/Tizen.NUI/src/public/Theme/DefaultThemeCommon.cs
src/Tizen.NUI/src/public/Visuals/VisualConstants.cs
test/Tizen.NUI.Devel.Tests.Ubuntu/Tizen.NUI.Devel.Tests/Program.cs
test/Tizen.NUI.Devel.Tests.Ubuntu/Tizen.NUI.Devel.Tests/testcase/public/Common/TSMatrix.cs [moved from test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/internal/Common/TSMatrix.cs with 71% similarity]
test/Tizen.NUI.Devel.Tests.Ubuntu/Tizen.NUI.Devel.Tests/testcase/public/Common/TSMatrix3.cs [moved from test/Tizen.NUI.Tests/Tizen.NUI.Devel.Tests/testcase/internal/Common/TSMatrix3.cs with 60% similarity]
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/Tizen.NUI.Components.Devel.Tests.csproj
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSButton.Internal.cs
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSDatePicker.cs
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSPicker.cs
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSProgress.cs
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSScrollableBase.cs
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSSlider.cs
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSTabContent.cs
test/Tizen.NUI.Tests/Tizen.NUI.Components.Devel.Tests/testcase/Controls/TSTimePicker.cs

index 6b6db98..580f04e 100644 (file)
@@ -1,8 +1,8 @@
 # Auto-generated from csapi-tizenfx.spec.in by makespec.sh
 
 %define TIZEN_NET_API_VERSION 11
-%define TIZEN_NET_RPM_VERSION 11.0.0.17567+nui22201
-%define TIZEN_NET_NUGET_VERSION 11.0.0.17567
+%define TIZEN_NET_RPM_VERSION 11.0.0.17577+nui22202
+%define TIZEN_NET_NUGET_VERSION 11.0.0.17577
 
 %define DOTNET_ASSEMBLY_PATH /usr/share/dotnet.tizen/framework
 %define DOTNET_ASSEMBLY_DUMMY_PATH %{DOTNET_ASSEMBLY_PATH}/ref
index 9d1958f..e1d65b5 100755 (executable)
@@ -6,4 +6,4 @@ RPM_VERSION=11.0.0.999
 NUGET_VERSION=11.0.0.99999
 
 # RPM Version Suffix
-RPM_VERSION_SUFFIX=nui22201
+RPM_VERSION_SUFFIX=nui22202
index 52e86ba..a364ebd 100755 (executable)
@@ -186,7 +186,7 @@ namespace Tizen.Multimedia.Remoting
         {
             _webRtcErrorOccurredCallback = (handle, error, state, _) =>
             {
-                // Log.Info(WebRTCLog.Tag, $"{error}, {state}");
+                Log.Info(WebRTCLog.Tag, $"{error}, {state}");
 
                 ErrorOccurred?.Invoke(this, new WebRTCErrorOccurredEventArgs((WebRTCError)error, state));
             };
@@ -205,7 +205,7 @@ namespace Tizen.Multimedia.Remoting
         {
             _webRtcStateChangedCallback = (handle, previous, current, _) =>
             {
-                // Log.Info(WebRTCLog.Tag, $"{previous}, {current}");
+                Log.Info(WebRTCLog.Tag, $"{previous}, {current}");
 
                 StateChanged?.Invoke(this, new WebRTCStateChangedEventArgs(previous, current));
             };
@@ -224,7 +224,7 @@ namespace Tizen.Multimedia.Remoting
         {
             _webRtcIceGatheringStateChangedCallback = (handle, state, _) =>
             {
-                // Log.Info(WebRTCLog.Tag, $"Ice gathering state : {state}");
+                Log.Info(WebRTCLog.Tag, $"Ice gathering state : {state}");
 
                 IceGatheringStateChanged?.Invoke(this, new WebRTCIceGatheringStateChangedEventArgs(state));
             };
@@ -243,7 +243,7 @@ namespace Tizen.Multimedia.Remoting
         {
             _webRtcSignalingStateChangedCallback = (handle, state, _) =>
             {
-                // Log.Info(WebRTCLog.Tag, $"Signaling state : {state}");
+                Log.Info(WebRTCLog.Tag, $"Signaling state : {state}");
 
                 SignalingStateChanged?.Invoke(this, new WebRTCSignalingStateChangedEventArgs(state));
             };
@@ -281,7 +281,7 @@ namespace Tizen.Multimedia.Remoting
         {
             _webRtcIceConnectionStateChangedCallback = (handle, state, _) =>
             {
-                // Log.Info(WebRTCLog.Tag, $"Ice connection state : {state}");
+                Log.Info(WebRTCLog.Tag, $"Ice connection state : {state}");
 
                 IceConnectionStateChanged?.Invoke(this, new WebRTCIceConnectionStateChangedEventArgs(state));
             };
@@ -334,7 +334,7 @@ namespace Tizen.Multimedia.Remoting
         {
             _webRtcTrackAddedCallback = (handle, type, id, _) =>
             {
-                // Log.Info(WebRTCLog.Tag, $"Track type[{type}], id[{id}]");
+                Log.Info(WebRTCLog.Tag, $"Track type[{type}], id[{id}]");
 
                 TrackAdded?.Invoke(this, new WebRTCTrackAddedEventArgs(new MediaStreamTrack(this, type, id)));
             };
index 5090d26..24c75ba 100755 (executable)
@@ -79,6 +79,23 @@ namespace Tizen.NUI.Scene3D
         });
 
         /// <summary>
+        /// OrthographicSizeProperty
+        /// </summary>
+        internal static readonly BindableProperty OrthographicSizeProperty = BindableProperty.Create(nameof(OrthographicSize), typeof(float), typeof(Tizen.NUI.Scene3D.Camera), default(float), propertyChanged: (bindable, oldValue, newValue) =>
+        {
+            var instance = (Tizen.NUI.Scene3D.Camera)bindable;
+            if (newValue != null)
+            {
+                instance.InternalOrthographicSize = (float)newValue;
+            }
+        },
+        defaultValueCreator: (bindable) =>
+        {
+            var instance = (Tizen.NUI.Scene3D.Camera)bindable;
+            return instance.InternalOrthographicSize;
+        });
+
+        /// <summary>
         /// AspectRatioProperty
         /// </summary>
         internal static readonly BindableProperty AspectRatioProperty = BindableProperty.Create(nameof(AspectRatio), typeof(float), typeof(Tizen.NUI.Scene3D.Camera), default(float), propertyChanged: (bindable, oldValue, newValue) =>
index acb0089..4976040 100755 (executable)
@@ -57,6 +57,9 @@ namespace Tizen.NUI.Scene3D
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CameraActor_Property_INVERT_Y_AXIS_get")]
             public static extern int InvertYAxisGet();
 
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CameraActor_Property_ORTHOGRAPHIC_SIZE_get")]
+            public static extern int OrthographicSizeGet();
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CameraActor_Property_PROJECTION_DIRECTION_get")]
             public static extern int ProjectionDirectionGet();
 
index cb9ab3d..e7e19f8 100755 (executable)
@@ -205,26 +205,11 @@ namespace Tizen.NUI.Scene3D
         {
             get
             {
-                return InternalProjectionDirection == ProjectionDirectionType.Vertical ? TopPlaneDistance : RightPlaneDistance;
+                return InternalOrthographicSize;
             }
             set
             {
-                float halfHeight;
-                float halfWidth;
-                if(InternalProjectionDirection == ProjectionDirectionType.Vertical)
-                {
-                    halfHeight = value;
-                    halfWidth = AspectRatio * value;
-                }
-                else
-                {
-                    halfHeight = value / AspectRatio;
-                    halfWidth = value;
-                }
-                SetValue(TopPlaneDistanceProperty, halfHeight);
-                SetValue(BottomPlaneDistanceProperty, -halfHeight);
-                SetValue(LeftPlaneDistanceProperty, -halfWidth);
-                SetValue(RightPlaneDistanceProperty, halfWidth);
+                SetValue(OrthographicSizeProperty, value);
                 NotifyPropertyChanged();
             }
         }
@@ -432,6 +417,24 @@ namespace Tizen.NUI.Scene3D
             }
         }
 
+        private float InternalOrthographicSize
+        {
+            get
+            {
+                float returnValue = 0.0f;
+                PropertyValue orthographicSize = GetProperty(Interop.Camera.OrthographicSizeGet());
+                orthographicSize?.Get(out returnValue);
+                orthographicSize?.Dispose();
+                return returnValue;
+            }
+            set
+            {
+                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
+                SetProperty(Interop.Camera.OrthographicSizeGet(), setValue);
+                setValue.Dispose();
+            }
+        }
+
         private float InternalAspectRatio
         {
             get
index 8449447..6525a00 100755 (executable)
@@ -107,6 +107,13 @@ namespace Tizen.NUI.Scene3D
         }
 
         /// <summary>
+        /// An event emitted when Camera Transition is finished.
+        /// </summary>
+        // This will be public opened after ACR done. (Before ACR, need to be hidden as Inhouse API)
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public event EventHandler CameraTransitionFinished;
+
+        /// <summary>
         /// Set/Get the ImageBasedLight ScaleFactor.
         /// Scale factor controls light source intensity in [0.0f, 1.0f]
         /// </summary>
@@ -535,25 +542,9 @@ namespace Tizen.NUI.Scene3D
 
             Position sourcePosition = sourceCamera.Position;
             Rotation sourceOrientation = sourceCamera.Orientation;
-            Radian   sourceFieldOfView = sourceCamera.FieldOfView;
 
             Position destinationPosition = destinationCamera.Position;
             Rotation destinationOrientation = destinationCamera.Orientation;
-            Radian   destinationFieldOfView = destinationCamera.FieldOfView;
-
-            // If ProjectionDirection is not equal, match the value.
-            if (sourceCamera.ProjectionDirection != destinationCamera.ProjectionDirection)
-            {
-                float aspect = destinationCamera.AspectRatio;
-                if (destinationCamera.ProjectionDirection == Camera.ProjectionDirectionType.Vertical)
-                {
-                    sourceFieldOfView = Camera.ConvertFovFromHorizontalToVertical(aspect, sourceFieldOfView);
-                }
-                else
-                {
-                    sourceFieldOfView = Camera.ConvertFovFromVerticalToHorizontal(aspect, sourceFieldOfView);
-                }
-            }
 
             cameraTransition = new Animation(durationMilliSeconds);
 
@@ -565,24 +556,73 @@ namespace Tizen.NUI.Scene3D
             orientationKeyFrames.Add(0.0f, sourceOrientation);
             orientationKeyFrames.Add(1.0f, destinationOrientation);
 
-            KeyFrames fieldOfViewKeyFrames = new KeyFrames();
-            fieldOfViewKeyFrames.Add(0.0f, sourceFieldOfView.ConvertToFloat());
-            fieldOfViewKeyFrames.Add(1.0f, destinationFieldOfView.ConvertToFloat());
-
             cameraTransition.AnimateBetween(destinationCamera, "Position", positionKeyFrames, Animation.Interpolation.Linear, alphaFunction);
             cameraTransition.AnimateBetween(destinationCamera, "Orientation", orientationKeyFrames, Animation.Interpolation.Linear, alphaFunction);
-            cameraTransition.AnimateBetween(destinationCamera, "FieldOfView", fieldOfViewKeyFrames, Animation.Interpolation.Linear, alphaFunction);
+
+            if(destinationCamera.ProjectionMode == Camera.ProjectionModeType.Perspective)
+            {
+                Radian sourceFieldOfView = sourceCamera.FieldOfView;
+                Radian destinationFieldOfView = destinationCamera.FieldOfView;
+
+                // If ProjectionDirection is not equal, match the value.
+                if (sourceCamera.ProjectionDirection != destinationCamera.ProjectionDirection)
+                {
+                    float aspect = destinationCamera.AspectRatio;
+                    if (destinationCamera.ProjectionDirection == Camera.ProjectionDirectionType.Vertical)
+                    {
+                        sourceFieldOfView = Camera.ConvertFovFromHorizontalToVertical(aspect, sourceFieldOfView);
+                    }
+                    else
+                    {
+                        sourceFieldOfView = Camera.ConvertFovFromVerticalToHorizontal(aspect, sourceFieldOfView);
+                    }
+                }
+
+                KeyFrames fieldOfViewKeyFrames = new KeyFrames();
+                fieldOfViewKeyFrames.Add(0.0f, sourceFieldOfView.ConvertToFloat());
+                fieldOfViewKeyFrames.Add(1.0f, destinationFieldOfView.ConvertToFloat());
+                cameraTransition.AnimateBetween(destinationCamera, "FieldOfView", fieldOfViewKeyFrames, Animation.Interpolation.Linear, alphaFunction);
+
+                sourceFieldOfView.Dispose();
+                destinationFieldOfView.Dispose();
+                fieldOfViewKeyFrames.Dispose();
+            }
+            else
+            {
+                float sourceOrthographicSize = sourceCamera.OrthographicSize;
+                float destinationOrthographicSize = destinationCamera.OrthographicSize;
+
+                // If ProjectionDirection is not equal, match the value.
+                if (sourceCamera.ProjectionDirection != destinationCamera.ProjectionDirection)
+                {
+                    float aspect = destinationCamera.AspectRatio;
+                    if (destinationCamera.ProjectionDirection == Camera.ProjectionDirectionType.Vertical)
+                    {
+                        sourceOrthographicSize = sourceOrthographicSize / aspect;
+                    }
+                    else
+                    {
+                        sourceOrthographicSize = sourceOrthographicSize * aspect;
+                    }
+                }
+
+                KeyFrames orthographicSizeKeyFrames = new KeyFrames();
+                orthographicSizeKeyFrames.Add(0.0f, sourceOrthographicSize);
+                orthographicSizeKeyFrames.Add(1.0f, destinationOrthographicSize);
+                cameraTransition.AnimateBetween(destinationCamera, "OrthographicSize", orthographicSizeKeyFrames, Animation.Interpolation.Linear, alphaFunction);
+
+                orthographicSizeKeyFrames.Dispose();
+            }
 
             cameraTransition.Finished += (s, e) =>
             {
                 inCameraTransition = false;
+                CameraTransitionFinished?.Invoke(this, EventArgs.Empty);
             };
             cameraTransition.Play();
 
-            sourceFieldOfView.Dispose();
             positionKeyFrames.Dispose();
             orientationKeyFrames.Dispose();
-            orientationKeyFrames.Dispose();
         }
 
         /// <summary>
index 889d37d..85146bf 100755 (executable)
@@ -5,7 +5,7 @@
         <LangVersion>8.0</LangVersion>
     </PropertyGroup>
     <PropertyGroup>
-        <DefineConstants>NUI_DEBUG_OFF;NUI_PROPERTY_CHANGE_1;NUI_PROPERTY_CHANGE_2;NUI_PROPERTY_CHANGE_3;NUI_VISUAL_PROPERTY_CHANGE_1;NUI_ANIMATION_PROPERTY_CHANGE_1;</DefineConstants>
+        <DefineConstants>NUI_DEBUG_OFF;</DefineConstants>
     </PropertyGroup>
     <ItemGroup>
         <TizenPreloadFile Include="Tizen.NUI.preload"
index 0c08d4c..86cc9b9 100755 (executable)
@@ -48,7 +48,7 @@ namespace Tizen.NUI
             Interop.Handle.SetProperty(handle, index, PropertyValue.getCPtr(propertyValue));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-#if NUI_PROPERTY_CHANGE_1
+
         internal static int InternalSetPropertyString(HandleRef actor, int propertyType, string valString)
         {
             if (actor.Handle == System.IntPtr.Zero)
@@ -288,7 +288,5 @@ namespace Tizen.NUI
             }
             return ret;
         }
-
-#endif
     }
 }
index 0390856..e78f292 100755 (executable)
@@ -260,7 +260,7 @@ namespace Tizen.NUI
                 return PropertyValue.CreateFromObject(refined);
             }
 
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
             // Refine object as IntPtr of PropertyValue to optimize.
             // Warning : This API don't automatically release memory.
             internal global::System.IntPtr RefineValueIntPtr(object value)
@@ -281,7 +281,6 @@ namespace Tizen.NUI
 
                 return PropertyValue.CreateFromObjectIntPtr(refined);
             }
-#endif
 
             internal KeyFrames RefineKeyFrames(KeyFrames keyFrames)
             {
index 88250b0..9cd9778 100755 (executable)
@@ -147,7 +147,10 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_SetNeedGesturePropagation")]
             public static extern float SetNeedGesturePropagation(global::System.Runtime.InteropServices.HandleRef jarg1, bool jarg2);
-#if NUI_PROPERTY_CHANGE_1
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_CalculateScreenExtents")]
+            public static extern global::System.IntPtr CalculateScreenExtents(global::System.Runtime.InteropServices.HandleRef jarg1);
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_InternalRetrievingPropertyVector2")]
             public static extern int InternalRetrievingPropertyVector2(HandleRef actor, int propertyType, HandleRef retrievingVector2);
 
@@ -199,8 +202,6 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_InternalSetPropertyInt")]
             public static extern int InternalSetPropertyInt(HandleRef actor, int propertyType, int valInt);
-
-#endif
         }
     }
 }
index 6520f77..026a57c 100755 (executable)
@@ -243,7 +243,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_DevelActor_Property_GetTouchAreaOffset")]
             public static extern void GetTouchAreaOffset(global::System.Runtime.InteropServices.HandleRef jarg1, out int jarg2, out int jarg3, out int jarg4, out int jarg5);
 
-#if NUI_PROPERTY_CHANGE_3
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_RetrieveTargetSize")]
             public static extern int RetrieveTargetSize(HandleRef actor, HandleRef retrievingVector3);
 
@@ -258,8 +257,6 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_RetrieveCurrentPropertyVector4")]
             public static extern int RetrieveCurrentPropertyVector4(HandleRef actor, int propertyType, HandleRef retrievingVector4);
-#endif
-
         }
     }
 }
index 6c702b2..5e12495 100755 (executable)
@@ -155,7 +155,7 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Animation_AnimateTo__SWIG_3")]
             public static extern void AnimateTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4, global::System.Runtime.InteropServices.HandleRef jarg5);
 
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Animation_AnimateBy__SWIG_0")]
             public static extern void AnimateBy(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.IntPtr jarg3);
 
@@ -179,7 +179,6 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Animation_AnimateTo__SWIG_3")]
             public static extern void AnimateTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.IntPtr jarg3, global::System.Runtime.InteropServices.HandleRef jarg4, global::System.Runtime.InteropServices.HandleRef jarg5);
-#endif
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Animation_AnimateBetween__SWIG_0")]
             public static extern void AnimateBetween(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
index db07465..bfad814 100755 (executable)
@@ -91,9 +91,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_OrthoNormalize")]
             public static extern void OrthoNormalize(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_AsFloat__SWIG_0")]
-            public static extern global::System.IntPtr AsFloat(global::System.Runtime.InteropServices.HandleRef jarg1);
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_Multiply__SWIG_0")]
             public static extern void Multiply(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
 
@@ -101,8 +98,14 @@ namespace Tizen.NUI
             public static extern void MultiplyQuaternion(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_Multiply__SWIG_2")]
+            public static extern global::System.IntPtr MultiplyVector4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_Multiply__SWIG_4")]
             public static extern global::System.IntPtr Multiply(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
 
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_MultiplyAssign")]
+            public static extern global::System.IntPtr MultiplyAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_EqualTo")]
             [return: global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.U1)]
             public static extern bool EqualTo(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
@@ -123,6 +126,18 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_GetTransformComponents")]
             public static extern void GetTransformComponents(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4);
 
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_ValueOfIndex__SWIG_0")]
+            public static extern float ValueOfIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint index);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_ValueOfIndex__SWIG_1")]
+            public static extern float ValueOfIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint indexRow, uint indexColumn);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_SetValueAtIndex__SWIG_0")]
+            public static extern void SetValueAtIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint index, float val);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix_SetValueAtIndex__SWIG_1")]
+            public static extern void SetValueAtIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint indexRow, uint indexColumn, float val);
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_Matrix")]
             public static extern void DeleteMatrix(global::System.Runtime.InteropServices.HandleRef jarg1);
 
@@ -184,6 +199,27 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_Multiply")]
             public static extern void Matrix3Multiply(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_Multiply__SWIG_1")]
+            public static extern global::System.IntPtr Matrix3MultiplyVector3(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_Multiply__SWIG_3")]
+            public static extern global::System.IntPtr Matrix3Multiply(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_MultiplyAssign")]
+            public static extern global::System.IntPtr Matrix3MultiplyAssign(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_ValueOfIndex__SWIG_0")]
+            public static extern float Matrix3ValueOfIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint index);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_ValueOfIndex__SWIG_1")]
+            public static extern float Matrix3ValueOfIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint indexRow, uint indexColumn);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_SetValueAtIndex__SWIG_0")]
+            public static extern void Matrix3SetValueAtIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint index, float val);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Matrix3_SetValueAtIndex__SWIG_1")]
+            public static extern void Matrix3SetValueAtIndex(global::System.Runtime.InteropServices.HandleRef jarg1, uint indexRow, uint indexColumn, float val);
         }
     }
 }
index e9544dc..9ed404c 100755 (executable)
@@ -89,10 +89,9 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_Property_Value")]
             public static extern void DeletePropertyValue(global::System.Runtime.InteropServices.HandleRef jarg1);
 
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_Property_Value")]
             public static extern void DeletePropertyValueIntPtr(global::System.IntPtr jarg1);
-#endif
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Property_Value_GetType")]
             public static extern int PropertyValueGetType(global::System.Runtime.InteropServices.HandleRef jarg1);
index 9d7a4e7..f8090e9 100755 (executable)
@@ -162,6 +162,9 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextEditor_New")]
             public static extern global::System.IntPtr New();
 
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextEditor_New_With_Style")]
+            public static extern global::System.IntPtr New(bool hasStyle);
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_TextEditor__SWIG_0")]
             public static extern global::System.IntPtr NewTextEditor();
 
index 86ad919..81b3f0c 100755 (executable)
@@ -171,6 +171,9 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextField_New")]
             public static extern global::System.IntPtr New();
 
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextField_New_With_Style")]
+            public static extern global::System.IntPtr New(bool hasStyle);
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_TextField__SWIG_0")]
             public static extern global::System.IntPtr NewTextField();
 
index 787ff65..23ebfe0 100755 (executable)
@@ -88,7 +88,13 @@ namespace Tizen.NUI
             public static extern global::System.IntPtr New();
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextLabel_New__SWIG_1")]
-            public static extern global::System.IntPtr New(string jarg1);
+            public static extern global::System.IntPtr New(string text);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextLabel_New_With_Style")]
+            public static extern global::System.IntPtr New(bool hasStyle);
+
+            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextLabel_New_With_String_Style")]
+            public static extern global::System.IntPtr New(string text, bool hasStyle);
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_TextLabel__SWIG_0")]
             public static extern global::System.IntPtr NewTextLabel();
index 3ecaca7..dfef057 100755 (executable)
@@ -88,7 +88,7 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_DoActionExtension")]
             public static extern void DoActionExtension(global::System.Runtime.InteropServices.HandleRef control, int visualIndex, int actionId, int id, string keyPath, int property, global::System.IntPtr callback);
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_DoActionWithEmptyAttributes")]
             public static extern void DoActionWithEmptyAttributes(HandleRef control, int visualIndex, int actionId);
 
@@ -109,7 +109,6 @@ namespace Tizen.NUI
 
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Actor_InternalRetrievingVisualPropertyVector4")]
             public static extern int InternalRetrievingVisualPropertyVector4(HandleRef actor,  int visualIndex, int visualPropertyIndex, HandleRef retrievingVector4);
-#endif
         }
     }
 }
index 3a42d98..ddd1646 100755 (executable)
@@ -666,7 +666,7 @@ namespace Tizen.NUI
                 var current = result;
                 while (current != null)
                 {
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
                     var targetValueIntPtr = current.RefineValueIntPtr(relativeValue);
                     if (targetValueIntPtr == global::System.IntPtr.Zero)
                     {
@@ -674,11 +674,6 @@ namespace Tizen.NUI
                     }
                     AnimateByIntPtr(current.Property, targetValueIntPtr, alphaFunction);
                     Interop.PropertyValue.DeletePropertyValueIntPtr(targetValueIntPtr);
-#else
-                    var targetValue = current.RefineValue(relativeValue) ?? throw new ArgumentException("Invalid " + nameof(relativeValue));
-                    AnimateBy(current.Property, targetValue, alphaFunction);
-                    targetValue.Dispose();
-#endif
                     current = current.NextResult;
                 }
             }
@@ -722,7 +717,7 @@ namespace Tizen.NUI
                 using (var time = new TimePeriod(startTime, endTime - startTime))
                     while (current != null)
                     {
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
                         var targetValueIntPtr = current.RefineValueIntPtr(relativeValue);
                         if (targetValueIntPtr == global::System.IntPtr.Zero)
                         {
@@ -730,11 +725,6 @@ namespace Tizen.NUI
                         }
                         AnimateByIntPtr(current.Property, targetValueIntPtr, alphaFunction, time);
                         Interop.PropertyValue.DeletePropertyValueIntPtr(targetValueIntPtr);
-#else
-                        var targetValue = current.RefineValue(relativeValue) ?? throw new ArgumentException("Invalid " + nameof(relativeValue));
-                        AnimateBy(current.Property, targetValue, alphaFunction, time);
-                        targetValue.Dispose();
-#endif
                         current = current.NextResult;
                     }
             }
@@ -775,7 +765,7 @@ namespace Tizen.NUI
                 var current = result;
                 while (current != null)
                 {
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
                     var targetValueIntPtr = current.RefineValueIntPtr(destinationValue);
                     if (targetValueIntPtr == global::System.IntPtr.Zero)
                     {
@@ -783,11 +773,6 @@ namespace Tizen.NUI
                     }
                     AnimateToIntPtr(current.Property, targetValueIntPtr, alphaFunction);
                     Interop.PropertyValue.DeletePropertyValueIntPtr(targetValueIntPtr);
-#else
-                    var targetValue = current.RefineValue(destinationValue) ?? throw new ArgumentException("Invalid " + nameof(destinationValue));
-                    AnimateTo(current.Property, targetValue, alphaFunction);
-                    targetValue.Dispose();
-#endif
                     current = current.NextResult;
                 }
             }
@@ -898,7 +883,7 @@ namespace Tizen.NUI
                 using (var time = new TimePeriod(startTime, endTime - startTime))
                     while (current != null)
                     {
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
                         var targetValueIntPtr = current.RefineValueIntPtr(destinationValue);
                         if (targetValueIntPtr == global::System.IntPtr.Zero)
                         {
@@ -906,11 +891,6 @@ namespace Tizen.NUI
                         }
                         AnimateToIntPtr(current.Property, targetValueIntPtr, alphaFunction, time);
                         Interop.PropertyValue.DeletePropertyValueIntPtr(targetValueIntPtr);
-#else
-                        var targetValue = current.RefineValue(destinationValue) ?? throw new ArgumentException("Invalid " + nameof(destinationValue));
-                        AnimateTo(current.Property, targetValue, alphaFunction, time);
-                        targetValue.Dispose();
-#endif
                         current = current.NextResult;
                     }
             }
@@ -1482,7 +1462,7 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
         internal void AnimateByIntPtr(Property target, global::System.IntPtr relativeValueIntPtr, AlphaFunction alpha)
         {
             if (alpha == null)
@@ -1534,7 +1514,6 @@ namespace Tizen.NUI
             }
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
-#endif
 
         internal void AnimateBetween(Property target, KeyFrames keyFrames)
         {
index 91a90f9..014ade7 100755 (executable)
@@ -66,9 +66,7 @@ namespace Tizen.NUI.BaseComponents
         private TriggerableSelector<string> resourceUrlSelector;
         private TriggerableSelector<Rectangle> borderSelector;
 
-#if NUI_PROPERTY_CHANGE_2
         private RelativeVector4 internalPixelArea;
-#endif
 
         /// <summary>
         /// Creates an initialized ImageView.
@@ -393,16 +391,10 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_DEBUG
-PreMultipliedAlphaGetter++;
-#endif
                 return (bool)GetValue(PreMultipliedAlphaProperty);
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_DEBUG
-PreMultipliedAlphaSetter++;
-#endif
                 SetValue(PreMultipliedAlphaProperty, value);
                 NotifyPropertyChanged();
             }
@@ -420,22 +412,10 @@ PreMultipliedAlphaSetter++;
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_DEBUG
-PixelAreaGetter++;
-#endif
-
-#if NUI_PROPERTY_CHANGE_2
                 return (RelativeVector4)GetValue(PixelAreaProperty);
-#else
-                RelativeVector4 temp = (RelativeVector4)GetValue(PixelAreaProperty);
-                return new RelativeVector4(OnPixelAreaChanged, temp.X, temp.Y, temp.Z, temp.W);
-#endif                
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_DEBUG
-PixelAreaSetter++;
-#endif
                 SetValue(PixelAreaProperty, value);
                 NotifyPropertyChanged();
             }
@@ -669,13 +649,8 @@ PixelAreaSetter++;
             // Sync as current properties
             UpdateImage();
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             Interop.View.DoActionWithEmptyAttributes(this.SwigCPtr, ImageView.Property.IMAGE, ActionReload);
-#else
-            PropertyValue attributes = new PropertyValue(0);
-            this.DoAction(ImageView.Property.IMAGE, ActionReload, attributes);
-            attributes?.Dispose();
-#endif
         }
 
         /// <summary>
@@ -687,13 +662,8 @@ PixelAreaSetter++;
             // Sync as current properties
             UpdateImage();
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             Interop.View.DoActionWithEmptyAttributes(this.SwigCPtr, ImageView.Property.IMAGE, ActionPlay);
-#else
-            PropertyValue attributes = new PropertyValue(0);
-            this.DoAction(ImageView.Property.IMAGE, ActionPlay, attributes);
-            attributes?.Dispose();
-#endif
         }
 
         /// <summary>
@@ -705,13 +675,8 @@ PixelAreaSetter++;
             // Sync as current properties
             UpdateImage();
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             Interop.View.DoActionWithEmptyAttributes(this.SwigCPtr, ImageView.Property.IMAGE, ActionPause);
-#else
-            PropertyValue attributes = new PropertyValue(0);
-            this.DoAction(ImageView.Property.IMAGE, ActionPause, attributes);
-            attributes?.Dispose();
-#endif
         }
 
         /// <summary>
@@ -724,13 +689,8 @@ PixelAreaSetter++;
             UpdateImage();
 
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             Interop.View.DoActionWithEmptyAttributes(this.SwigCPtr, ImageView.Property.IMAGE, ActionStop);
-#else
-            PropertyValue attributes = new PropertyValue(0);
-            this.DoAction(ImageView.Property.IMAGE, ActionStop, attributes);
-            attributes?.Dispose();
-#endif
         }
 
         /// <summary>
@@ -1225,32 +1185,13 @@ PixelAreaSetter++;
 
             if (backgroundExtraData == null) return;
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             // Update corner radius properties to image by ActionUpdateProperty
             if (backgroundExtraData.CornerRadius != null)
             {
                 Interop.View.InternalUpdateVisualPropertyVector4(this.SwigCPtr, ImageView.Property.IMAGE, Visual.Property.CornerRadius, Vector4.getCPtr(backgroundExtraData.CornerRadius));
             }
             Interop.View.InternalUpdateVisualPropertyInt(this.SwigCPtr, ImageView.Property.IMAGE, Visual.Property.CornerRadiusPolicy, (int)backgroundExtraData.CornerRadiusPolicy);
-#else
-            // Apply corner radius to IMAGE.
-            var cornerRadiusValue = backgroundExtraData.CornerRadius == null ? new PropertyValue() : new PropertyValue(backgroundExtraData.CornerRadius);
-            var cornerRadiusPolicyValue = new PropertyValue((int)backgroundExtraData.CornerRadiusPolicy);
-
-            // Make current propertyMap
-            PropertyMap currentPropertyMap = new PropertyMap();
-            currentPropertyMap[Visual.Property.CornerRadius] = cornerRadiusValue;
-            currentPropertyMap[Visual.Property.CornerRadiusPolicy] = cornerRadiusPolicyValue;
-            var temp = new PropertyValue(currentPropertyMap);
-
-            // Update corner radius properties to image by ActionUpdateProperty
-            this.DoAction(ImageView.Property.IMAGE, ActionUpdateProperty, temp);
-
-            temp.Dispose();
-            currentPropertyMap.Dispose();
-            cornerRadiusValue.Dispose();
-            cornerRadiusPolicyValue.Dispose();
-#endif
         }
 
         internal override void ApplyBorderline()
@@ -1259,33 +1200,11 @@ PixelAreaSetter++;
 
             if (backgroundExtraData == null) return;
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             // Update borderline properties to image by ActionUpdateProperty
             Interop.View.InternalUpdateVisualPropertyFloat(this.SwigCPtr, ImageView.Property.IMAGE, Visual.Property.BorderlineWidth, backgroundExtraData.BorderlineWidth);
             Interop.View.InternalUpdateVisualPropertyVector4(this.SwigCPtr, ImageView.Property.IMAGE, Visual.Property.BorderlineColor, Vector4.getCPtr(backgroundExtraData.BorderlineColor ?? Color.Black));
             Interop.View.InternalUpdateVisualPropertyFloat(this.SwigCPtr, ImageView.Property.IMAGE, Visual.Property.BorderlineOffset, backgroundExtraData.BorderlineOffset);
-#else
-            // Apply borderline to IMAGE.
-            var borderlineWidthValue = new PropertyValue(backgroundExtraData.BorderlineWidth);
-            var borderlineColorValue = backgroundExtraData.BorderlineColor == null ? new PropertyValue(Color.Black) : new PropertyValue(backgroundExtraData.BorderlineColor);
-            var borderlineOffsetValue = new PropertyValue(backgroundExtraData.BorderlineOffset);
-
-            // Make current propertyMap
-            PropertyMap currentPropertyMap = new PropertyMap();
-            currentPropertyMap[Visual.Property.BorderlineWidth] = borderlineWidthValue;
-            currentPropertyMap[Visual.Property.BorderlineColor] = borderlineColorValue;
-            currentPropertyMap[Visual.Property.BorderlineOffset] = borderlineOffsetValue;
-            var temp = new PropertyValue(currentPropertyMap);
-
-            // Update borderline properties to image by ActionUpdateProperty
-            this.DoAction(ImageView.Property.IMAGE, ActionUpdateProperty, temp);
-
-            temp.Dispose();
-            currentPropertyMap.Dispose();
-            borderlineWidthValue.Dispose();
-            borderlineColorValue.Dispose();
-            borderlineOffsetValue.Dispose();
-#endif
         }
 
         internal ResourceLoadingStatusType GetResourceStatus()
@@ -1305,9 +1224,7 @@ PixelAreaSetter++;
                 return;
             }
 
-#if NUI_PROPERTY_CHANGE_2
             internalPixelArea?.Dispose();
-#endif
 
             if (type == DisposeTypes.Explicit)
             {
@@ -1500,9 +1417,9 @@ PixelAreaSetter++;
             }
 
             // Checkup the cached visual type is AnimatedImage.
-            // It is trick to know that this code is running on AnimatedImageView.UpdateImage() or not.
-            int visualType = -1;
-            if(!((GetCachedImageVisualProperty(Visual.Property.Type)?.Get(out visualType) ?? false) && visualType == (int)Visual.Type.AnimatedImage))
+            // It is trick to know that this code is running on AnimatedImageView.UpdateImage() / LottieAnimationView.UpdateImage() or not.
+            int visualType = (int)Visual.Type.Invalid;
+            if(!((GetCachedImageVisualProperty(Visual.Property.Type)?.Get(out visualType) ?? false) && (visualType == (int)Visual.Type.AnimatedImage || visualType == (int)Visual.Type.AnimatedVectorImage)))
             {
                 // If ResourceUrl is not setuped, don't set property. fast return.
                 if(string.IsNullOrEmpty(_resourceUrl))
index dcaa6d8..0f815ef 100755 (executable)
@@ -143,11 +143,7 @@ namespace Tizen.NUI.BaseComponents
                 else
                 {
                     // Else, we don't need to re-create view. Get value from current ImageView.
-#if NUI_PROPERTY_CHANGE_2
                     Object.InternalSetPropertyBool(imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha, (bool)newValue);
-#else
-                    Tizen.NUI.Object.SetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif                    
                 }
             }
         }),
@@ -164,11 +160,7 @@ namespace Tizen.NUI.BaseComponents
             else
             {
                 // Else, PremultipliedAlpha may not setuped in cached property. Get value from current ImageView.
-#if NUI_PROPERTY_CHANGE_2
                 temp = Object.InternalGetPropertyBool(imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha);
-#else
-                Tizen.NUI.Object.GetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha).Get(out temp);
-#endif                
             }
             return temp;
         }));
@@ -180,29 +172,20 @@ namespace Tizen.NUI.BaseComponents
             var imageView = (ImageView)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(imageView.SwigCPtr, ImageView.Property.PixelArea, ((RelativeVector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PixelArea, new Tizen.NUI.PropertyValue((RelativeVector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var imageView = (ImageView)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (imageView.internalPixelArea == null)
             {
                 imageView.internalPixelArea = new RelativeVector4(imageView.OnPixelAreaChanged, 0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(imageView.SwigCPtr, ImageView.Property.PixelArea, imageView.internalPixelArea.SwigCPtr);
             return imageView.internalPixelArea;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PixelArea).Get(temp);
-            RelativeVector4 relativeTemp = new RelativeVector4(temp.X, temp.Y, temp.Z, temp.W);
-            return relativeTemp;
-#endif            
         }));
 
         /// Intenal used, will never be opened.
index 9c0e4b9..bafde58 100755 (executable)
@@ -60,10 +60,13 @@ namespace Tizen.NUI.BaseComponents
             currentStates.stopEndAction = StopBehaviorType.CurrentFrame;
             currentStates.framePlayRangeMin = -1;
             currentStates.framePlayRangeMax = -1;
-            currentStates.changed = false;
             currentStates.totalFrame = -1;
             currentStates.scale = scale;
             currentStates.redrawInScalingDown = true;
+
+            // Set changed flag as true when initalized state.
+            // After some properties change, LottieAnimationView.UpdateImage will apply these inital values.
+            currentStates.changed = true;
             SetVisible(shown);
         }
 
@@ -132,24 +135,28 @@ namespace Tizen.NUI.BaseComponents
             {
                 string ret = (value == null ? "" : value);
                 currentStates.url = ret;
-                currentStates.changed = true;
 
                 NUILog.Debug($"<[{GetId()}]SET url={currentStates.url}");
 
                 using PropertyMap map = new PropertyMap();
-                using PropertyValue type = new PropertyValue((int)DevelVisual.Type.AnimatedVectorImage);
+                using PropertyValue type = new PropertyValue((int)Visual.Type.AnimatedVectorImage);
                 using PropertyValue url = new PropertyValue(currentStates.url);
                 using PropertyValue loopCnt = new PropertyValue(currentStates.loopCount);
                 using PropertyValue stopAction = new PropertyValue((int)currentStates.stopEndAction);
                 using PropertyValue loopMode = new PropertyValue((int)currentStates.loopMode);
+                using PropertyValue redrawInScalingDown = new PropertyValue(currentStates.redrawInScalingDown);
 
                 map.Add(Visual.Property.Type, type)
                     .Add(ImageVisualProperty.URL, url)
                     .Add(ImageVisualProperty.LoopCount, loopCnt)
                     .Add(ImageVisualProperty.StopBehavior, stopAction)
-                    .Add(ImageVisualProperty.LoopingMode, loopMode);
+                    .Add(ImageVisualProperty.LoopingMode, loopMode)
+                    .Add(ImageVisualProperty.RedrawInScalingDown, redrawInScalingDown);
                 Image = map;
 
+                // All states applied well.
+                currentStates.changed = false;
+
                 currentStates.contentInfo = null;
 
                 if (currentStates.scale != 1.0f)
@@ -797,6 +804,58 @@ namespace Tizen.NUI.BaseComponents
             InternalSavedDynamicPropertyCallbacks?.Clear();
             InternalSavedDynamicPropertyCallbacks = null;
         }
+
+        /// <summary>
+        /// Update lottie-image-relative properties synchronously.
+        /// After call this API, All image properties updated.
+        /// </summary>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected override void UpdateImage()
+        {
+            if (!imagePropertyUpdatedFlag) return;
+
+            // Update currentStates properties to cachedImagePropertyMap
+            if(currentStates.changed)
+            {
+                UpdateImage(ImageVisualProperty.LoopCount, new PropertyValue(currentStates.loopCount));
+                UpdateImage(ImageVisualProperty.StopBehavior, new PropertyValue((int)currentStates.stopEndAction));
+                UpdateImage(ImageVisualProperty.LoopingMode, new PropertyValue((int)currentStates.loopMode));
+                UpdateImage(ImageVisualProperty.RedrawInScalingDown, new PropertyValue(currentStates.redrawInScalingDown));
+                currentStates.changed = false;
+            }
+
+            using PropertyValue animatiedImage = new PropertyValue((int)Visual.Type.AnimatedVectorImage);
+            UpdateImage(Visual.Property.Type, animatiedImage);
+
+            base.UpdateImage();
+        }
+
+        /// <summary>
+        /// Update NUI cached animated image visual property map by inputed property map.
+        /// And call base.MergeCachedImageVisualProperty()
+        /// </summary>
+        /// <remarks>
+        /// For performance issue, we will collect only "cachedLottieAnimationPropertyKeyList" hold in this class.
+        /// </remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        protected override void MergeCachedImageVisualProperty(PropertyMap map)
+        {
+            if (map == null) return;
+            if (cachedImagePropertyMap == null)
+            {
+                cachedImagePropertyMap = new PropertyMap();
+            }
+            foreach (var key in cachedLottieAnimationPropertyKeyList)
+            {
+                PropertyValue value = map.Find(key);
+                if (value != null)
+                {
+                    // Update-or-Insert new value
+                    cachedImagePropertyMap[key] = value;
+                }
+            }
+            base.MergeCachedImageVisualProperty(map);
+        }
         #endregion Method
 
 
@@ -1121,6 +1180,15 @@ namespace Tizen.NUI.BaseComponents
 
 
         #region Private
+
+        // Collection of lottie-image-sensitive properties.
+        private static readonly List<int> cachedLottieAnimationPropertyKeyList = new List<int> {
+            ImageVisualProperty.LoopCount,
+            ImageVisualProperty.StopBehavior,
+            ImageVisualProperty.LoopingMode,
+            ImageVisualProperty.RedrawInScalingDown,
+        };
+
         private struct states
         {
             internal string url;
@@ -1130,25 +1198,16 @@ namespace Tizen.NUI.BaseComponents
             internal StopBehaviorType stopEndAction;
             internal int framePlayRangeMin;
             internal int framePlayRangeMax;
-            internal bool changed;
             internal int totalFrame;
             internal float scale;
             internal PlayStateType playState;
             internal List<Tuple<string, int, int>> contentInfo;
             internal string mark1, mark2;
             internal bool redrawInScalingDown;
+            internal bool changed;
         };
         private states currentStates;
 
-        private struct DevelVisual
-        {
-            internal enum Type
-            {
-                AnimatedGradient = Visual.Type.AnimatedImage + 1,
-                AnimatedVectorImage = Visual.Type.AnimatedImage + 2,
-            }
-        }
-
         private const string tag = "NUITEST";
         private event EventHandler finishedEventHandler;
 
index ddceba5..a1d046d 100755 (executable)
@@ -277,6 +277,18 @@ namespace Tizen.NUI.BaseComponents
         });
 
         [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly BindableProperty FontSizeScaleProperty = BindableProperty.Create(nameof(FontSizeScale), typeof(float?), typeof(TextEditorStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
+        {
+            var textEditorStyle = (TextEditorStyle)bindable;
+            textEditorStyle.fontSizeScale = (float?)newValue;
+        },
+        defaultValueCreator: (bindable) =>
+        {
+            var textEditorStyle = (TextEditorStyle)bindable;
+            return textEditorStyle.fontSizeScale;
+        });
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty SelectionPopupStyleProperty = BindableProperty.Create(nameof(SelectionPopupStyle), typeof(PropertyMap), typeof(TextEditorStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
         {
             var textEditorStyle = (TextEditorStyle)bindable;
@@ -326,6 +338,7 @@ namespace Tizen.NUI.BaseComponents
         private float? lineSpacing;
         private float? minLineSize;
         private float? relativeLineHeight;
+        private float? fontSizeScale;
 
         static TextEditorStyle() { }
 
@@ -713,6 +726,13 @@ namespace Tizen.NUI.BaseComponents
         }
 
         [EditorBrowsable(EditorBrowsableState.Never)]
+        public float? FontSizeScale
+        {
+            get => (float?)GetValue(FontSizeScaleProperty);
+            set => SetValue(FontSizeScaleProperty, value);
+        }
+
+        [EditorBrowsable(EditorBrowsableState.Never)]
         public PropertyMap SelectionPopupStyle
         {
             get => (PropertyMap)GetValue(SelectionPopupStyleProperty);
index 965aaab..a370f46 100755 (executable)
@@ -50,6 +50,17 @@ namespace Tizen.NUI.BaseComponents
             var textFieldStyle = (TextFieldStyle)bindable;
             return textFieldStyle.pointSize;
         });
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly BindableProperty FontSizeScaleProperty = BindableProperty.Create(nameof(FontSizeScale), typeof(float?), typeof(TextFieldStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
+        {
+            var textFieldStyle = (TextFieldStyle)bindable;
+            textFieldStyle.fontSizeScale = (float?)newValue;
+        },
+        defaultValueCreator: (bindable) =>
+        {
+            var textFieldStyle = (TextFieldStyle)bindable;
+            return textFieldStyle.fontSizeScale;
+        });
         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty TextColorProperty = BindableProperty.Create(nameof(TextColor), typeof(Color), typeof(TextFieldStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
@@ -545,6 +556,7 @@ namespace Tizen.NUI.BaseComponents
         private string fontFamily;
         private Color textColor;
         private float? pointSize;
+        private float? fontSizeScale;
         private Vector4 placeholderTextColor;
         private Vector4 primaryCursorColor;
         private PropertyMap fontStyle;
@@ -845,6 +857,13 @@ namespace Tizen.NUI.BaseComponents
             set => SetValue(PointSizeProperty, value);
         }
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public float? FontSizeScale
+        {
+            get => (float?)GetValue(FontSizeScaleProperty);
+            set => SetValue(FontSizeScaleProperty, value);
+        }
+
         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public Vector4 PlaceholderTextColor
index e24271a..e86a49e 100755 (executable)
@@ -303,6 +303,17 @@ namespace Tizen.NUI.BaseComponents
             var textLabelStyle = (TextLabelStyle)bindable;
             return textLabelStyle.characterSpacing;
         });
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public static readonly BindableProperty FontSizeScaleProperty = BindableProperty.Create(nameof(FontSizeScale), typeof(float?), typeof(TextLabelStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
+        {
+            var textLabelStyle = (TextLabelStyle)bindable;
+            textLabelStyle.fontSizeScale = (float?)newValue;
+        },
+        defaultValueCreator: (bindable) =>
+        {
+            var textLabelStyle = (TextLabelStyle)bindable;
+            return textLabelStyle.fontSizeScale;
+        });
         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty MatchSystemLanguageDirectionProperty = BindableProperty.Create(nameof(MatchSystemLanguageDirection), typeof(bool?), typeof(TextLabelStyle), null, propertyChanged: (bindable, oldValue, newValue) =>
@@ -365,6 +376,7 @@ namespace Tizen.NUI.BaseComponents
         private Selector<TextShadow> textShadow;
         private PropertyMap fontStyle;
         private float? characterSpacing;
+        private float? fontSizeScale;
 
         static TextLabelStyle() { }
 
@@ -554,6 +566,13 @@ namespace Tizen.NUI.BaseComponents
             set => SetValue(CharacterSpacingProperty, value);
         }
 
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public float? FontSizeScale
+        {
+            get => (float?)GetValue(FontSizeScaleProperty);
+            set => SetValue(FontSizeScaleProperty, value);
+        }
+
         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
         public bool? MatchSystemLanguageDirection
index 6cc5aa8..2bde759 100755 (executable)
@@ -39,8 +39,8 @@ namespace Tizen.NUI.BaseComponents
         private float fontSizeScale = 1.0f;
         private bool hasFontSizeChangedCallback = false;
         private bool isSettingTextInCSharp = false;
+        static private string defaultStyleName = "Tizen.NUI.BaseComponents.TextEditor";
 
-#if NUI_PROPERTY_CHANGE_2
         private Color internalPlaceholderTextColor = null;
         private Vector4 internalPrimaryCursorColor = null;
         private Vector4 internalSecondaryCursorColor = null;
@@ -49,7 +49,6 @@ namespace Tizen.NUI.BaseComponents
         private Vector4 internalTextColor = null;
         private Color internalGrabHandleColor = null;
 
-#endif
 
         static TextEditor() { }
 
@@ -57,7 +56,7 @@ namespace Tizen.NUI.BaseComponents
         /// Creates the TextEditor control.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
-        public TextEditor() : this(Interop.TextEditor.New(), true)
+        public TextEditor() : this(Interop.TextEditor.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -66,7 +65,7 @@ namespace Tizen.NUI.BaseComponents
         /// Creates the TextEditor with specified style.
         /// </summary>
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public TextEditor(TextEditorStyle style) : this(Interop.TextLabel.New(), true, style: style)
+        public TextEditor(TextEditorStyle style) : this(Interop.TextEditor.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true, style: style)
         {
         }
 
@@ -76,7 +75,7 @@ namespace Tizen.NUI.BaseComponents
         /// <param name="shown">false : Not displayed (hidden), true : displayed (shown)</param>
         /// This will be public opened in next release of tizen after ACR done. Before ACR, it is used as HiddenAPI (InhouseAPI).
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public TextEditor(bool shown) : this(Interop.TextEditor.New(), true)
+        public TextEditor(bool shown) : this(Interop.TextEditor.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             SetVisible(shown);
@@ -2170,6 +2169,19 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
+                return (float)GetValue(FontSizeScaleProperty);
+            }
+            set
+            {
+                SetValue(FontSizeScaleProperty, value);
+                NotifyPropertyChanged();
+            }
+        }
+
+        private float InternalFontSizeScale
+        {
+            get
+            {
                 return fontSizeScale;
             }
             set
@@ -2201,11 +2213,16 @@ namespace Tizen.NUI.BaseComponents
                     removeFontSizeChangedCallback();
                 }
 
-                SetValue(FontSizeScaleProperty, newFontSizeScale);
-                NotifyPropertyChanged();
+                SetInternalFontSizeScale(newFontSizeScale);
             }
         }
 
+        private void SetInternalFontSizeScale(float fontSizeScale)
+        {
+
+            Object.InternalSetPropertyFloat(this.SwigCPtr, TextEditor.Property.FontSizeScale, (float)fontSizeScale);
+        }
+
         /// <summary>
         /// The EnableFontSizeScale property.<br />
         /// Whether the font size scale is enabled. (The default value is true)
@@ -2421,7 +2438,6 @@ namespace Tizen.NUI.BaseComponents
                 return;
             }
 
-#if NUI_PROPERTY_CHANGE_2
             internalPlaceholderTextColor?.Dispose();
             internalPrimaryCursorColor?.Dispose();
             internalSecondaryCursorColor?.Dispose();
@@ -2429,7 +2445,6 @@ namespace Tizen.NUI.BaseComponents
             internalInputColor?.Dispose();
             internalTextColor?.Dispose();
             internalGrabHandleColor?.Dispose();
-#endif
 
             if (systemlangTextFlag)
             {
@@ -2535,8 +2550,7 @@ namespace Tizen.NUI.BaseComponents
         private void SystemSettingsFontSizeChanged(object sender, FontSizeChangedEventArgs e)
         {
             float newFontSizeScale = TextUtils.GetFontSizeScale(e.Value);
-            SetValue(FontSizeScaleProperty, newFontSizeScale);
-            NotifyPropertyChanged();
+            SetInternalFontSizeScale(newFontSizeScale);
         }
 
         private void addFontSizeChangedCallback()
index 0130bc2..2875cb2 100755 (executable)
@@ -34,24 +34,16 @@ namespace Tizen.NUI.BaseComponents
             if (newValue != null)
             {
                 textEditor.isSettingTextInCSharp = true;
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.TEXT, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TEXT, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
                 textEditor.isSettingTextInCSharp = false;
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.TEXT);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TEXT).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -60,29 +52,20 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.TextColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TextColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textEditor.internalTextColor == null)
             {
                 textEditor.internalTextColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.TextColor, textEditor.internalTextColor.SwigCPtr);
             return textEditor.internalTextColor;
-#else
-
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TextColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -91,23 +74,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.FontFamily, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontFamily, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.FontFamily);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontFamily).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -133,23 +108,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PointSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PointSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PointSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PointSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -158,25 +125,16 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_2
+
             temp = Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment).Get(out temp) == false)
-            {
-                NUILog.Error("HorizontalAlignment get error!");
-            }
-#endif
             return temp.GetValueByDescription<HorizontalAlignment>();
         }));
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -185,25 +143,16 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_2
+
             temp = Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment).Get(out temp) == false)
-            {
-                NUILog.Error("VerticalAlignment get error!");
-            }
-#endif
             return temp.GetValueByDescription<VerticalAlignment>();
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -213,23 +162,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -238,23 +179,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -263,28 +196,20 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textEditor.internalPrimaryCursorColor == null)
             {
                 textEditor.internalPrimaryCursorColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor, textEditor.internalPrimaryCursorColor.SwigCPtr);
             return textEditor.internalPrimaryCursorColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -293,28 +218,20 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif            
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textEditor.internalSecondaryCursorColor == null)
             {
                 textEditor.internalSecondaryCursorColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor, textEditor.internalSecondaryCursorColor.SwigCPtr);
             return textEditor.internalSecondaryCursorColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -323,23 +240,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -348,23 +257,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -373,23 +274,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -398,23 +291,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.CursorWidth, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorWidth, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.CursorWidth);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorWidth).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -423,23 +308,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -448,23 +325,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage).Get(out temp);
-            return temp;
-#endif
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -593,28 +462,20 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textEditor.internalSelectionHighlightColor == null)
             {
                 textEditor.internalSelectionHighlightColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor, textEditor.internalSelectionHighlightColor.SwigCPtr);
             return textEditor.internalSelectionHighlightColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -640,23 +501,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableMarkup, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableMarkup, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableMarkup);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableMarkup).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -665,28 +518,20 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.InputColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textEditor.internalInputColor == null)
             {
                 textEditor.internalInputColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.InputColor, textEditor.internalInputColor.SwigCPtr);
             return textEditor.internalInputColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -695,23 +540,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputFontFamily, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputFontFamily, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputFontFamily);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputFontFamily).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -737,23 +574,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputPointSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputPointSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputPointSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputPointSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -762,23 +591,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.LineSpacing, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineSpacing, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.LineSpacing);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineSpacing).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -787,23 +608,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing).Get(out temp);
-            return temp;
-#endif
         }));
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty RelativeLineHeightProperty = BindableProperty.Create(nameof(RelativeLineHeight), typeof(float), typeof(TextEditor), default(float), propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) =>
@@ -811,23 +624,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -853,23 +658,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputUnderline, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputUnderline, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputUnderline);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputUnderline).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -896,23 +693,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputShadow, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputShadow, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputShadow);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputShadow).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -921,23 +710,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.EMBOSS, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EMBOSS, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.EMBOSS);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EMBOSS).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -946,23 +727,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputEmboss, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputEmboss, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputEmboss);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputEmboss).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -988,23 +761,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputOutline, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputOutline, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputOutline);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputOutline).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1013,23 +778,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.SmoothScroll, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScroll, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.SmoothScroll);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScroll).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1038,23 +795,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1063,23 +812,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1088,23 +829,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1113,23 +846,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1138,23 +863,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PixelSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PixelSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PixelSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PixelSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1163,23 +880,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.PlaceholderText, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderText, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.PlaceholderText);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderText).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1188,28 +897,20 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor, ((Color)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor, new Tizen.NUI.PropertyValue((Color)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textEditor.internalPlaceholderTextColor == null)
             {
                 textEditor.internalPlaceholderTextColor = new Color(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor, textEditor.internalPlaceholderTextColor.SwigCPtr);
             return textEditor.internalPlaceholderTextColor;
-#else
-            Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1218,23 +919,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableSelection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableSelection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableSelection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableSelection).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1260,26 +953,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.LineWrapMode, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineWrapMode, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.LineWrapMode);
-#else
-            int temp;
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineWrapMode).Get(out temp) == false)
-            {
-                NUILog.Error("LineWrapMode get error!");
-            }
-            return (LineWrapMode)temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1288,24 +970,16 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
             //textEditor.mShiftSelectionFlag(true);
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1314,23 +988,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection).Get(out temp);
-            return (bool)temp;
-#endif
         }));
         /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1339,23 +1005,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.MaxLength, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MaxLength, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.MaxLength);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MaxLength).Get(out temp);
-            return temp;
-#endif
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1364,26 +1022,13 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
-                Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.FontSizeScale, (float)newValue);
-#else
-                using (var property = new Tizen.NUI.PropertyValue((float)newValue))
-                {
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontSizeScale, property);
-                }
-#endif
+                textEditor.InternalFontSizeScale = (float)newValue;
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
-            return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.FontSizeScale);
-#else
-            float temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontSizeScale).Get(out temp);
-            return temp;
-#endif
+            return textEditor.InternalFontSizeScale;
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1392,26 +1037,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale, (bool)newValue);
-#else
-                using (var property = new Tizen.NUI.PropertyValue((bool)newValue))
-                {
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale, property);
-                }
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale);
-#else
-            bool temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -1421,28 +1055,20 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor, ((Color)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor, new Tizen.NUI.PropertyValue((Color)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textEditor.internalGrabHandleColor == null)
             {
                 textEditor.internalGrabHandleColor = new Color(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor, textEditor.internalGrabHandleColor.SwigCPtr);
             return textEditor.internalGrabHandleColor;
-#else
-            Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor).Get(temp);
-            return temp;
-#endif
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1451,23 +1077,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle).Get(out temp);
-            return temp;
-#endif
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1476,23 +1094,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup).Get(out temp);
-            return temp;
-#endif
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1518,23 +1128,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1543,23 +1145,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition).Get(out temp);
-            return (EllipsisPosition)temp;
-#endif
         }));
 
         /// currently need to be hidden as inhouse API.
@@ -1569,23 +1163,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.MinLineSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MinLineSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.MinLineSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MinLineSize).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1703,23 +1289,15 @@ namespace Tizen.NUI.BaseComponents
             var textEditor = (TextEditor)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textEditor = (TextEditor)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing);
-#else
-            float temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing).Get(out temp);
-            return temp;
-#endif
         }));
     }
 }
index ddcb809..5334d5b 100755 (executable)
@@ -39,8 +39,9 @@ namespace Tizen.NUI.BaseComponents
         private float fontSizeScale = 1.0f;
         private bool hasFontSizeChangedCallback = false;
         private bool isSettingTextInCSharp = false;
+        static private string defaultStyleName = "Tizen.NUI.BaseComponents.TextField";
+
 
-#if NUI_PROPERTY_CHANGE_2
         private Vector4 internalPlaceholderTextColor = null;
         private Vector4 internalPrimaryCursorColor = null;
         private Vector4 internalSecondaryCursorColor = null;
@@ -49,7 +50,6 @@ namespace Tizen.NUI.BaseComponents
         private Color internalTextColor = null;
         private Color internalGrabHandleColor = null;
 
-#endif
 
         static TextField() { }
 
@@ -57,7 +57,7 @@ namespace Tizen.NUI.BaseComponents
         /// Creates the TextField control.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
-        public TextField() : this(Interop.TextField.New(), true)
+        public TextField() : this(Interop.TextField.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -68,7 +68,7 @@ namespace Tizen.NUI.BaseComponents
         /// <param name="shown">false : Not displayed (hidden), true : displayed (shown)</param>
         /// This will be public opened in next release of tizen after ACR done. Before ACR, it is used as HiddenAPI (InhouseAPI).
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public TextField(bool shown) : this(Interop.TextField.New(), true)
+        public TextField(bool shown) : this(Interop.TextField.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             SetVisible(shown);
@@ -2289,6 +2289,19 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
+                return (float)GetValue(FontSizeScaleProperty);
+            }
+            set
+            {
+                SetValue(FontSizeScaleProperty, value);
+                NotifyPropertyChanged();
+            }
+        }
+
+        private float InternalFontSizeScale
+        {
+            get
+            {
                 return fontSizeScale;
             }
             set
@@ -2320,11 +2333,16 @@ namespace Tizen.NUI.BaseComponents
                     removeFontSizeChangedCallback();
                 }
 
-                SetValue(FontSizeScaleProperty, newFontSizeScale);
-                NotifyPropertyChanged();
+                SetInternalFontSizeScale(newFontSizeScale);
             }
         }
 
+        private void SetInternalFontSizeScale(float fontSizeScale)
+        {
+
+            Object.InternalSetPropertyFloat(this.SwigCPtr, TextField.Property.FontSizeScale, (float)fontSizeScale);
+        }
+
         /// <summary>
         /// The EnableFontSizeScale property.<br />
         /// Whether the font size scale is enabled. (The default value is true)
@@ -2420,7 +2438,7 @@ namespace Tizen.NUI.BaseComponents
                 return;
             }
 
-#if NUI_PROPERTY_CHANGE_2
+
             internalPlaceholderTextColor?.Dispose();
             internalPrimaryCursorColor?.Dispose();
             internalSecondaryCursorColor?.Dispose();
@@ -2428,7 +2446,6 @@ namespace Tizen.NUI.BaseComponents
             internalInputColor?.Dispose();
             internalTextColor?.Dispose();
             internalGrabHandleColor?.Dispose();
-#endif
 
             if (systemlangTextFlag)
             {
@@ -2545,8 +2562,7 @@ namespace Tizen.NUI.BaseComponents
         private void SystemSettingsFontSizeChanged(object sender, FontSizeChangedEventArgs e)
         {
             float newFontSizeScale = TextUtils.GetFontSizeScale(e.Value);
-            SetValue(FontSizeScaleProperty, newFontSizeScale);
-            NotifyPropertyChanged();
+            SetInternalFontSizeScale(newFontSizeScale);
         }
 
         private void addFontSizeChangedCallback()
index b31e794..566ab43 100755 (executable)
@@ -85,24 +85,16 @@ namespace Tizen.NUI.BaseComponents
             if (newValue != null)
             {
                 textField.isSettingTextInCSharp = true;
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.TEXT, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TEXT, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
                 textField.isSettingTextInCSharp = false;
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.TEXT);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TEXT).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -111,23 +103,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderText, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderText, new Tizen.NUI.PropertyValue((string)newValue));
-#endif            
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderText);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderText).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -136,23 +120,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderTextFocused, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextFocused, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderTextFocused);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextFocused).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -161,23 +137,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.FontFamily, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontFamily, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.FontFamily);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontFamily).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -204,23 +172,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.PointSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PointSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.PointSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PointSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -229,23 +189,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.MaxLength, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MaxLength, new Tizen.NUI.PropertyValue((int)newValue));
-#endif            
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.MaxLength);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MaxLength).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -254,23 +206,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.ExceedPolicy, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ExceedPolicy, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.ExceedPolicy);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ExceedPolicy).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -279,25 +223,16 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.HorizontalAlignment, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.HorizontalAlignment, new Tizen.NUI.PropertyValue((int)newValue));
-#endif            
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_2
+
             temp = Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.HorizontalAlignment);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.HorizontalAlignment).Get(out temp) == false)
-            {
-                NUILog.Error("HorizontalAlignment get error!");
-            }
-#endif
             return temp.GetValueByDescription<HorizontalAlignment>();
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -307,25 +242,16 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.VerticalAlignment, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.VerticalAlignment, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_2
+
             temp = Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.VerticalAlignment);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.VerticalAlignment).Get(out temp) == false)
-            {
-                NUILog.Error("VerticalAlignment get error!");
-            }
-#endif
             return temp.GetValueByDescription<VerticalAlignment>();
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -335,29 +261,20 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.TextColor, ((Color)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TextColor, new Tizen.NUI.PropertyValue((Color)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textField.internalTextColor == null)
             {
                 textField.internalTextColor = new Color(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.TextColor, textField.internalTextColor.SwigCPtr);
             return textField.internalTextColor;
-
-#else
-            Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TextColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -366,28 +283,20 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.PlaceholderTextColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textField.internalPlaceholderTextColor == null)
             {
                 textField.internalPlaceholderTextColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.PlaceholderTextColor, textField.internalPlaceholderTextColor.SwigCPtr);
             return textField.internalPlaceholderTextColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -396,23 +305,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandle, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandle, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandle);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandle).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -421,23 +322,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -446,28 +339,20 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.PrimaryCursorColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PrimaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textField.internalPrimaryCursorColor == null)
             {
                 textField.internalPrimaryCursorColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.PrimaryCursorColor, textField.internalPrimaryCursorColor.SwigCPtr);
             return textField.internalPrimaryCursorColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PrimaryCursorColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -476,28 +361,20 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.SecondaryCursorColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SecondaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textField.internalSecondaryCursorColor == null)
             {
                 textField.internalSecondaryCursorColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.SecondaryCursorColor, textField.internalSecondaryCursorColor.SwigCPtr);
             return textField.internalSecondaryCursorColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SecondaryCursorColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -506,23 +383,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableCursorBlink, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableCursorBlink, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableCursorBlink);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableCursorBlink).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -531,23 +400,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkInterval, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkInterval, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkInterval);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkInterval).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -556,23 +417,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkDuration, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkDuration, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkDuration);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkDuration).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -581,23 +434,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.CursorWidth, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorWidth, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.CursorWidth);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorWidth).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -606,23 +451,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandleImage, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleImage, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandleImage);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleImage).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -631,23 +468,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandlePressedImage, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandlePressedImage, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandlePressedImage);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandlePressedImage).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -656,23 +485,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollThreshold, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollThreshold, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollThreshold);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollThreshold).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -681,23 +502,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollSpeed, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollSpeed, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollSpeed);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollSpeed).Get(out temp);
-            return temp;
-#endif
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -826,28 +639,20 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.SelectionHighlightColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SelectionHighlightColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textField.internalSelectionHighlightColor == null)
             {
                 textField.internalSelectionHighlightColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.SelectionHighlightColor, textField.internalSelectionHighlightColor.SwigCPtr);
             return textField.internalSelectionHighlightColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SelectionHighlightColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -890,28 +695,20 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.InputColor, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputColor, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textField.internalInputColor == null)
             {
                 textField.internalInputColor = new Vector4(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.InputColor, textField.internalInputColor.SwigCPtr);
             return textField.internalInputColor;
-#else
-            Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputColor).Get(temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -920,23 +717,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableMarkup, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableMarkup, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableMarkup);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableMarkup).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -945,23 +734,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputFontFamily, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputFontFamily, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputFontFamily);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputFontFamily).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -987,23 +768,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.InputPointSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputPointSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.InputPointSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputPointSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1029,23 +802,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputUnderline, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputUnderline, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputUnderline);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputUnderline).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -1072,23 +837,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputShadow, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputShadow, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputShadow);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputShadow).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1097,23 +854,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.EMBOSS, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EMBOSS, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.EMBOSS);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EMBOSS).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1122,23 +871,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputEmboss, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputEmboss, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputEmboss);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputEmboss).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1164,23 +905,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputOutline, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputOutline, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputOutline);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputOutline).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1206,23 +939,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.PixelSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PixelSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.PixelSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PixelSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1231,23 +956,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableSelection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableSelection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableSelection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableSelection).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1273,23 +990,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.ELLIPSIS, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ELLIPSIS, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.ELLIPSIS);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ELLIPSIS).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1298,23 +1007,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.EllipsisPosition, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.EllipsisPosition);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisPosition).Get(out temp);
-            return (EllipsisPosition)temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1323,23 +1024,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableShiftSelection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableShiftSelection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableShiftSelection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableShiftSelection).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1348,23 +1041,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection).Get(out temp);
-            return (bool)temp;
-#endif
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1373,26 +1058,13 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
-                Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.FontSizeScale, (float)newValue);
-#else
-                using (var property = new Tizen.NUI.PropertyValue((float)newValue))
-                {
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontSizeScale, property);
-                }
-#endif
+                textField.InternalFontSizeScale = (float)newValue;
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
-            return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.FontSizeScale);
-#else
-            float temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontSizeScale).Get(out temp);
-            return temp;
-#endif
+            return textField.InternalFontSizeScale;
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -1401,26 +1073,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableFontSizeScale, (bool)newValue);
-#else
-                using (var property = new Tizen.NUI.PropertyValue((bool)newValue))
-                {
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableFontSizeScale, property);
-                }
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableFontSizeScale);
-#else
-            bool temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableFontSizeScale).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -1430,28 +1091,20 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.GrabHandleColor, ((Color)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleColor, new Tizen.NUI.PropertyValue((Color)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textField.internalGrabHandleColor == null)
             {
                 textField.internalGrabHandleColor = new Color(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.GrabHandleColor, textField.internalGrabHandleColor.SwigCPtr);
             return textField.internalGrabHandleColor;
-#else
-            Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleColor).Get(temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1532,23 +1185,15 @@ namespace Tizen.NUI.BaseComponents
             var textField = (TextField)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.CharacterSpacing, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CharacterSpacing, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textField = (TextField)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.CharacterSpacing);
-#else
-            float temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CharacterSpacing).Get(out temp);
-            return temp;
-#endif
         }));
     }
 }
index 7fc2b14..5d5a9b8 100755 (executable)
@@ -86,23 +86,22 @@ namespace Tizen.NUI.BaseComponents
         private TextLabelSelectorData selectorData;
         private float fontSizeScale = 1.0f;
         private bool hasFontSizeChangedCallback = false;
+        static private string defaultStyleName = "Tizen.NUI.BaseComponents.TextLabel";
 
-#if NUI_PROPERTY_CHANGE_2
         private Color internalTextColor;
-#endif
 
         /// <summary>
         /// Creates the TextLabel control.
         /// </summary>
         /// <since_tizen> 3 </since_tizen>
-        public TextLabel() : this(Interop.TextLabel.New(), true)
+        public TextLabel() : this(Interop.TextLabel.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
         /// This will be public opened in next release of tizen after ACR done. Before ACR, it is used as HiddenAPI (InhouseAPI).
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public TextLabel(TextLabelStyle viewStyle) : this(Interop.TextLabel.New(), true, viewStyle)
+        public TextLabel(TextLabelStyle viewStyle) : this(Interop.TextLabel.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true, viewStyle)
         {
         }
 
@@ -112,7 +111,7 @@ namespace Tizen.NUI.BaseComponents
         /// <param name="shown">false : Not displayed (hidden), true : displayed (shown)</param>
         /// This will be public opened in next release of tizen after ACR done. Before ACR, it is used as HiddenAPI (InhouseAPI).
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public TextLabel(bool shown) : this(Interop.TextLabel.New(), true)
+        public TextLabel(bool shown) : this(Interop.TextLabel.New(ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             SetVisible(shown);
@@ -123,7 +122,7 @@ namespace Tizen.NUI.BaseComponents
         /// </summary>
         /// <param name="text">The text to display</param>
         /// <since_tizen> 3 </since_tizen>
-        public TextLabel(string text) : this(Interop.TextLabel.New(text), true)
+        public TextLabel(string text) : this(Interop.TextLabel.New(text, ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -135,7 +134,7 @@ namespace Tizen.NUI.BaseComponents
         /// <param name="shown">false : Not displayed (hidden), true : displayed (shown)</param>
         /// This will be public opened in next release of tizen after ACR done. Before ACR, it is used as HiddenAPI (InhouseAPI).
         [EditorBrowsable(EditorBrowsableState.Never)]
-        public TextLabel(string text, bool shown) : this(Interop.TextLabel.New(text), true)
+        public TextLabel(string text, bool shown) : this(Interop.TextLabel.New(text, ThemeManager.GetStyle(defaultStyleName) == null ? false : true), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             SetVisible(shown);
@@ -1399,6 +1398,19 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
+                return (float)GetValue(FontSizeScaleProperty);
+            }
+            set
+            {
+                SetValue(FontSizeScaleProperty, value);
+                NotifyPropertyChanged();
+            }
+        }
+
+        private float InternalFontSizeScale
+        {
+            get
+            {
                 return fontSizeScale;
             }
             set
@@ -1430,11 +1442,17 @@ namespace Tizen.NUI.BaseComponents
                     removeFontSizeChangedCallback();
                 }
 
-                SetValue(FontSizeScaleProperty, newFontSizeScale);
-                NotifyPropertyChanged();
+                SetInternalFontSizeScale(newFontSizeScale);
             }
         }
 
+        private void SetInternalFontSizeScale(float fontSizeScale)
+        {
+
+            Object.InternalSetPropertyFloat(this.SwigCPtr, TextLabel.Property.FontSizeScale, (float)fontSizeScale);
+            RequestLayout();
+        }
+
         /// <summary>
         /// The EnableFontSizeScale property.<br />
         /// Whether the font size scale is enabled. (The default value is true)
@@ -1488,9 +1506,7 @@ namespace Tizen.NUI.BaseComponents
                 return;
             }
 
-#if NUI_PROPERTY_CHANGE_2
             internalTextColor?.Dispose();
-#endif
 
             if (systemlangTextFlag)
             {
@@ -1555,7 +1571,7 @@ namespace Tizen.NUI.BaseComponents
         private void SystemSettingsFontSizeChanged(object sender, FontSizeChangedEventArgs e)
         {
             float newFontSizeScale = TextUtils.GetFontSizeScale(e.Value);
-            SetValue(FontSizeScaleProperty, newFontSizeScale);
+            SetInternalFontSizeScale(newFontSizeScale);
         }
 
         private void addFontSizeChangedCallback()
index 8d1cb7e..82e06aa 100755 (executable)
@@ -70,13 +70,8 @@ namespace Tizen.NUI.BaseComponents
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.TEXT);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.TEXT).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -97,13 +92,8 @@ namespace Tizen.NUI.BaseComponents
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.FontFamily);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.FontFamily).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -142,13 +132,8 @@ namespace Tizen.NUI.BaseComponents
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.PointSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.PointSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -157,24 +142,16 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MultiLine, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MultiLine, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
                 textLabel.RequestLayout();
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MultiLine);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MultiLine).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -183,25 +160,16 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_2
+
             temp = Object.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment).Get(out temp) == false)
-            {
-                NUILog.Error("HorizontalAlignment get error!");
-            }
-#endif
             if (System.String.IsNullOrEmpty(temp))
             {
                 return HorizontalAlignment.Begin; // Return default value.
@@ -227,25 +195,16 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_2
+
             temp = Object.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment).Get(out temp) == false)
-            {
-                NUILog.Error("VerticalAlignment get error!");
-            }
-#endif
             if (System.String.IsNullOrEmpty(temp))
             {
                 return VerticalAlignment.Top; // Return default value.
@@ -283,18 +242,13 @@ namespace Tizen.NUI.BaseComponents
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             if (textLabel.internalTextColor == null)
             {
                 textLabel.internalTextColor = new Color(0, 0, 0, 0);
             }
             Object.InternalRetrievingPropertyVector4(textLabel.SwigCPtr, TextLabel.Property.TextColor, textLabel.internalTextColor.SwigCPtr);
             return textLabel.internalTextColor;
-#else
-            Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.TextColor).Get(temp);
-            return temp;
-#endif
         }));
 
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -304,23 +258,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableMarkup, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableMarkup, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableMarkup);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableMarkup).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -329,23 +275,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -354,23 +292,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -379,23 +309,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -404,23 +326,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap).Get(out temp);
-            return temp;
-#endif            
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -429,24 +343,16 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.LineSpacing, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineSpacing, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
                 textLabel.RequestLayout();
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.LineSpacing);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineSpacing).Get(out temp);
-            return temp;
-#endif
         }));
         [EditorBrowsable(EditorBrowsableState.Never)]
         public static readonly BindableProperty RelativeLineHeightProperty = BindableProperty.Create(nameof(RelativeLineHeight), typeof(float), typeof(TextLabel), default(float), propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) =>
@@ -454,23 +360,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -537,23 +435,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(textLabel.SwigCPtr, TextLabel.Property.EMBOSS, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EMBOSS, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.EMBOSS);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EMBOSS).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -591,13 +481,8 @@ namespace Tizen.NUI.BaseComponents
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.PixelSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.PixelSize).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -606,23 +491,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -631,23 +508,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return (EllipsisPosition)Object.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition).Get(out temp);
-            return (EllipsisPosition)temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -656,23 +525,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -681,25 +542,16 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_2
+
             temp = Object.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode).Get(out temp) == false)
-            {
-                NUILog.Error("AutoScrollStopMode get error!");
-            }
-#endif
             return temp.GetValueByDescription<AutoScrollStopMode>();
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
@@ -709,26 +561,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.LineWrapMode, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineWrapMode, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return (LineWrapMode)Object.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.LineWrapMode);
-#else
-            int temp;
-            if (false == Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineWrapMode).Get(out temp))
-            {
-                NUILog.Error("LineWrapMode get error!");
-            }
-            return (LineWrapMode)temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -737,23 +578,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return (VerticalLineAlignment)Object.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment).Get(out temp);
-            return (VerticalLineAlignment)temp;
-#endif
         }));
         /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -762,23 +595,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection).Get(out temp);
-            return temp;
-#endif
         }));
         /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -787,23 +612,15 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing);
-#else
-            float temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing).Get(out temp);
-            return temp;
-#endif
         }));
         /// Only for XAML. No need of public API. Make hidden as inhouse API.
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -830,24 +647,16 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.MinLineSize, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MinLineSize, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
                 textLabel.RequestLayout();
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.MinLineSize);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MinLineSize).Get(out temp);
-            return temp;
-#endif        
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -856,28 +665,13 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
-                Object.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.FontSizeScale, (float)newValue);
-                textLabel.RequestLayout();
-#else
-                using (var property = new Tizen.NUI.PropertyValue((float)newValue))
-                {
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.FontSizeScale, property);
-                    textLabel.RequestLayout();
-                }
-#endif                
+                textLabel.InternalFontSizeScale = (float)newValue;
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
-            return Object.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.FontSizeScale);
-#else
-            float temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.FontSizeScale).Get(out temp);
-            return temp;
-#endif
+            return textLabel.InternalFontSizeScale;
         }));
 
         [EditorBrowsable(EditorBrowsableState.Never)]
@@ -886,28 +680,16 @@ namespace Tizen.NUI.BaseComponents
             var textLabel = (TextLabel)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale, (bool)newValue);
                 textLabel.RequestLayout();
-#else
-                using (var property = new Tizen.NUI.PropertyValue((bool)newValue))
-                {
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale, property);
-                    textLabel.RequestLayout();
-                }
-#endif                
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var textLabel = (TextLabel)bindable;
-#if NUI_PROPERTY_CHANGE_2
+
             return Object.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale);
-#else
-            bool temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1117,11 +899,8 @@ namespace Tizen.NUI.BaseComponents
         {
             if (value != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(SwigCPtr, TextLabel.Property.TEXT, value);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.TEXT, new Tizen.NUI.PropertyValue(value));
-#endif
                 RequestLayout();
             }
         }
@@ -1130,11 +909,8 @@ namespace Tizen.NUI.BaseComponents
         {
             if (value != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyString(SwigCPtr, TextLabel.Property.FontFamily, value);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.FontFamily, new Tizen.NUI.PropertyValue(value));
-#endif
                 RequestLayout();
             }
         }
@@ -1143,11 +919,8 @@ namespace Tizen.NUI.BaseComponents
         {
             if (value != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyVector4(SwigCPtr, TextLabel.Property.TextColor, value.SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.TextColor, new Tizen.NUI.PropertyValue(value));
-#endif
             }
         }
 
@@ -1155,11 +928,8 @@ namespace Tizen.NUI.BaseComponents
         {
             if (value != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(SwigCPtr, TextLabel.Property.PointSize, (float)value);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.PointSize, new Tizen.NUI.PropertyValue((float)value));
-#endif
                 RequestLayout();
             }
         }
@@ -1168,11 +938,8 @@ namespace Tizen.NUI.BaseComponents
         {
             if (value != null)
             {
-#if NUI_PROPERTY_CHANGE_2
+
                 Object.InternalSetPropertyFloat(SwigCPtr, TextLabel.Property.PixelSize, (float)value);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.PixelSize, new Tizen.NUI.PropertyValue((float)value));
-#endif
                 RequestLayout();
             }
         }
index 143fa91..30c584d 100755 (executable)
@@ -82,11 +82,7 @@ namespace Tizen.NUI.BaseComponents
         private bool dispatchTouchEvents = true;
         private bool dispatchGestureEvents = true;
         private bool dispatchParentGestureEvents = true;
-
-#if NUI_PROPERTY_CHANGE_1
         private string internalName = string.Empty;
-#endif
-#if NUI_PROPERTY_CHANGE_3
         private Position internalCurrentParentOrigin = null;
         private Position internalCurrentAnchorPoint = null;
         private Vector3 internalTargetSize = null;
@@ -98,10 +94,7 @@ namespace Tizen.NUI.BaseComponents
         private Vector3 internalCurrentWorldScale = null;
         private Vector4 internalCurrentColor = null;
         private Vector4 internalCurrentWorldColor = null;
-#endif
-#if NUI_VISUAL_PROPERTY_CHANGE_1
         private Vector2 internalCurrentScreenPosition = null;
-#endif
 
         static View()
         {
@@ -1356,6 +1349,23 @@ namespace Tizen.NUI.BaseComponents
         }
 
         /// <summary>
+        /// Retrieves the screen position and size of the view.<br />
+        /// </summary>
+        /// <remarks>
+        /// The float type Rectangle class is not ready yet.
+        /// Therefore, it transmits data in Vector4 class.
+        /// This type should later be changed to the appropriate data type.
+        /// </remarks>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public Vector4 ScreenPositionSize
+        {
+            get
+            {
+                return GetCurrentScreenPositionSize();
+            }
+        }
+
+        /// <summary>
         /// Determines whether the pivot point should be used to determine the position of the view.
         /// This is false by default.
         /// </summary>
@@ -1403,25 +1413,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return Object.InternalGetPropertyBool(SwigCPtr, View.Property.PositionUsesAnchorPoint);
-#else
-                bool temp = false;
-                var pValue = GetProperty(View.Property.PositionUsesAnchorPoint);
-                pValue.Get(out temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
             set
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(SwigCPtr, View.Property.PositionUsesAnchorPoint, value);
-#else
-                var temp = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.PositionUsesAnchorPoint, temp);
-                temp.Dispose();
-#endif
                 NotifyPropertyChanged();
             }
         }
@@ -1743,15 +1739,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return GetCurrentWorldPosition();
-#else
-                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
-                var pValue = GetProperty(View.Property.WorldPosition);
-                pValue.Get(temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
         }
 
@@ -1920,15 +1908,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return GetCurrentWorldScale();
-#else
-                Vector3 temp = new Vector3(0.0f, 0.0f, 0.0f);
-                var pValue = GetProperty(View.Property.WorldScale);
-                pValue.Get(temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
         }
 
@@ -1952,15 +1932,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return Object.InternalGetPropertyBool(SwigCPtr, View.Property.VISIBLE);
-#else
-                bool temp = false;
-                var pValue = GetProperty(View.Property.VISIBLE);
-                pValue.Get(out temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
         }
 
@@ -1972,15 +1944,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return GetCurrentWorldColor();
-#else
-                Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-                var pValue = GetProperty(View.Property.WorldColor);
-                pValue.Get(temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
         }
 
@@ -2441,27 +2405,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return GetCurrentAnchorPoint();
-#else
-                Position temp = new Position(0.0f, 0.0f, 0.0f);
-                var pValue = GetProperty(View.Property.AnchorPoint);
-                pValue.Get(temp);
-                pValue.Dispose();
-                Position ret = new Position(OnAnchorPointChanged, temp.X, temp.Y, temp.Z);
-                temp.Dispose();
-                return ret;
-#endif
             }
             set
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 SetAnchorPoint(value);
-#else
-                var temp = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.AnchorPoint, temp);
-                temp.Dispose();
-#endif
                 NotifyPropertyChanged();
             }
         }
@@ -3126,16 +3074,7 @@ namespace Tizen.NUI.BaseComponents
             {
                 backgroundImageSynchronousLoading = value;
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 if (!string.IsNullOrEmpty(BackgroundImage))
-#else
-                string bgUrl = null;
-                var pValue = Background.Find(ImageVisualProperty.URL);
-                pValue?.Get(out bgUrl);
-                pValue?.Dispose();
-
-                if (!string.IsNullOrEmpty(bgUrl))
-#endif
                 {
                     PropertyMap bgMap = this.Background;
                     var temp = new PropertyValue(backgroundImageSynchronousLoading);
@@ -3264,25 +3203,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return Object.InternalGetPropertyBool(SwigCPtr, View.Property.CaptureAllTouchAfterStart);
-#else
-                bool temp = false;
-                var pValue = GetProperty(View.Property.CaptureAllTouchAfterStart);
-                pValue.Get(out temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
             set
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(SwigCPtr, View.Property.CaptureAllTouchAfterStart, value);
-#else
-                var temp = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.CaptureAllTouchAfterStart, temp);
-                temp.Dispose();
-#endif
                 NotifyPropertyChanged();
             }
         }
@@ -3308,25 +3233,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return Object.InternalGetPropertyBool(SwigCPtr, View.Property.AllowOnlyOwnTouch);
-#else
-                bool temp = false;
-                var pValue = GetProperty(View.Property.AllowOnlyOwnTouch);
-                pValue.Get(out temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
             set
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(SwigCPtr, View.Property.AllowOnlyOwnTouch, value);
-#else
-                var temp = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.AllowOnlyOwnTouch, temp);
-                temp.Dispose();
-#endif
                 NotifyPropertyChanged();
             }
         }
@@ -3353,25 +3264,11 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return (BlendEquationType)Object.InternalGetPropertyInt(SwigCPtr, View.Property.BlendEquation);
-#else
-                int temp = 0;
-                var pValue = GetProperty(View.Property.BlendEquation);
-                pValue.Get(out temp);
-                pValue.Dispose();
-                return (BlendEquationType)temp;
-#endif
             }
             set
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyInt(SwigCPtr, View.Property.BlendEquation, (int)value);
-#else
-                var temp = new Tizen.NUI.PropertyValue((int)value);
-                SetProperty(View.Property.BlendEquation, temp);
-                temp.Dispose();
-#endif
                 NotifyPropertyChanged();
             }
         }
@@ -3481,15 +3378,7 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 return Object.InternalGetPropertyBool(SwigCPtr, View.Property.Culled);
-#else
-                bool temp = false;
-                var pValue = GetProperty(View.Property.Culled);
-                pValue.Get(out temp);
-                pValue.Dispose();
-                return temp;
-#endif
             }
         }
 
index b0b4a66..eae077f 100755 (executable)
@@ -369,9 +369,8 @@ namespace Tizen.NUI.BaseComponents
                 return;
             }
 
-#if NUI_PROPERTY_CHANGE_1
             internalName = null;
-#endif            
+
             if (disposing == false)
             {
                 if (IsNativeHandleInvalid() || SwigCMemOwn == false)
index 753c85e..173ea4b 100755 (executable)
@@ -40,11 +40,9 @@ namespace Tizen.NUI.BaseComponents
             if (newValue != null)
             {
                 string styleName = (string)newValue;
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyString(view.SwigCPtr, View.Property.StyleName, styleName);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.StyleName, new Tizen.NUI.PropertyValue(styleName));
-#endif
+
                 view.styleName = styleName;
 
                 if (string.IsNullOrEmpty(styleName)) return;
@@ -63,13 +61,7 @@ namespace Tizen.NUI.BaseComponents
 
             if (!string.IsNullOrEmpty(view.styleName)) return view.styleName;
 
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyString(view.SwigCPtr, View.Property.StyleName);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.StyleName).Get(out temp);
-            return temp;
-#endif            
         }));
 
         /// <summary>
@@ -81,23 +73,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.KeyInputFocus, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.KeyInputFocus, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif                
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.KeyInputFocus);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.KeyInputFocus).Get(out temp);
-            return temp;
-#endif            
         }));
 
         /// <summary>
@@ -130,25 +112,12 @@ namespace Tizen.NUI.BaseComponents
                     view.internalBackgroundColor = new Color(view.OnBackgroundColorChanged, 0, 0, 0, 0);
                 }
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 int visualType = (int)Visual.Type.Invalid;
                 Interop.View.InternalRetrievingVisualPropertyInt(view.SwigCPtr, Property.BACKGROUND, Visual.Property.Type, out visualType);
                 if (visualType == (int)Visual.Type.Color)
                 {
                     Interop.View.InternalRetrievingVisualPropertyVector4(view.SwigCPtr, Property.BACKGROUND, ColorVisualProperty.MixColor, Color.getCPtr(view.internalBackgroundColor));
                 }
-#else
-                PropertyMap background = view.Background;
-                int visualType = 0;
-                background.Find(Visual.Property.Type)?.Get(out visualType);
-                if (visualType == (int)Visual.Type.Color)
-                {
-                    background.Find(ColorVisualProperty.MixColor)?.Get(view.internalBackgroundColor);
-                }
-
-                background?.Dispose();
-                background = null;
-#endif
                 return view.internalBackgroundColor;
             }
         );
@@ -177,23 +146,12 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
-                if (view.internalColor == null)
-                {
-                    view.internalColor = new Color(view.OnColorChanged, 0, 0, 0, 0);
-                }
-                Object.InternalRetrievingPropertyVector4(view.SwigCPtr, View.Property.COLOR, view.internalColor.SwigCPtr);
-#else
-                var tmpProperty = view.GetProperty(View.Property.COLOR);
 
                 if (view.internalColor == null)
                 {
                     view.internalColor = new Color(view.OnColorChanged, 0, 0, 0, 0);
                 }
-
-                tmpProperty?.Get(view.internalColor);
-                tmpProperty?.Dispose();
-#endif
+                Object.InternalRetrievingPropertyVector4(view.SwigCPtr, View.Property.COLOR, view.internalColor.SwigCPtr);
                 return view.internalColor;
             }
         );
@@ -211,13 +169,8 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
                 return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.ColorRed);
-#else
-                float temp = 0.0f;
-                Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ColorRed).Get(out temp);
-                return temp;
-#endif                
             }
         );
 
@@ -234,13 +187,8 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
                 return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.ColorGreen);
-#else
-                float temp = 0.0f;
-                Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ColorGreen).Get(out temp);
-                return temp;
-#endif                
             }
         );
 
@@ -257,13 +205,8 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
                 return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.ColorBlue);
-#else
-                float temp = 0.0f;
-                Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ColorBlue).Get(out temp);
-                return temp;
-#endif
             }
         );
 
@@ -295,15 +238,7 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 string backgroundImage = "";
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
                 Interop.View.InternalRetrievingVisualPropertyString(view.SwigCPtr, Property.BACKGROUND, ImageVisualProperty.URL, out backgroundImage);
-#else
-                PropertyMap background = view.Background;
-                background.Find(ImageVisualProperty.URL)?.Get(out backgroundImage);
-
-                background.Dispose();
-                background = null;
-#endif
 
                 return backgroundImage;
             }
@@ -375,25 +310,14 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.STATE, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.STATE, new Tizen.NUI.PropertyValue((int)newValue));
-#endif                
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
             int temp = 0;
-#if NUI_PROPERTY_CHANGE_1
             temp = Object.InternalGetPropertyInt(view.SwigCPtr, View.Property.STATE);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.STATE).Get(out temp) == false)
-            {
-                NUILog.Error("State get error!");
-            }
-#endif            
             switch (temp)
             {
                 case 0: return States.Normal;
@@ -414,25 +338,14 @@ namespace Tizen.NUI.BaseComponents
             if (newValue != null)
             {
                 valueToString = ((States)newValue).GetDescription();
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyString(view.SwigCPtr, View.Property.SubState, valueToString);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SubState, new Tizen.NUI.PropertyValue(valueToString));
-#endif                
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_1
             temp = Object.InternalGetPropertyString(view.SwigCPtr, View.Property.SubState);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SubState).Get(out temp) == false)
-            {
-                NUILog.Error("subState get error!");
-            }
-#endif            
             return temp.GetValueByDescription<States>();
         }));
 
@@ -465,23 +378,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, FlexContainer.ChildProperty.FLEX, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, FlexContainer.ChildProperty.FLEX, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, FlexContainer.ChildProperty.FLEX);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, FlexContainer.ChildProperty.FLEX).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -493,23 +396,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyInt(view.SwigCPtr, FlexContainer.ChildProperty.AlignSelf, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, FlexContainer.ChildProperty.AlignSelf, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyInt(view.SwigCPtr, FlexContainer.ChildProperty.AlignSelf);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, FlexContainer.ChildProperty.AlignSelf).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -521,22 +414,14 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyVector4(view.SwigCPtr, FlexContainer.ChildProperty.FlexMargin, ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, FlexContainer.ChildProperty.FlexMargin, new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
             Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-#if NUI_PROPERTY_CHANGE_1
             Object.InternalRetrievingPropertyVector4(view.SwigCPtr, FlexContainer.ChildProperty.FlexMargin, temp.SwigCPtr);
-#else
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, FlexContainer.ChildProperty.FlexMargin).Get(temp);
-#endif
             return temp;
         }));
 
@@ -550,34 +435,17 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 if (newValue != null)
                 {
-#if NUI_PROPERTY_CHANGE_1
                     Object.InternalSetPropertyVector2(view.SwigCPtr, TableView.ChildProperty.CellIndex, ((Vector2)newValue).SwigCPtr);
-#else
-                    var tmp = new PropertyValue((Vector2)newValue);
-                    Object.SetProperty(view.SwigCPtr, TableView.ChildProperty.CellIndex, tmp);
-                    tmp.Dispose();
-#endif
                 }
             },
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 if (view.internalCellIndex == null)
                 {
                     view.internalCellIndex = new Vector2(view.OnCellIndexChanged, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector2(view.SwigCPtr, TableView.ChildProperty.CellIndex, view.internalCellIndex.SwigCPtr);
-#else
-                if (view.internalCellIndex == null)
-                {
-                    view.internalCellIndex = new Vector2(view.OnCellIndexChanged, 0, 0);
-                }
-
-                var tmp = Object.GetProperty(view.SwigCPtr, TableView.ChildProperty.CellIndex);
-                tmp?.Get(view.internalCellIndex);
-                tmp?.Dispose();
-#endif
                 return view.internalCellIndex;
             }
         );
@@ -591,23 +459,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, TableView.ChildProperty.RowSpan, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.RowSpan, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, TableView.ChildProperty.RowSpan);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.RowSpan).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -619,23 +477,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, TableView.ChildProperty.ColumnSpan, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.ColumnSpan, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, TableView.ChildProperty.ColumnSpan);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.ColumnSpan).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -650,25 +498,14 @@ namespace Tizen.NUI.BaseComponents
             if (newValue != null)
             {
                 valueToString = ((HorizontalAlignmentType)newValue).GetDescription();
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyString(view.SwigCPtr, TableView.ChildProperty.CellHorizontalAlignment, valueToString);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.CellHorizontalAlignment, new Tizen.NUI.PropertyValue(valueToString));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_1
             temp = Object.InternalGetPropertyString(view.SwigCPtr, TableView.ChildProperty.CellHorizontalAlignment);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.CellHorizontalAlignment).Get(out temp) == false)
-            {
-                NUILog.Error("CellHorizontalAlignment get error!");
-            }
-#endif
             return temp.GetValueByDescription<HorizontalAlignmentType>();
         }));
 
@@ -684,25 +521,14 @@ namespace Tizen.NUI.BaseComponents
             if (newValue != null)
             {
                 valueToString = ((VerticalAlignmentType)newValue).GetDescription();
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyString(view.SwigCPtr, TableView.ChildProperty.CellVerticalAlignment, valueToString);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.CellVerticalAlignment, new Tizen.NUI.PropertyValue(valueToString));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_1
             temp = Object.InternalGetPropertyString(view.SwigCPtr, TableView.ChildProperty.CellVerticalAlignment);
-#else
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, TableView.ChildProperty.CellVerticalAlignment).Get(out temp);
-            {
-                NUILog.Error("CellVerticalAlignment get error!");
-            }
-#endif
             return temp.GetValueByDescription<VerticalAlignmentType>();
         }));
 
@@ -890,11 +716,8 @@ namespace Tizen.NUI.BaseComponents
                     view.userSizeWidth = ((Size2D)newValue).Width;
                     view.userSizeHeight = ((Size2D)newValue).Height;
 
-#if NUI_PROPERTY_CHANGE_1
                     Object.InternalSetPropertyVector2ActualVector3(view.SwigCPtr, View.Property.SIZE, ((Size2D)newValue).SwigCPtr);
-#else
-                    view.SetSize(((Size2D)newValue).Width, ((Size2D)newValue).Height, 0);
-#endif
+
                     view.widthPolicy = ((Size2D)newValue).Width;
                     view.heightPolicy = ((Size2D)newValue).Height;
 
@@ -904,33 +727,11 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 if (view.internalSize2D == null)
                 {
                     view.internalSize2D = new Size2D(view.OnSize2DChanged, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector2ActualVector3(view.SwigCPtr, View.Property.SIZE, view.internalSize2D.SwigCPtr);
-#else
-                var tmp = new Size(0, 0, 0);
-                var tmpProperty = Object.GetProperty(view.SwigCPtr, Property.SIZE);
-                tmpProperty?.Get(tmp);
-
-                if (view.internalSize2D == null)
-                {
-                    view.internalSize2D = new Size2D(view.OnSize2DChanged, (int)tmp?.Width, (int)tmp?.Height);
-                }
-                else
-                {
-                    if (view.internalSize2D.SwigCPtr.Handle != global::System.IntPtr.Zero)
-                    {
-                        Interop.Vector2.WidthSet(view.internalSize2D.SwigCPtr, (float)tmp?.Width);
-                        Interop.Vector2.HeightSet(view.internalSize2D.SwigCPtr, (float)tmp?.Height);
-                    }
-                }
-
-                tmpProperty?.Dispose();
-                tmp?.Dispose();
-#endif
                 return view.internalSize2D;
             }
         );
@@ -958,13 +759,7 @@ namespace Tizen.NUI.BaseComponents
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.OPACITY);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.OPACITY).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -977,43 +772,17 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 if (newValue != null)
                 {
-#if NUI_PROPERTY_CHANGE_1
                     Object.InternalSetPropertyVector2ActualVector3(view.SwigCPtr, View.Property.POSITION, ((Position2D)newValue).SwigCPtr);
-#else
-                    view.SetPosition(((Position2D)newValue).X, ((Position2D)newValue).Y, 0);
-#endif
                 }
             },
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 if (view.internalPosition2D == null)
                 {
                     view.internalPosition2D = new Position2D(view.OnPosition2DChanged, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector2ActualVector3(view.SwigCPtr, View.Property.POSITION, view.internalPosition2D.SwigCPtr);
-#else
-                var tmp = new Position(0, 0, 0);
-                var tmpProperty = Object.GetProperty(view.SwigCPtr, Property.POSITION);
-                tmpProperty?.Get(tmp);
-
-                if (view.internalPosition2D == null)
-                {
-                    view.internalPosition2D = new Position2D(view.OnPosition2DChanged, (int)tmp?.X, (int)tmp?.Y);
-                }
-                else
-                {
-                    if (view.internalPosition2D.SwigCPtr.Handle != IntPtr.Zero)
-                    {
-                        Interop.Vector2.XSet(view.internalPosition2D.SwigCPtr, (float)tmp?.X);
-                        Interop.Vector2.YSet(view.internalPosition2D.SwigCPtr, (float)tmp?.Y);
-                    }
-                }
-
-                tmpProperty?.Dispose();
-                tmp?.Dispose();
-#endif
                 return view.internalPosition2D;
             }
         );
@@ -1027,23 +796,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.PositionUsesAnchorPoint, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionUsesAnchorPoint, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.PositionUsesAnchorPoint);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionUsesAnchorPoint).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1104,23 +863,14 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyVector3(view.SwigCPtr, View.Property.ParentOrigin, ((Position)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ParentOrigin, new Tizen.NUI.PropertyValue((Position)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
             Position temp = new Position(0.0f, 0.0f, 0.0f);
-#if NUI_PROPERTY_CHANGE_1
             Object.InternalRetrievingPropertyVector3(view.SwigCPtr, View.Property.ParentOrigin, temp.SwigCPtr);
-#else
-
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ParentOrigin).Get(temp);
-#endif
             return temp;
         })
         );
@@ -1141,21 +891,11 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 if (view.internalPivotPoint == null)
                 {
                     view.internalPivotPoint = new Position(view.OnPivotPointChanged, 0, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector3(view.SwigCPtr, View.Property.AnchorPoint, view.internalPivotPoint.SwigCPtr);
-#else
-                if (view.internalPivotPoint == null)
-                {
-                    view.internalPivotPoint = new Position(view.OnPivotPointChanged, 0, 0, 0);
-                }
-                var tmp = Object.GetProperty(view.SwigCPtr, Property.AnchorPoint);
-                tmp?.Get(view.internalPivotPoint);
-                tmp?.Dispose();
-#endif
                 return view.internalPivotPoint;
             }
         );
@@ -1174,24 +914,14 @@ namespace Tizen.NUI.BaseComponents
                 // Size set by user is returned by GetUserSize2D() for SuggestedMinimumWidth/Height.
                 // SuggestedMinimumWidth/Height is used by Layout calculation.
                 view.userSizeWidth = (float)newValue;
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.SizeWidth, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeWidth, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
                 view.WidthSpecification = (int)System.Math.Ceiling((float)newValue);
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.SizeWidth);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeWidth).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1208,24 +938,14 @@ namespace Tizen.NUI.BaseComponents
                 // Size set by user is returned by GetUserSize2D() for SuggestedMinimumWidth/Height.
                 // SuggestedMinimumWidth/Height is used by Layout calculation.
                 view.userSizeHeight = (float)newValue;
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.SizeHeight, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeHeight, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
                 view.HeightSpecification = (int)System.Math.Ceiling((float)newValue);
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.SizeHeight);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeHeight).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1238,32 +958,17 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 if (newValue != null)
                 {
-#if NUI_PROPERTY_CHANGE_1
                     Object.InternalSetPropertyVector3(view.SwigCPtr, View.Property.POSITION, ((Position)newValue).SwigCPtr);
-#else
-                    view.SetPosition(((Position)newValue).X, ((Position)newValue).Y, ((Position)newValue).Z);
-#endif
                 }
             },
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 if (view.internalPosition == null)
                 {
                     view.internalPosition = new Position(view.OnPositionChanged, 0, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector3(view.SwigCPtr, View.Property.POSITION, view.internalPosition.SwigCPtr);
-#else
-                var tmpProperty = Object.GetProperty(view.SwigCPtr, Property.POSITION);
-
-                if (view.internalPosition == null)
-                {
-                    view.internalPosition = new Position(view.OnPositionChanged, 0, 0, 0);
-                }
-                tmpProperty?.Get(view.internalPosition);
-                tmpProperty?.Dispose();
-#endif
                 return view.internalPosition;
             }
         );
@@ -1277,23 +982,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.PositionX, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionX, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.PositionX);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionX).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1305,23 +1000,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.PositionY, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionY, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.PositionY);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionY).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1333,23 +1018,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.PositionZ, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionZ, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.PositionZ);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.PositionZ).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1388,22 +1063,11 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 if (view.internalScale == null)
                 {
                     view.internalScale = new Vector3(view.OnScaleChanged, 0, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector3(view.SwigCPtr, View.Property.SCALE, view.internalScale.SwigCPtr);
-#else
-                if (view.internalScale == null)
-                {
-                    view.internalScale = new Vector3(view.OnScaleChanged, 0, 0, 0);
-                }
-
-                var tmpPropery = Object.GetProperty(view.SwigCPtr, Property.SCALE);
-                tmpPropery?.Get(view.internalScale);
-                tmpPropery?.Dispose();
-#endif
                 return view.internalScale;
             }
         );
@@ -1417,23 +1081,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.ScaleX, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ScaleX, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.ScaleX);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ScaleX).Get(out temp);
-            return temp;
-#endif        
         }));
 
         /// <summary>
@@ -1445,23 +1099,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.ScaleY, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ScaleY, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.ScaleY);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ScaleY).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1473,23 +1117,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyFloat(view.SwigCPtr, View.Property.ScaleZ, (float)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ScaleZ, new Tizen.NUI.PropertyValue((float)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyFloat(view.SwigCPtr, View.Property.ScaleZ);
-#else
-            float temp = 0.0f;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ScaleZ).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1502,24 +1136,14 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 if (newValue != null)
                 {
-#if NUI_PROPERTY_CHANGE_1
                     view.internalName = (string)newValue;
                     Object.InternalSetPropertyString(view.SwigCPtr, View.Property.NAME, (string)newValue);
-#else
-                    view.SetName((string)newValue);
-#endif                    
                 }
             },
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 return view.internalName;
-#else
-                string temp;
-                temp = view.GetName();
-                return temp;
-#endif
             }
         );
 
@@ -1532,23 +1156,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.SENSITIVE, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SENSITIVE, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.SENSITIVE);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SENSITIVE).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1560,24 +1174,14 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.UserInteractionEnabled, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.UserInteractionEnabled, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
                 view.OnEnabled((bool)newValue);
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.UserInteractionEnabled);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.UserInteractionEnabled).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1589,23 +1193,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.DispatchKeyEvents, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.DispatchKeyEvents, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.DispatchKeyEvents);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.DispatchKeyEvents).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1617,23 +1211,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.LeaveRequired, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.LeaveRequired, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.LeaveRequired);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.LeaveRequired).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1645,23 +1229,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.InheritOrientation, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritOrientation, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.InheritOrientation);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritOrientation).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1673,23 +1247,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.InheritScale, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritScale, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.InheritScale);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritScale).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1701,26 +1265,13 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.DrawMode, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.DrawMode, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
             return (DrawModeType)Object.InternalGetPropertyInt(view.SwigCPtr, View.Property.DrawMode);
-#else
-            int temp;
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.DrawMode).Get(out temp) == false)
-            {
-                NUILog.Error("DrawMode get error!");
-            }
-            return (DrawModeType)temp;
-#endif
         }));
 
         /// <summary>
@@ -1733,33 +1284,17 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 if (newValue != null)
                 {
-#if NUI_PROPERTY_CHANGE_1
                     Object.InternalSetPropertyVector3(view.SwigCPtr, View.Property.SizeModeFactor, ((Vector3)newValue).SwigCPtr);
-#else
-                    var tmp = new PropertyValue((Vector3)newValue);
-                    Object.SetProperty(view.SwigCPtr, Property.SizeModeFactor, tmp);
-                    tmp?.Dispose();
-#endif
                 }
             },
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
                 if (view.internalSizeModeFactor == null)
                 {
                     view.internalSizeModeFactor = new Vector3(view.OnSizeModeFactorChanged, 0, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector3(view.SwigCPtr, View.Property.SizeModeFactor, view.internalSizeModeFactor.SwigCPtr);
-#else
-                if (view.internalSizeModeFactor == null)
-                {
-                    view.internalSizeModeFactor = new Vector3(view.OnSizeModeFactorChanged, 0, 0, 0);
-                }
-                var tmp = Object.GetProperty(view.SwigCPtr, Property.SizeModeFactor);
-                tmp?.Get(view.internalSizeModeFactor);
-                tmp?.Dispose();
-#endif
                 return view.internalSizeModeFactor;
             }
         );
@@ -1780,22 +1315,15 @@ namespace Tizen.NUI.BaseComponents
                         view.widthConstraint = new EqualConstraintWithParentFloat((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeWidth, View.Property.SizeWidth);
                         view.widthConstraint.Apply();
                     }
-#if NUI_PROPERTY_CHANGE_1
                     Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.WidthResizePolicy, (int)ResizePolicyType.FillToParent);
-#else
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.WidthResizePolicy, new Tizen.NUI.PropertyValue((int)ResizePolicyType.FillToParent));
-#endif
                 }
                 else
                 {
                     view.widthConstraint?.Remove();
                     view.widthConstraint?.Dispose();
                     view.widthConstraint = null;
-#if NUI_PROPERTY_CHANGE_1
+
                     Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.WidthResizePolicy, (int)newValue);
-#else
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.WidthResizePolicy, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
                 }
                 // Match ResizePolicy to new Layouting.
                 // Parent relative policies can not be mapped at this point as parent size unknown.
@@ -1825,14 +1353,8 @@ namespace Tizen.NUI.BaseComponents
         {
             var view = (View)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_1
+
             temp = Object.InternalGetPropertyString(view.SwigCPtr, View.Property.WidthResizePolicy);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.WidthResizePolicy).Get(out temp) == false)
-            {
-                NUILog.Error("WidthResizePolicy get error!");
-            }
-#endif
             return temp.GetValueByDescription<ResizePolicyType>();
         }));
 
@@ -1852,22 +1374,16 @@ namespace Tizen.NUI.BaseComponents
                         view.heightConstraint = new EqualConstraintWithParentFloat((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeHeight, View.Property.SizeHeight);
                         view.heightConstraint.Apply();
                     }
-#if NUI_PROPERTY_CHANGE_1
+
                     Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.HeightResizePolicy, (int)ResizePolicyType.FillToParent);
-#else
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.HeightResizePolicy, new Tizen.NUI.PropertyValue((int)ResizePolicyType.FillToParent));
-#endif
                 }
                 else
                 {
                     view.heightConstraint?.Remove();
                     view.heightConstraint?.Dispose();
                     view.heightConstraint = null;
-#if NUI_PROPERTY_CHANGE_1
+
                     Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.HeightResizePolicy, (int)newValue);
-#else
-                    Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.HeightResizePolicy, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
                 }
                 // Match ResizePolicy to new Layouting.
                 // Parent relative policies can not be mapped at this point as parent size unknown.
@@ -1897,14 +1413,8 @@ namespace Tizen.NUI.BaseComponents
         {
             var view = (View)bindable;
             string temp;
-#if NUI_PROPERTY_CHANGE_1
+
             temp = Object.InternalGetPropertyString(view.SwigCPtr, View.Property.HeightResizePolicy);
-#else
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.HeightResizePolicy).Get(out temp) == false)
-            {
-                NUILog.Error("HeightResizePolicy get error!");
-            }
-#endif
             return temp.GetValueByDescription<ResizePolicyType>();
         }));
 
@@ -1919,26 +1429,15 @@ namespace Tizen.NUI.BaseComponents
             if (newValue != null)
             {
                 valueToString = ((SizeScalePolicyType)newValue).GetDescription();
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyString(view.SwigCPtr, View.Property.SizeScalePolicy, valueToString);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeScalePolicy, new Tizen.NUI.PropertyValue(valueToString));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return (SizeScalePolicyType)Object.InternalGetPropertyInt(view.SwigCPtr, View.Property.SizeScalePolicy);
-#else
-            int temp;
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.SizeScalePolicy).Get(out temp) == false)
-            {
-                NUILog.Error("SizeScalePolicy get error!");
-            }
-            return (SizeScalePolicyType)temp;
-#endif
         }));
 
         /// <summary>
@@ -1950,23 +1449,14 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.WidthForHeight, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.WidthForHeight, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.WidthForHeight);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.WidthForHeight).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -1978,23 +1468,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.HeightForWidth, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.HeightForWidth, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.HeightForWidth);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.HeightForWidth).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -2084,21 +1566,12 @@ namespace Tizen.NUI.BaseComponents
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
                 if (view.internalSize == null)
                 {
                     view.internalSize = new Size(view.OnSizeChanged, 0, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector3(view.SwigCPtr, View.Property.SIZE, view.internalSize.SwigCPtr);
-#else
-                var tmpProperty = Object.GetProperty(view.SwigCPtr, Property.SIZE);
-                if (view.internalSize == null)
-                {
-                    view.internalSize = new Size(view.OnSizeChanged, 0, 0, 0);
-                }
-                tmpProperty?.Get(view.internalSize);
-                tmpProperty?.Dispose();
-#endif
                 return view.internalSize;
             }
         );
@@ -2113,32 +1586,19 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 if (newValue != null)
                 {
-#if NUI_PROPERTY_CHANGE_1
+
                     Object.InternalSetPropertyVector2(view.SwigCPtr, View.Property.MinimumSize, ((Size2D)newValue).SwigCPtr);
-#else
-                    view.SetMinimumSize((Size2D)newValue);
-#endif                    
                 }
             },
             defaultValueCreator: (bindable) =>
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 var view = (View)bindable;
                 if (view.internalMinimumSize == null)
                 {
                     view.internalMinimumSize = new Size2D(view.OnMinimumSizeChanged, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector2(view.SwigCPtr, View.Property.MinimumSize, view.internalMinimumSize.SwigCPtr);
-#else
-                var view = (View)bindable;
-                if (view.internalMinimumSize == null)
-                {
-                    view.internalMinimumSize = new Size2D(view.OnMinimumSizeChanged, 0, 0);
-                }
-                var tmp = Object.GetProperty(view.SwigCPtr, Property.MinimumSize);
-                tmp?.Get(view.internalMinimumSize);
-                tmp?.Dispose();
-#endif
                 return view.internalMinimumSize;
             }
         );
@@ -2153,32 +1613,19 @@ namespace Tizen.NUI.BaseComponents
                 var view = (View)bindable;
                 if (newValue != null)
                 {
-#if NUI_PROPERTY_CHANGE_1
+
                     Object.InternalSetPropertyVector2(view.SwigCPtr, View.Property.MaximumSize, ((Size2D)newValue).SwigCPtr);
-#else
-                    view.SetMaximumSize((Size2D)newValue);
-#endif                    
                 }
             },
             defaultValueCreator: (bindable) =>
             {
                 var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
                 if (view.internalMaximumSize == null)
                 {
                     view.internalMaximumSize = new Size2D(view.OnMaximumSizeChanged, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector2(view.SwigCPtr, View.Property.MaximumSize, view.internalMaximumSize.SwigCPtr);
-#else
-                if (view.internalMaximumSize == null)
-                {
-                    view.internalMaximumSize = new Size2D(view.OnMaximumSizeChanged, 0, 0);
-                }
-
-                var tmp = Object.GetProperty(view.SwigCPtr, Property.MaximumSize);
-                tmp?.Get(view.internalMaximumSize);
-                tmp?.Dispose();
-#endif
                 return view.internalMaximumSize;
             }
         );
@@ -2192,23 +1639,14 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.InheritPosition, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritPosition, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.InheritPosition);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritPosition).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -2220,26 +1658,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.ClippingMode, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ClippingMode, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return (ClippingModeType)Object.InternalGetPropertyInt(view.SwigCPtr, View.Property.ClippingMode);
-#else
-            int temp = 0;
-            if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.ClippingMode).Get(out temp) == false)
-            {
-                NUILog.Error("ClippingMode get error!");
-            }
-            return (ClippingModeType)temp;
-#endif
         }));
 
         /// <summary>
@@ -2251,23 +1678,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.InheritLayoutDirection, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritLayoutDirection, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.InheritLayoutDirection);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.InheritLayoutDirection).Get(out temp);
-            return temp;
-#endif
         }));
 
         /// <summary>
@@ -2279,26 +1698,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.LayoutDirection, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.LayoutDirection, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return (ViewLayoutDirectionType)Object.InternalGetPropertyInt(view.SwigCPtr, View.Property.LayoutDirection);
-#else
-            int temp;
-            if (false == Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.LayoutDirection).Get(out temp))
-            {
-                NUILog.Error("LAYOUT_DIRECTION get error!");
-            }
-            return (ViewLayoutDirectionType)temp;
-#endif
         }));
 
         /// <summary>
@@ -2370,22 +1778,16 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyVector4(view.SwigCPtr, Interop.ActorProperty.UpdateAreaHintGet(), ((Vector4)newValue).SwigCPtr);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, Interop.ActorProperty.UpdateAreaHintGet(), new Tizen.NUI.PropertyValue((Vector4)newValue));
-#endif
             }
         }),
         defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) =>
         {
             var view = (View)bindable;
             Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f);
-#if NUI_PROPERTY_CHANGE_1
+
             Object.InternalRetrievingPropertyVector4(view.SwigCPtr, Interop.ActorProperty.UpdateAreaHintGet(), temp.SwigCPtr);
-#else
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, Interop.ActorProperty.UpdateAreaHintGet()).Get(temp);
-#endif
             return temp;
         }));
 
@@ -2645,23 +2047,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyString(view.SwigCPtr, View.Property.AccessibilityName, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityName, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         },
         defaultValueCreator: (bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyString(view.SwigCPtr, View.Property.AccessibilityName);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityName).Get(out temp);
-            return temp;
-#endif
         });
 
         /// <summary>
@@ -2673,23 +2067,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyString(view.SwigCPtr, View.Property.AccessibilityDescription, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityDescription, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         },
         defaultValueCreator: (bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyString(view.SwigCPtr, View.Property.AccessibilityDescription);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityDescription).Get(out temp);
-            return temp;
-#endif
         });
 
         /// <summary>
@@ -2701,23 +2087,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyString(view.SwigCPtr, View.Property.AccessibilityTranslationDomain, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityTranslationDomain, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         },
         defaultValueCreator: (bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyString(view.SwigCPtr, View.Property.AccessibilityTranslationDomain);
-#else
-            string temp;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityTranslationDomain).Get(out temp);
-            return temp;
-#endif
         });
 
         /// <summary>
@@ -2729,23 +2107,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyInt(view.SwigCPtr, View.Property.AccessibilityRole, (int)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityRole, new Tizen.NUI.PropertyValue((int)newValue));
-#endif
             }
         },
         defaultValueCreator: (bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return (Role)Object.InternalGetPropertyInt(view.SwigCPtr, View.Property.AccessibilityRole);
-#else
-            int temp = 0;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityRole).Get(out temp);
-            return (Role)temp;
-#endif
         });
 
         /// <summary>
@@ -2757,23 +2127,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.AccessibilityHighlightable, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityHighlightable, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         },
         defaultValueCreator: (bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.AccessibilityHighlightable);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityHighlightable).Get(out temp);
-            return temp;
-#endif
         });
 
         /// <summary>
@@ -2785,23 +2147,15 @@ namespace Tizen.NUI.BaseComponents
             var view = (View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyBool(view.SwigCPtr, View.Property.AccessibilityHidden, (bool)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityHidden, new Tizen.NUI.PropertyValue((bool)newValue));
-#endif
             }
         },
         defaultValueCreator: (bindable) =>
         {
             var view = (View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyBool(view.SwigCPtr, View.Property.AccessibilityHidden);
-#else
-            bool temp = false;
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)view.SwigCPtr, View.Property.AccessibilityHidden).Get(out temp);
-            return temp;
-#endif
         });
 
         /// <summary>
@@ -3120,23 +2474,15 @@ namespace Tizen.NUI.BaseComponents
             var instance = (Tizen.NUI.BaseComponents.View)bindable;
             if (newValue != null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyString(instance.SwigCPtr, View.Property.AutomationId, (string)newValue);
-#else
-                Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)instance.SwigCPtr, View.Property.AutomationId, new Tizen.NUI.PropertyValue((string)newValue));
-#endif
             }
         },
         defaultValueCreator: (bindable) =>
         {
             var instance = (Tizen.NUI.BaseComponents.View)bindable;
-#if NUI_PROPERTY_CHANGE_1
+
             return Object.InternalGetPropertyString(instance.SwigCPtr, View.Property.AutomationId);
-#else
-            string temp = "";
-            Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)instance.SwigCPtr, View.Property.AutomationId).Get(out temp);
-            return temp;
-#endif
         });
 
         /// <summary>
@@ -3184,15 +2530,9 @@ namespace Tizen.NUI.BaseComponents
 
             if (backgroundExtraData == null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyString(SwigCPtr, View.Property.BACKGROUND, value);
                 BackgroundImageSynchronousLoading = backgroundImageSynchronousLoading;
-#else
-                var propertyValue = new PropertyValue(value);
-                Object.SetProperty(SwigCPtr, Property.BACKGROUND, propertyValue);
-                BackgroundImageSynchronousLoading = backgroundImageSynchronousLoading;
-                propertyValue?.Dispose();
-#endif
                 return;
             }
 
@@ -3302,13 +2642,8 @@ namespace Tizen.NUI.BaseComponents
 
             if (backgroundExtraData == null)
             {
-#if NUI_PROPERTY_CHANGE_1
+
                 Object.InternalSetPropertyVector4(SwigCPtr, View.Property.BACKGROUND, ((Color)value).SwigCPtr);
-#else
-                var background = new PropertyValue(value);
-                Object.SetProperty(SwigCPtr, Property.BACKGROUND, background);
-                background?.Dispose();
-#endif
                 return;
             }
 
@@ -3365,12 +2700,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 return;
             }
-#if NUI_PROPERTY_CHANGE_1
+
             Object.InternalSetPropertyFloat(SwigCPtr, View.Property.ColorRed, (float)value);
-#else
-            using var propertyValue = new Tizen.NUI.PropertyValue((float)value);
-            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, View.Property.ColorRed, propertyValue);
-#endif
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -3381,12 +2712,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 return;
             }
-#if NUI_PROPERTY_CHANGE_1
+
             Object.InternalSetPropertyFloat(SwigCPtr, View.Property.ColorGreen, (float)value);
-#else
-            using var propertyValue = new Tizen.NUI.PropertyValue((float)value);
-            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, View.Property.ColorGreen, propertyValue);
-#endif
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -3397,12 +2724,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 return;
             }
-#if NUI_PROPERTY_CHANGE_1
+
             Object.InternalSetPropertyFloat(SwigCPtr, View.Property.ColorBlue, (float)value);
-#else
-            using var propertyValue = new Tizen.NUI.PropertyValue((float)value);
-            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, View.Property.ColorBlue, propertyValue);
-#endif
             if (NDalicPINVOKE.SWIGPendingException.Pending)
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
@@ -3413,11 +2736,8 @@ namespace Tizen.NUI.BaseComponents
             {
                 return;
             }
-#if NUI_PROPERTY_CHANGE_1
+
             Object.InternalSetPropertyFloat(SwigCPtr, View.Property.OPACITY, (float)value);
-#else
-            Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, View.Property.OPACITY, new Tizen.NUI.PropertyValue((float)value));
-#endif
         }
 
         private void SetShadow(ShadowBase value)
index d24362b..e47daf3 100755 (executable)
@@ -128,15 +128,8 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.WorldPositionX);
-#else
-                float returnValue = 0.0f;
-                PropertyValue wordPositionX = GetProperty(View.Property.WorldPositionX);
-                wordPositionX?.Get(out returnValue);
-                wordPositionX?.Dispose();
-                return returnValue;
-#endif                
             }
         }
 
@@ -144,15 +137,8 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.WorldPositionY);
-#else
-                float returnValue = 0.0f;
-                PropertyValue wordPositionY = GetProperty(View.Property.WorldPositionY);
-                wordPositionY?.Get(out returnValue);
-                wordPositionY?.Dispose();
-                return returnValue;
-#endif
             }
         }
 
@@ -160,15 +146,8 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.WorldPositionZ);
-#else
-                float returnValue = 0.0f;
-                PropertyValue wordPositionZ = GetProperty(View.Property.WorldPositionZ);
-                wordPositionZ?.Get(out returnValue);
-                wordPositionZ?.Dispose();
-                return returnValue;
-#endif
             }
         }
 
@@ -208,25 +187,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.ParentOriginX);
-#else
-                float returnValue = 0.0f;
-                PropertyValue parentOriginX = GetProperty(View.Property.ParentOriginX);
-                parentOriginX?.Get(out returnValue);
-                parentOriginX?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyFloat(SwigCPtr, View.Property.WorldPositionX, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.ParentOriginX, setValue);
-                setValue.Dispose();
-#endif
                 NotifyPropertyChanged();
             }
         }
@@ -235,26 +202,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.ParentOriginY);
-#else
-                float returnValue = 0.0f;
-                PropertyValue parentOriginY = GetProperty(View.Property.ParentOriginY);
-                parentOriginY?.Get(out returnValue);
-                parentOriginY?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
-                Object.InternalSetPropertyFloat(SwigCPtr, View.Property.ParentOriginY, value);
-#else
 
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.ParentOriginY, setValue);
-                setValue.Dispose();
-#endif
+                Object.InternalSetPropertyFloat(SwigCPtr, View.Property.ParentOriginY, value);
                 NotifyPropertyChanged();
             }
         }
@@ -263,25 +217,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.ParentOriginZ);
-#else
-                float returnValue = 0.0f;
-                PropertyValue parentOriginZ = GetProperty(View.Property.ParentOriginZ);
-                parentOriginZ?.Get(out returnValue);
-                parentOriginZ?.Dispose();
-                return returnValue;
-#endif            
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyFloat(SwigCPtr, View.Property.ParentOriginZ, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.ParentOriginZ, setValue);
-                setValue.Dispose();
-#endif
                 NotifyPropertyChanged();
             }
         }
@@ -290,25 +232,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.AnchorPointX);
-#else
-                float returnValue = 0.0f;
-                PropertyValue anchorPointX = GetProperty(View.Property.AnchorPointX);
-                anchorPointX?.Get(out returnValue);
-                anchorPointX?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyFloat(SwigCPtr, View.Property.AnchorPointX, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.AnchorPointX, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -316,26 +246,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
-                return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.AnchorPointY);
-#else
 
-                float returnValue = 0.0f;
-                PropertyValue anchorPointY = GetProperty(View.Property.AnchorPointY);
-                anchorPointY?.Get(out returnValue);
-                anchorPointY?.Dispose();
-                return returnValue;
-#endif
+                return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.AnchorPointY);
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyFloat(SwigCPtr, View.Property.AnchorPointY, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.AnchorPointY, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -343,25 +260,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyFloat(SwigCPtr, View.Property.AnchorPointZ);
-#else
-                float returnValue = 0.0f;
-                PropertyValue anchorPointZ = GetProperty(View.Property.AnchorPointZ);
-                anchorPointZ?.Get(out returnValue);
-                anchorPointZ?.Dispose();
-                return returnValue;
-#endif            
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyFloat(SwigCPtr, View.Property.AnchorPointZ, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.AnchorPointZ, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -425,25 +330,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyInt(SwigCPtr, View.Property.LeftFocusableViewId);
-#else
-                int returnValue = 0;
-                PropertyValue leftFocusableViewId = GetProperty(View.Property.LeftFocusableViewId);
-                leftFocusableViewId?.Get(out returnValue);
-                leftFocusableViewId?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyInt(SwigCPtr, View.Property.LeftFocusableViewId, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.LeftFocusableViewId, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -451,25 +344,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyInt(SwigCPtr, View.Property.RightFocusableViewId);
-#else
-                int returnValue = 0;
-                PropertyValue rightFocusableViewId = GetProperty(View.Property.RightFocusableViewId);
-                rightFocusableViewId?.Get(out returnValue);
-                rightFocusableViewId?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyInt(SwigCPtr, View.Property.RightFocusableViewId, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.RightFocusableViewId, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -477,25 +358,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyInt(SwigCPtr, View.Property.UpFocusableViewId);
-#else
-                int returnValue = 0;
-                PropertyValue upFocusableViewId = GetProperty(View.Property.UpFocusableViewId);
-                upFocusableViewId?.Get(out returnValue);
-                upFocusableViewId?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyInt(SwigCPtr, View.Property.UpFocusableViewId, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.UpFocusableViewId, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -503,25 +372,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyInt(SwigCPtr, View.Property.DownFocusableViewId);
-#else
-                int returnValue = 0;
-                PropertyValue downFocusableViewId = GetProperty(View.Property.DownFocusableViewId);
-                downFocusableViewId?.Get(out returnValue);
-                downFocusableViewId?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyInt(SwigCPtr, View.Property.DownFocusableViewId, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.DownFocusableViewId, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -529,25 +386,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyInt(SwigCPtr, View.Property.ClockwiseFocusableViewId);
-#else
-                int returnValue = -1;
-                PropertyValue clockwiseFocusableViewId = GetProperty(View.Property.ClockwiseFocusableViewId);
-                clockwiseFocusableViewId?.Get(out returnValue);
-                clockwiseFocusableViewId?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyInt(SwigCPtr, View.Property.ClockwiseFocusableViewId, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.ClockwiseFocusableViewId, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -555,25 +400,13 @@ namespace Tizen.NUI.BaseComponents
         {
             get
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 return Object.InternalGetPropertyInt(SwigCPtr, View.Property.CounterClockwiseFocusableViewId);
-#else
-                int returnValue = -1;
-                PropertyValue counterClockwiseFocusableViewId = GetProperty(View.Property.CounterClockwiseFocusableViewId);
-                counterClockwiseFocusableViewId?.Get(out returnValue);
-                counterClockwiseFocusableViewId?.Dispose();
-                return returnValue;
-#endif
             }
             set
             {
-#if NUI_PROPERTY_CHANGE_3
+
                 Object.InternalSetPropertyInt(SwigCPtr, View.Property.CounterClockwiseFocusableViewId, value);
-#else
-                PropertyValue setValue = new Tizen.NUI.PropertyValue(value);
-                SetProperty(View.Property.CounterClockwiseFocusableViewId, setValue);
-                setValue.Dispose();
-#endif
             }
         }
 
@@ -638,7 +471,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal Position GetCurrentParentOrigin()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentParentOrigin == null)
             {
                 internalCurrentParentOrigin = new Position(0, 0, 0);
@@ -651,13 +484,6 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentParentOrigin;
-#else
-            Position ret = new Position(Interop.ActorInternal.GetCurrentParentOrigin(SwigCPtr), true);
-
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif            
         }
 
         internal void SetAnchorPoint(Position anchorPoint)
@@ -669,7 +495,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal Position GetCurrentAnchorPoint()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentAnchorPoint == null)
             {
                 internalCurrentAnchorPoint = new Position(0, 0, 0);
@@ -682,12 +508,6 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentAnchorPoint;
-#else
-            Position ret = new Position(Interop.ActorInternal.GetCurrentAnchorPoint(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif            
         }
 
         internal void SetSize(float width, float height)
@@ -720,7 +540,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal Vector3 GetTargetSize()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalTargetSize == null)
             {
                 internalTargetSize = new Vector3(0, 0, 0);
@@ -733,17 +553,11 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalTargetSize;
-#else
-            Vector3 ret = new Vector3(Interop.ActorInternal.GetTargetSize(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
 
         internal Size2D GetCurrentSize()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentSize == null)
             {
                 internalCurrentSize = new Size2D(0, 0);
@@ -756,14 +570,6 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentSize;
-#else
-            Size ret = new Size(Interop.Actor.GetCurrentSize(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            Size2D size = new Size2D((int)ret.Width, (int)ret.Height);
-            ret.Dispose();
-            return size;
-#endif
         }
 
         internal Size2D GetCurrentSizeFloat()
@@ -816,7 +622,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal Position GetCurrentPosition()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentPosition == null)
             {
                 internalCurrentPosition = new Position(0, 0, 0);
@@ -829,17 +635,10 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentPosition;
-#else
-
-            Position ret = new Position(Interop.Actor.GetCurrentPosition(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
         internal Vector3 GetCurrentWorldPosition()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentWorldPosition == null)
             {
                 internalCurrentWorldPosition = new Vector3(0, 0, 0);
@@ -852,17 +651,11 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentWorldPosition;
-#else
-            Vector3 ret = new Vector3(Interop.ActorInternal.GetCurrentWorldPosition(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
 
         internal Vector2 GetCurrentScreenPosition()
         {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             if(internalCurrentScreenPosition == null)
             {
                 internalCurrentScreenPosition = new Vector2(0, 0);
@@ -875,13 +668,13 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentScreenPosition;
-#else
-            Vector2 temp = new Vector2(0.0f, 0.0f);
-            var pValue = GetProperty(View.Property.ScreenPosition);
-            pValue.Get(temp);
-            pValue.Dispose();
-            return temp;
-#endif
+        }
+
+        internal Vector4 GetCurrentScreenPositionSize()
+        {
+            Vector4 ret = new Vector4(Interop.Actor.CalculateScreenExtents(SwigCPtr), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw new InvalidOperationException("FATAL: get Exception", NDalicPINVOKE.SWIGPendingException.Retrieve());
+            return ret;
         }
 
         internal void SetInheritPosition(bool inherit)
@@ -974,7 +767,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal Vector3 GetCurrentScale()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentScale == null)
             {
                 internalCurrentScale = new Vector3(0, 0, 0);
@@ -987,18 +780,11 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentScale;
-#else
-
-            Vector3 ret = new Vector3(Interop.ActorInternal.GetCurrentScale(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif        
         }
 
         internal Vector3 GetCurrentWorldScale()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentWorldScale == null)
             {
                 internalCurrentWorldScale = new Vector3(0, 0, 0);
@@ -1011,13 +797,6 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentWorldScale;
-#else
-
-            Vector3 ret = new Vector3(Interop.ActorInternal.GetCurrentWorldScale(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
 
         internal void SetInheritScale(bool inherit)
@@ -1082,7 +861,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal Vector4 GetCurrentColor()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentColor == null)
             {
                 internalCurrentColor = new Vector4(0, 0, 0, 0);
@@ -1095,13 +874,6 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentColor;
-#else
-
-            Vector4 ret = new Vector4(Interop.ActorInternal.GetCurrentColor(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
         internal ColorMode GetColorMode()
         {
@@ -1113,7 +885,7 @@ namespace Tizen.NUI.BaseComponents
 
         internal Vector4 GetCurrentWorldColor()
         {
-#if NUI_PROPERTY_CHANGE_3
+
             if(internalCurrentWorldColor == null)
             {
                 internalCurrentWorldColor = new Vector4(0, 0, 0, 0);
@@ -1126,13 +898,6 @@ namespace Tizen.NUI.BaseComponents
                 throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             }
             return internalCurrentWorldColor;
-#else
-
-            Vector4 ret = new Vector4(Interop.ActorInternal.GetCurrentWorldColor(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif            
         }
 
         internal void SetDrawMode(DrawModeType drawMode)
@@ -1212,20 +977,13 @@ namespace Tizen.NUI.BaseComponents
 
         internal Vector3 GetSizeModeFactor()
         {
-#if NUI_PROPERTY_CHANGE_1
+
                 if (internalSizeModeFactor == null)
                 {
                     internalSizeModeFactor = new Vector3(OnSizeModeFactorChanged, 0, 0, 0);
                 }
                 Object.InternalRetrievingPropertyVector3(SwigCPtr, View.Property.SizeModeFactor, internalSizeModeFactor.SwigCPtr);
                 return internalSizeModeFactor;
-#else
-
-            Vector3 ret = new Vector3(Interop.Actor.GetSizeModeFactor(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
 
         internal void SetMinimumSize(Vector2 size)
@@ -1237,19 +995,13 @@ namespace Tizen.NUI.BaseComponents
 
         internal Vector2 GetMinimumSize()
         {
-#if NUI_PROPERTY_CHANGE_1
+
             if (internalMinimumSize == null)
             {
                 internalMinimumSize = new Size2D(OnMinimumSizeChanged, 0, 0);
             }
             Object.InternalRetrievingPropertyVector2(SwigCPtr, View.Property.MinimumSize, internalMinimumSize.SwigCPtr);
             return internalMinimumSize;
-#else
-            Vector2 ret = new Vector2(Interop.ActorInternal.GetMinimumSize(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
 
         internal void SetMaximumSize(Vector2 size)
@@ -1261,20 +1013,13 @@ namespace Tizen.NUI.BaseComponents
 
         internal Vector2 GetMaximumSize()
         {
-#if NUI_PROPERTY_CHANGE_1
+
             if (internalMaximumSize == null)
             {
                 internalMaximumSize = new Size2D(OnMaximumSizeChanged, 0, 0);
             }
             Object.InternalRetrievingPropertyVector2(SwigCPtr, View.Property.MaximumSize, internalMaximumSize.SwigCPtr);
             return internalMaximumSize;
-#else
-
-            Vector2 ret = new Vector2(Interop.ActorInternal.GetMaximumSize(SwigCPtr), true);
-            if (NDalicPINVOKE.SWIGPendingException.Pending)
-                throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-#endif
         }
 
         internal int GetHierarchyDepth()
@@ -1313,14 +1058,10 @@ namespace Tizen.NUI.BaseComponents
         /// </summary>
         internal bool IsBackgroundEmpty()
         {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             int visualType = (int)Visual.Type.Invalid;
             Interop.View.InternalRetrievingVisualPropertyInt(this.SwigCPtr, Property.BACKGROUND, Visual.Property.Type, out visualType);
             return visualType == (int)Visual.Type.Invalid;
-#else
-            PropertyMap background = Background;
-            return (background == null || background.Empty());
-#endif
         }
 
         internal void SetKeyInputFocus()
@@ -1415,7 +1156,7 @@ namespace Tizen.NUI.BaseComponents
         {
             if (backgroundExtraData == null) return;
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             // Update corner radius properties to background and shadow by ActionUpdateProperty
             if (backgroundExtraData.CornerRadius != null)
             {
@@ -1424,25 +1165,6 @@ namespace Tizen.NUI.BaseComponents
             }
             Interop.View.InternalUpdateVisualPropertyInt(this.SwigCPtr, View.Property.BACKGROUND, Visual.Property.CornerRadiusPolicy, (int)backgroundExtraData.CornerRadiusPolicy);
             Interop.View.InternalUpdateVisualPropertyInt(this.SwigCPtr, View.Property.SHADOW, Visual.Property.CornerRadiusPolicy, (int)backgroundExtraData.CornerRadiusPolicy);
-#else
-            var cornerRadiusValue = backgroundExtraData.CornerRadius == null ? new PropertyValue() : new PropertyValue(backgroundExtraData.CornerRadius);
-            var cornerRadiusPolicyValue = new PropertyValue((int)backgroundExtraData.CornerRadiusPolicy);
-
-            // Make current propertyMap
-            PropertyMap currentPropertyMap = new PropertyMap();
-            currentPropertyMap[Visual.Property.CornerRadius] = cornerRadiusValue;
-            currentPropertyMap[Visual.Property.CornerRadiusPolicy] = cornerRadiusPolicyValue;
-            var temp = new PropertyValue(currentPropertyMap);
-
-            // Update corner radius properties to background and shadow by ActionUpdateProperty
-            DoAction(View.Property.BACKGROUND, ActionUpdateProperty, temp);
-            DoAction(View.Property.SHADOW, ActionUpdateProperty, temp);
-
-            temp.Dispose();
-            currentPropertyMap.Dispose();
-            cornerRadiusValue.Dispose();
-            cornerRadiusPolicyValue.Dispose();
-#endif
         }
 
         /// TODO open as a protected level
@@ -1450,7 +1172,7 @@ namespace Tizen.NUI.BaseComponents
         {
             if (backgroundExtraData == null) return;
 
-#if NUI_VISUAL_PROPERTY_CHANGE_1
+
             // ActionUpdateProperty works well only if BACKGROUND visual setup before.
             // If view don't have BACKGROUND visual, we set transparent background color in default.
             if (IsBackgroundEmpty())
@@ -1466,45 +1188,6 @@ namespace Tizen.NUI.BaseComponents
             Interop.View.InternalUpdateVisualPropertyFloat(this.SwigCPtr, View.Property.BACKGROUND, Visual.Property.BorderlineWidth, backgroundExtraData.BorderlineWidth);
             Interop.View.InternalUpdateVisualPropertyVector4(this.SwigCPtr, View.Property.BACKGROUND, Visual.Property.BorderlineColor, Vector4.getCPtr(backgroundExtraData.BorderlineColor ?? Color.Black));
             Interop.View.InternalUpdateVisualPropertyFloat(this.SwigCPtr, View.Property.BACKGROUND, Visual.Property.BorderlineOffset, backgroundExtraData.BorderlineOffset);
-#else
-            // ActionUpdateProperty works well only if BACKGROUND visual setup before.
-            // If view don't have BACKGROUND visual, we set transparent background color in default.
-            using (PropertyMap backgroundPropertyMap = new PropertyMap())
-            {
-                using (PropertyValue propertyValue = Object.GetProperty(SwigCPtr, Property.BACKGROUND))
-                {
-                    propertyValue?.Get(backgroundPropertyMap);
-                    if (backgroundPropertyMap.Empty())
-                    {
-                        // BACKGROUND visual doesn't exist.
-                        SetBackgroundColor(Color.Transparent);
-                        // SetBackgroundColor function apply borderline internally.
-                        // So we can just return now.
-                        return;
-                    }
-                }
-            }
-
-            var borderlineWidthValue = new PropertyValue(backgroundExtraData.BorderlineWidth);
-            var borderlineColorValue = backgroundExtraData.BorderlineColor == null ? new PropertyValue(Color.Black) : new PropertyValue(backgroundExtraData.BorderlineColor);
-            var borderlineOffsetValue = new PropertyValue(backgroundExtraData.BorderlineOffset);
-
-            // Make current propertyMap
-            PropertyMap currentPropertyMap = new PropertyMap();
-            currentPropertyMap[Visual.Property.BorderlineWidth] = borderlineWidthValue;
-            currentPropertyMap[Visual.Property.BorderlineColor] = borderlineColorValue;
-            currentPropertyMap[Visual.Property.BorderlineOffset] = borderlineOffsetValue;
-            var temp = new PropertyValue(currentPropertyMap);
-
-            // Update borderline properties to background  by ActionUpdateProperty
-            DoAction(View.Property.BACKGROUND, ActionUpdateProperty, temp);
-
-            temp.Dispose();
-            currentPropertyMap.Dispose();
-            borderlineWidthValue.Dispose();
-            borderlineColorValue.Dispose();
-            borderlineOffsetValue.Dispose();
-#endif
         }
 
         /// <summary>
@@ -1590,7 +1273,7 @@ namespace Tizen.NUI.BaseComponents
             rotationGestureDetector?.Dispose();
             rotationGestureDetector = null;
 
-#if NUI_PROPERTY_CHANGE_3
+
             internalCurrentParentOrigin?.Dispose();
             internalCurrentParentOrigin = null;
             internalCurrentAnchorPoint?.Dispose();
@@ -1615,11 +1298,8 @@ namespace Tizen.NUI.BaseComponents
             internalCurrentWorldColor = null;
             internalSizeModeFactor?.Dispose();
             internalSizeModeFactor = null;
-#endif
-#if NUI_VISUAL_PROPERTY_CHANGE_1
             internalCurrentScreenPosition?.Dispose();
             internalCurrentScreenPosition = null;
-#endif
 
             if (type == DisposeTypes.Explicit)
             {
index d595446..3eddeba 100755 (executable)
@@ -54,24 +54,12 @@ namespace Tizen.NUI.BaseComponents
                                                  AlphaFunction.BuiltinFunctions? alphaFunction = null,
                                                  object initialValue = null)
         {
-#if NUI_VISUAL_PROPERTY_CHANGE_1
             if (IsBackgroundEmpty())
             {
                 // If there is no background yet, ensure there is a transparent
                 // color visual
                 BackgroundColor = new Color(0.0f, 0.0f, 0.0f, 0.0f);
             }
-#else
-            Tizen.NUI.PropertyMap background = Background;
-
-            if (background.Empty())
-            {
-                // If there is no background yet, ensure there is a transparent
-                // color visual
-                BackgroundColor = new Color(0.0f, 0.0f, 0.0f, 0.0f);
-                background = Background;
-            }
-#endif
             return AnimateColor("background", destinationValue, startTime, endTime, alphaFunction, initialValue);
         }
 
similarity index 79%
rename from src/Tizen.NUI/src/internal/Common/Matrix.cs
rename to src/Tizen.NUI/src/public/Common/Matrix.cs
index 02e88c9..821d0a2 100755 (executable)
  *
  */
 
+using System;
+using System.ComponentModel;
+
 namespace Tizen.NUI
-{
-    internal class Matrix : Disposable
+{    /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class Matrix : Disposable
     {
         internal Matrix(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
         {
@@ -28,12 +32,6 @@ namespace Tizen.NUI
             Interop.Matrix.DeleteMatrix(swigCPtr);
         }
 
-
-        public static Vector4 operator *(Matrix arg1, Vector4 arg2)
-        {
-            return arg1.Multiply(arg2);
-        }
-
         public Matrix() : this(Interop.Matrix.NewMatrix(), true)
         {
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
@@ -77,6 +75,35 @@ namespace Tizen.NUI
             }
         }
 
+        public float this[uint index]
+        {
+            set
+            {
+                SetValueAtIndex(index, value);
+            }
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
+
+        public static Vector4 operator *(Matrix arg1, Vector4 arg2)
+        {
+            return arg1?.Multiply(arg2);
+        }
+
+        public static Matrix operator *(Matrix arg1, Rotation arg2)
+        {
+            Matrix ret = new Matrix(false);
+            Matrix.Multiply(ret, arg1, arg2);
+            return ret;
+        }
+
+        public static Matrix operator *(Matrix arg1, Matrix arg2)
+        {
+            return arg1?.Multiply(arg2);
+        }
+
         public void SetIdentity()
         {
             Interop.Matrix.SetIdentity(SwigCPtr);
@@ -179,14 +206,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        public SWIGTYPE_p_float AsFloat()
-        {
-            global::System.IntPtr cPtr = Interop.Matrix.AsFloat(SwigCPtr);
-            SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
         public static void Multiply(Matrix result, Matrix lhs, Matrix rhs)
         {
             Interop.Matrix.Multiply(Matrix.getCPtr(result), Matrix.getCPtr(lhs), Matrix.getCPtr(rhs));
@@ -201,11 +220,29 @@ namespace Tizen.NUI
 
         public Vector4 Multiply(Vector4 rhs)
         {
-            Vector4 ret = new Vector4(Interop.Matrix.Multiply(SwigCPtr, Vector4.getCPtr(rhs)), true);
+            Vector4 ret = new Vector4(Interop.Matrix.MultiplyVector4(SwigCPtr, Vector4.getCPtr(rhs)), true);
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
             return ret;
         }
 
+        public Matrix Multiply(Matrix rhs)
+        {
+            Matrix ret = new Matrix(Interop.Matrix.Multiply(SwigCPtr, Matrix.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void MultiplyAssign(Matrix rhs)
+        {
+            Interop.Matrix.MultiplyAssign(SwigCPtr, Matrix.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public override int GetHashCode()
+        {
+            return SwigCPtr.Handle.GetHashCode();
+        }
+
         public bool EqualTo(Matrix rhs)
         {
             bool ret = Interop.Matrix.EqualTo(SwigCPtr, Matrix.getCPtr(rhs));
@@ -243,5 +280,31 @@ namespace Tizen.NUI
             Interop.Matrix.GetTransformComponents(SwigCPtr, Vector3.getCPtr(position), Rotation.getCPtr(rotation), Vector3.getCPtr(scale));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
+
+        public float ValueOfIndex(uint index)
+        {
+            float ret = Interop.Matrix.ValueOfIndex(SwigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public float ValueOfIndex(uint indexRow, uint indexColumn)
+        {
+            float ret = Interop.Matrix.ValueOfIndex(SwigCPtr, indexRow, indexColumn);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetValueAtIndex(uint index, float val)
+        {
+            Interop.Matrix.SetValueAtIndex(SwigCPtr, index, val);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetValueAtIndex(uint indexRow, uint indexColumn, float val)
+        {
+            Interop.Matrix.SetValueAtIndex(SwigCPtr, indexRow, indexColumn, val);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
     }
 }
similarity index 66%
rename from src/Tizen.NUI/src/internal/Common/Matrix3.cs
rename to src/Tizen.NUI/src/public/Common/Matrix3.cs
index 7760871..2de4ee4 100755 (executable)
  *
  */
 
+using System;
+using System.ComponentModel;
+
 namespace Tizen.NUI
 {
-    internal class Matrix3 : Disposable
+    /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API.
+    [EditorBrowsable(EditorBrowsableState.Never)]
+    public class Matrix3 : Disposable
     {
         internal Matrix3(global::System.IntPtr cPtr, bool cMemoryOwn) : base(cPtr, cMemoryOwn)
         {
@@ -73,6 +78,33 @@ namespace Tizen.NUI
             return ret;
         }
 
+        public float this[uint index]
+        {
+            set
+            {
+                SetValueAtIndex(index, value);
+            }
+            get
+            {
+                return ValueOfIndex(index);
+            }
+        }
+
+        public static Vector3 operator *(Matrix3 arg1, Vector3 arg2)
+        {
+            return arg1?.Multiply(arg2);
+        }
+
+        public static Matrix3 operator *(Matrix3 arg1, Matrix3 arg2)
+        {
+            return arg1?.Multiply(arg2);
+        }
+
+        public override int GetHashCode()
+        {
+            return SwigCPtr.Handle.GetHashCode();
+        }
+
         public bool EqualTo(Matrix3 rhs)
         {
             bool ret = Interop.Matrix.Matrix3EqualTo(SwigCPtr, Matrix3.getCPtr(rhs));
@@ -93,14 +125,6 @@ namespace Tizen.NUI
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
 
-        public SWIGTYPE_p_float AsFloat()
-        {
-            global::System.IntPtr cPtr = Interop.Matrix.Matrix3AsFloat(SwigCPtr);
-            SWIGTYPE_p_float ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_float(cPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return ret;
-        }
-
         public bool Invert()
         {
             bool ret = Interop.Matrix.Matrix3Invert(SwigCPtr);
@@ -140,5 +164,51 @@ namespace Tizen.NUI
             Interop.Matrix.Matrix3Multiply(Matrix3.getCPtr(result), Matrix3.getCPtr(lhs), Matrix3.getCPtr(rhs));
             if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
         }
+
+        public Vector3 Multiply(Vector3 rhs)
+        {
+            Vector3 ret = new Vector3(Interop.Matrix.Matrix3MultiplyVector3(SwigCPtr, Vector3.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public Matrix3 Multiply(Matrix3 rhs)
+        {
+            Matrix3 ret = new Matrix3(Interop.Matrix.Matrix3Multiply(SwigCPtr, Matrix3.getCPtr(rhs)), true);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void MultiplyAssign(Matrix3 rhs)
+        {
+            Interop.Matrix.Matrix3MultiplyAssign(SwigCPtr, Matrix3.getCPtr(rhs));
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public float ValueOfIndex(uint index)
+        {
+            float ret = Interop.Matrix.Matrix3ValueOfIndex(SwigCPtr, index);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public float ValueOfIndex(uint indexRow, uint indexColumn)
+        {
+            float ret = Interop.Matrix.Matrix3ValueOfIndex(SwigCPtr, indexRow, indexColumn);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return ret;
+        }
+
+        public void SetValueAtIndex(uint index, float val)
+        {
+            Interop.Matrix.Matrix3SetValueAtIndex(SwigCPtr, index, val);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        public void SetValueAtIndex(uint indexRow, uint indexColumn, float val)
+        {
+            Interop.Matrix.Matrix3SetValueAtIndex(SwigCPtr, indexRow, indexColumn, val);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
     }
 }
index 5c926c6..267f861 100755 (executable)
@@ -417,7 +417,7 @@ namespace Tizen.NUI
             return value;
         }
 
-#if NUI_ANIMATION_PROPERTY_CHANGE_1
+
         /// <summary>
         /// An extension to the property value class that allows us to create a
         /// Property value from a C# object, for example, integer, float, or string.<br />
@@ -521,7 +521,6 @@ namespace Tizen.NUI
             }
             return value;
         }
-#endif
 
         /// <summary>
         /// Retrieves a Size2D value.
index 6a87fd7..2626baf 100644 (file)
@@ -45,6 +45,7 @@ namespace Tizen.NUI
                 AutoScrollLoopCount = 2,
                 AutoScrollGap = 50.0f,
                 AutoScrollSpeed = 80,
+                FontSizeScale = Tizen.NUI.FontSizeScale.UseSystemSetting,
             });
 
             // TextField style.
@@ -58,6 +59,7 @@ namespace Tizen.NUI
                 PrimaryCursorColor = new Vector4(0.04f, 0.05f, 0.13f, 1),
                 SecondaryCursorColor = new Vector4(0.04f, 0.05f, 0.13f, 1),
                 CursorWidth = 2,
+                FontSizeScale = Tizen.NUI.FontSizeScale.UseSystemSetting,
                 SelectionHighlightColor = new Vector4(1.00f, 0.38f, 0.00f, 0.30f),
                 GrabHandleColor = new Color(1.00f, 1.00f, 1.00f, 1),
                 GrabHandleImage = FrameworkInformation.ResourcePath + "IoT_handler_center_downW.png",
@@ -94,6 +96,7 @@ namespace Tizen.NUI
                 PrimaryCursorColor = new Vector4(0.04f, 0.05f, 0.13f, 1),
                 SecondaryCursorColor = new Vector4(0.04f, 0.05f, 0.13f, 1),
                 CursorWidth = 2,
+                FontSizeScale = Tizen.NUI.FontSizeScale.UseSystemSetting,
                 SelectionHighlightColor = new Vector4(1.00f, 0.38f, 0.00f, 0.30f),
                 GrabHandleColor = new Color(1.00f, 1.00f, 1.00f, 1),
                 GrabHandleImage = FrameworkInformation.ResourcePath + "IoT_handler_center_downW.png",
index 23df9ca..98f7eb3 100755 (executable)
@@ -441,6 +441,16 @@ namespace Tizen.NUI
             /// </summary>
             AnimatedImage,
             /// <summary>
+            /// Renders an animated gradient.
+            /// </summary>
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            AnimatedGradient = Visual.Type.AnimatedImage + 1,
+            /// <summary>
+            /// Renders an animated vector image.
+            /// </summary>
+            [EditorBrowsable(EditorBrowsableState.Never)]
+            AnimatedVectorImage = Visual.Type.AnimatedImage + 2,
+            /// <summary>
             /// Renders an arc.
             /// </summary>
             [EditorBrowsable(EditorBrowsableState.Never)]
index 67b11b9..60af9ff 100755 (executable)
@@ -47,6 +47,7 @@ namespace Tizen.NUI.Devel.Tests
         public static int mainTid;
         Timer timer;
         private EventThreadCallback eventThreadCallback;
+        private EventThreadCallback.CallbackDelegate callbackDelegate;
         private NUnitLite.TUnit.TRunner trunner;
         private ManualResetEvent methodExecutionResetEvent;
         private TAsyncThreadMgr asyncThreadMgr;
@@ -104,7 +105,8 @@ namespace Tizen.NUI.Devel.Tests
                     methodExecutionResetEvent.Set();
                 });
 
-            eventThreadCallback = new EventThreadCallback(new EventThreadCallback.CallbackDelegate(ProcessTest));
+            callbackDelegate = new EventThreadCallback.CallbackDelegate(ProcessTest);
+            eventThreadCallback = new EventThreadCallback(callbackDelegate);
             eventThreadCallback.Trigger();
         }
 
@@ -1,16 +1,15 @@
 ï»¿using global::System;
 using NUnit.Framework;
 using NUnit.Framework.TUnit;
-using Tizen.NUI.Components;
-using Tizen.NUI.BaseComponents;
+using Tizen.NUI;
 
 namespace Tizen.NUI.Devel.Tests
 {
     using tlog = Tizen.Log;
 
     [TestFixture]
-    [Description("internal/Common/Matrix")]
-    public class InternalMatrixTest
+    [Description("public/Common/Matrix")]
+    public class MatrixTest
     {
         private const string tag = "NUITEST";
 
@@ -75,7 +74,11 @@ namespace Tizen.NUI.Devel.Tests
         {
             tlog.Debug(tag, $"MatrixConstructorWithFloatArray START");
 
-            float[] arr = new float[3] { 0.1f, 0.4f, 0.2f };
+            float[] arr = new float[16]
+            { 0.0f, 1.0f, 2.0f, 3.0f,
+              0.1f, 1.1f, 2.1f, 3.1f,
+              0.2f, 1.2f, 2.2f, 3.2f,
+              0.3f, 1.3f, 2.3f, 3.3f};
 
             var testingTarget = new Matrix(arr);
             Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
@@ -204,6 +207,7 @@ namespace Tizen.NUI.Devel.Tests
                 Assert.Fail("Caught Exception : Failed!");
             }
 
+            testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixSetIdentity END (OK)");
         }
 
@@ -235,6 +239,7 @@ namespace Tizen.NUI.Devel.Tests
                 Assert.Fail("Caught Exception : Failed!");
             }
 
+            testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixSetIdentityAndScale END (OK)");
         }
 
@@ -249,7 +254,14 @@ namespace Tizen.NUI.Devel.Tests
         {
             tlog.Debug(tag, $"MatrixInvert START");
 
-            var testingTarget = new Matrix();
+            // Initialize as invertable matrix
+            float[] arr = new float[16]
+            { 0.0f, 2.0f, 0.0f, 0.0f,
+              1.0f, 0.0f, 0.0f, 0.0f,
+              0.0f, 0.0f, 0.0f, 4.0f,
+              0.0f, 0.0f, 3.0f, 0.0f};
+
+            var testingTarget = new Matrix(arr);
             Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
             Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
 
@@ -257,6 +269,7 @@ namespace Tizen.NUI.Devel.Tests
             {
                 var result = testingTarget.Invert();
                 tlog.Debug(tag, "Invert : " + result);
+                Assert.AreEqual(true, result, "Invert should be successed");
             }
             catch (Exception e)
             {
@@ -264,6 +277,7 @@ namespace Tizen.NUI.Devel.Tests
                 Assert.Fail("Caught Exception : Failed!");
             }
 
+            testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixInvert END (OK)");
         }
 
@@ -292,6 +306,7 @@ namespace Tizen.NUI.Devel.Tests
                 Assert.Fail("Caught Exception : Failed!");
             }
 
+            testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixTranspose END (OK)");
         }
 
@@ -321,6 +336,7 @@ namespace Tizen.NUI.Devel.Tests
                 Assert.AreEqual(3.0f, result.Z, "Should be equal!");
             }
 
+            testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixSetXAxis END (OK)");
         }
 
@@ -350,6 +366,7 @@ namespace Tizen.NUI.Devel.Tests
                 Assert.AreEqual(3.0f, result.Z, "Should be equal!");
             }
 
+            testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixSetYAxis END (OK)");
         }
 
@@ -379,6 +396,7 @@ namespace Tizen.NUI.Devel.Tests
                 Assert.AreEqual(3.0f, result.Z, "Should be equal!");
             }
 
+            testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixSetZAxis END (OK)");
         }
 
@@ -471,34 +489,6 @@ namespace Tizen.NUI.Devel.Tests
 
         [Test]
         [Category("P1")]
-        [Description("Matrix AsFloat.")]
-        [Property("SPEC", "Tizen.NUI.Matrix.AsFloat M")]
-        [Property("SPEC_URL", "-")]
-        [Property("CRITERIA", "MR")]
-        [Property("AUTHOR", "guowei.wang@samsung.com")]
-        public void MatrixAsFloat()
-        {
-            tlog.Debug(tag, $"MatrixAsFloat START");
-
-            var testingTarget = new Matrix();
-            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
-            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
-
-            try
-            {
-                testingTarget.AsFloat();
-            }
-            catch (Exception e)
-            {
-                tlog.Debug(tag, e.Message.ToString());
-                Assert.Fail("Caught Exception : Failed!");
-            }
-
-            tlog.Debug(tag, $"MatrixAsFloat END (OK)");
-        }
-
-        [Test]
-        [Category("P1")]
         [Description("Matrix Multiply.")]
         [Property("SPEC", "Tizen.NUI.Matrix.Multiply M")]
         [Property("SPEC_URL", "-")]
@@ -534,6 +524,38 @@ namespace Tizen.NUI.Devel.Tests
 
         [Test]
         [Category("P1")]
+        [Description("Matrix MultiplyAssign.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.MultiplyAssign M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "eunkiki.hong@samsung.com")]
+        public void MatrixMultiplyAssign()
+        {
+            tlog.Debug(tag, $"MatrixMultiplyAssign START");
+
+            var testingTarget = new Matrix();
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            using (Matrix rhs = new Matrix(false))
+            {
+                try
+                {
+                    testingTarget.MultiplyAssign(rhs);
+                }
+                catch (Exception e)
+                {
+                    tlog.Debug(tag, e.Message.ToString());
+                    Assert.Fail("Caught Exception : Failed!");
+                }
+            }
+
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixMultiplyAssign END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
         [Description("Matrix Multiply. With Rotation.")]
         [Property("SPEC", "Tizen.NUI.Matrix.Multiply M")]
         [Property("SPEC_URL", "-")]
@@ -586,7 +608,8 @@ namespace Tizen.NUI.Devel.Tests
             {
                 try
                 {
-                    testingTarget.Multiply(vector);
+                    var ret = testingTarget.Multiply(vector);
+                    ret.Dispose();
                 }
                 catch (Exception e)
                 {
@@ -618,6 +641,7 @@ namespace Tizen.NUI.Devel.Tests
             {
                 var result = testingTarget.EqualTo(matrix);
                 tlog.Debug(tag, "EqualTo : " + result);
+                Assert.AreEqual(true, result, "EqualTo should be true");
             }
 
             testingTarget.Dispose();
@@ -643,6 +667,7 @@ namespace Tizen.NUI.Devel.Tests
             {
                 var result = testingTarget.NotEqualTo(matrix);
                 tlog.Debug(tag, "NotEqualTo : " + result);
+                Assert.AreEqual(false, result, "NotEqualTo should be false");
             }
 
             testingTarget.Dispose();
@@ -811,5 +836,243 @@ namespace Tizen.NUI.Devel.Tests
             testingTarget.Dispose();
             tlog.Debug(tag, $"MatrixGetTransformComponents END (OK)");
         }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix ValueOfIndex with signle index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.ValueOfIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void MatrixValueOfIndexSingleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"MatrixValueOfIndexSingleIndex START");
+
+            float[] arr = new float[16]
+            { 0.0f, 1.0f, 2.0f, 3.0f,
+              0.1f, 1.1f, 2.1f, 3.1f,
+              0.2f, 1.2f, 2.2f, 3.2f,
+              0.3f, 1.3f, 2.3f, 3.3f};
+
+            Matrix testingTarget = new Matrix(arr);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            for(uint index = 0; index < 16; ++index)
+            {
+                float expectResult = (index / 4) * 0.1f + (index % 4) * 1.0f;
+                Assert.AreEqual(expectResult, testingTarget.ValueOfIndex(index), "The value of index is not correct!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixValueOfIndexSingleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix ValueOfIndex with double index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.ValueOfIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void MatrixValueOfIndexDoubleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"MatrixValueOfIndexDoubleIndex START");
+            float[] arr = new float[16]
+            { 0.0f, 1.0f, 2.0f, 3.0f,
+              0.1f, 1.1f, 2.1f, 3.1f,
+              0.2f, 1.2f, 2.2f, 3.2f,
+              0.3f, 1.3f, 2.3f, 3.3f};
+
+            Matrix testingTarget = new Matrix(arr);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            for(uint indexRow = 0; indexRow < 4; ++indexRow)
+            {
+                for(uint indexColumn = 0; indexColumn < 4; ++indexColumn)
+                {
+                    float expectResult = indexColumn * 0.1f + indexRow * 1.0f;
+                    Assert.AreEqual(expectResult, testingTarget.ValueOfIndex(indexRow, indexColumn), "The value of index is not correct!");
+                }
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixValueOfIndexDoubleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix SetValueAtIndex with signle index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.SetValueAtIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void MatrixSetValueAtIndexSingleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"MatrixSetValueAtIndexSingleIndex START");
+            Matrix testingTarget = new Matrix(true);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            for(uint index = 0; index < 16; ++index)
+            {
+                float expectResult = (index / 4) * 0.1f + (index % 4) * 1.0f;
+                testingTarget.SetValueAtIndex(index, expectResult);
+                Assert.AreEqual(expectResult, testingTarget[index], "The value of index is not correct!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixSetValueAtIndexSingleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix SetValueAtIndex with double index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.SetValueAtIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void MatrixSetValueAtIndexDoubleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"MatrixSetValueAtIndexDoubleIndex START");
+            Matrix testingTarget = new Matrix(true);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            for(uint indexRow = 0; indexRow < 4; ++indexRow)
+            {
+                for(uint indexColumn = 0; indexColumn < 4; ++indexColumn)
+                {
+                    float expectResult = indexColumn * 0.1f + indexRow * 1.0f;
+                    testingTarget.SetValueAtIndex(indexRow, indexColumn, expectResult);
+                    Assert.AreEqual(expectResult, testingTarget.ValueOfIndex(indexRow, indexColumn), "The value of index is not correct!");
+                }
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixSetValueAtIndexDoubleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Test Tizen.NUI.Matrix.operator * with Matrix.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.operator *() A")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void MatrixMultiplyOperator()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"MatrixMultiplyOperator START");
+            Matrix testingTarget = new Matrix(true);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            try
+            {
+                Matrix rhs = new Matrix(false);
+                Matrix ret = testingTarget * rhs;
+                rhs.Dispose();
+                ret.Dispose();
+            }
+            catch (Exception e)
+            {
+                tlog.Debug(tag, e.Message.ToString());
+                Assert.Fail("Caught Exception : Failed!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixMultiplyOperator END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Test Tizen.NUI.Matrix.operator * with Rotation.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.operator *() A")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void MatrixMultiplyOperatorWithRotation()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"MatrixMultiplyOperatorWithRotation START");
+            Matrix testingTarget = new Matrix(true);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            try
+            {
+                Rotation rhs = new Rotation();
+                Matrix ret = testingTarget * rhs;
+                rhs.Dispose();
+                ret.Dispose();
+            }
+            catch (Exception e)
+            {
+                tlog.Debug(tag, e.Message.ToString());
+                Assert.Fail("Caught Exception : Failed!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixMultiplyOperatorWithRotation END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Test Tizen.NUI.Matrix.operator * with Vector4.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.operator *() A")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void MatrixMultiplyOperatorWithVector4()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"MatrixMultiplyOperatorWithVector4 START");
+            Matrix testingTarget = new Matrix(true);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix>(testingTarget, "Should return Matrix instance.");
+
+            try
+            {
+                Vector4 rhs = new Vector4();
+                Vector4 ret = testingTarget * rhs;
+                rhs.Dispose();
+                ret.Dispose();
+            }
+            catch (Exception e)
+            {
+                tlog.Debug(tag, e.Message.ToString());
+                Assert.Fail("Caught Exception : Failed!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"MatrixMultiplyOperatorWithVector4 END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Test this[uint index]. Check whether this[uint index] returns expected value or not.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.this[uint] A")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void this_SET_GET_VALUE()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrixthis_SET_GET_VALUE START");
+            Matrix testingTarget = new Matrix(true);
+            try
+            {
+                testingTarget[0] = 100.0f;
+                testingTarget[1] = 200.0f;
+            }
+            catch (Exception e)
+            {
+                tlog.Debug(tag, e.Message.ToString());
+                Assert.Fail("Caught Exception : Failed!");
+            }
+            Assert.AreEqual(100.0f, testingTarget[0], "The value of index[0] is not correct!");
+            Assert.AreEqual(200.0f, testingTarget[1], "The value of index[1] is not correct!");
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrixthis_SET_GET_VALUE END (OK)");
+        }
     }
 }
@@ -1,16 +1,15 @@
 ï»¿using global::System;
 using NUnit.Framework;
 using NUnit.Framework.TUnit;
-using Tizen.NUI.Components;
-using Tizen.NUI.BaseComponents;
+using Tizen.NUI;
 
 namespace Tizen.NUI.Devel.Tests
 {
     using tlog = Tizen.Log;
 
     [TestFixture]
-    [Description("internal/Common/Matrix3")]
-    public class InternalMatrix3Test
+    [Description("public/Common/Matrix3")]
+    public class Matrix3Test
     {
         private const string tag = "NUITEST";
 
@@ -184,6 +183,7 @@ namespace Tizen.NUI.Devel.Tests
             {
                 var result = testingTarget.EqualTo(matrix3);
                 tlog.Debug(tag, "EqualTo : " + result);
+                Assert.AreEqual(false, result, "EqualTo should be false");
             }
 
             testingTarget.Dispose();
@@ -209,6 +209,7 @@ namespace Tizen.NUI.Devel.Tests
             {
                 var result = testingTarget.NotEqualTo(matrix3);
                 tlog.Debug(tag, "NotEqualTo : " + result);
+                Assert.AreEqual(true, result, "NotEqualTo should be true");
             }
 
             testingTarget.Dispose();
@@ -246,35 +247,6 @@ namespace Tizen.NUI.Devel.Tests
 
         [Test]
         [Category("P1")]
-        [Description("Matrix3 AsFloat.")]
-        [Property("SPEC", "Tizen.NUI.Matrix3.AsFloat M")]
-        [Property("SPEC_URL", "-")]
-        [Property("CRITERIA", "MR")]
-        [Property("AUTHOR", "guowei.wang@samsung.com")]
-        public void Matrix3AsFloat()
-        {
-            tlog.Debug(tag, $"Matrix3AsFloat START");
-
-            var testingTarget = new Matrix3();
-            Assert.IsNotNull(testingTarget, "Can't create success object Matrix3.");
-            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix3 instance.");
-
-            try
-            {
-                testingTarget.AsFloat();
-            }
-            catch (Exception e)
-            {
-                tlog.Debug(tag, e.Message.ToString());
-                Assert.Fail("Caught Exception : Failed!");
-            }
-
-            testingTarget.Dispose();
-            tlog.Debug(tag, $"Matrix3AsFloat END (OK)");
-        }
-
-        [Test]
-        [Category("P1")]
         [Description("Matrix3 Invert.")]
         [Property("SPEC", "Tizen.NUI.Matrix3.Invert M")]
         [Property("SPEC_URL", "-")]
@@ -284,12 +256,14 @@ namespace Tizen.NUI.Devel.Tests
         {
             tlog.Debug(tag, $"Matrix3Invert START");
 
-            var testingTarget = new Matrix3();
+            // Initialize as invertable matrix
+            var testingTarget = new Matrix3(1.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 3.0f);
             Assert.IsNotNull(testingTarget, "Can't create success object Matrix3.");
             Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix3 instance.");
 
             var result = testingTarget.Invert();
             tlog.Debug(tag, "Invert :" + result);
+            Assert.AreEqual(true, result, "Invert should be successed");
 
             testingTarget.Dispose();
             tlog.Debug(tag, $"Matrix3Invert END (OK)");
@@ -424,5 +398,234 @@ namespace Tizen.NUI.Devel.Tests
             testingTarget.Dispose();
             tlog.Debug(tag, $"Matrix3Multiply END (OK)");
         }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix3 MultiplyAssign.")]
+        [Property("SPEC", "Tizen.NUI.Matrix3.MultiplyAssign M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "eunkiki.hong@samsung.com")]
+        public void Matrix3MultiplyAssign()
+        {
+            tlog.Debug(tag, $"Matrix3MultiplyAssign START");
+
+            var testingTarget = new Matrix3();
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix3.");
+            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix3 instance.");
+
+            using (Matrix3 rhs = new Matrix3(0.0f, 0.1f, 0.2f, 1.0f, 1.1f, 1.2f, 2.0f, 2.1f, 2.2f))
+            {
+                try
+                {
+                    testingTarget.MultiplyAssign(rhs);
+                }
+                catch (Exception e)
+                {
+                    tlog.Debug(tag, e.Message.ToString());
+                    Assert.Fail("Caught Exception : Failed!");
+                }
+            }
+
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3MultiplyAssign END (OK)");
+        }
+
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix ValueOfIndex with signle index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix.ValueOfIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void Matrix3ValueOfIndexSingleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrix3ValueOfIndexSingleIndex START");
+
+            Matrix3 testingTarget = new Matrix3(0.0f, 1.0f, 2.0f, 0.1f, 1.1f, 2.1f, 0.2f, 1.2f, 2.2f);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix instance.");
+
+            for(uint index = 0; index < 9; ++index)
+            {
+                float expectResult = (index / 3) * 0.1f + (index % 3) * 1.0f;
+                Assert.AreEqual(expectResult, testingTarget.ValueOfIndex(index), "The value of index is not correct!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3ValueOfIndexSingleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix3 ValueOfIndex with double index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix3.ValueOfIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void Matrix3ValueOfIndexDoubleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrix3ValueOfIndexDoubleIndex START");
+
+            Matrix3 testingTarget = new Matrix3(0.0f, 1.0f, 2.0f, 0.1f, 1.1f, 2.1f, 0.2f, 1.2f, 2.2f);
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix instance.");
+
+            for(uint indexRow = 0; indexRow < 3; ++indexRow)
+            {
+                for(uint indexColumn = 0; indexColumn < 3; ++indexColumn)
+                {
+                    float expectResult = indexColumn * 0.1f + indexRow * 1.0f;
+                    Assert.AreEqual(expectResult, testingTarget.ValueOfIndex(indexRow, indexColumn), "The value of index is not correct!");
+                }
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3ValueOfIndexDoubleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix3 SetValueAtIndex with signle index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix3.SetValueAtIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void Matrix3SetValueAtIndexSingleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrix3SetValueAtIndexSingleIndex START");
+            Matrix3 testingTarget = new Matrix3();
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix instance.");
+
+            for(uint index = 0; index < 9; ++index)
+            {
+                float expectResult = (index / 3) * 0.1f + (index % 3) * 1.0f;
+                testingTarget.SetValueAtIndex(index, expectResult);
+                Assert.AreEqual(expectResult, testingTarget[index], "The value of index is not correct!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3SetValueAtIndexSingleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Matrix3 SetValueAtIndex with double index.")]
+        [Property("SPEC", "Tizen.NUI.Matrix3.SetValueAtIndex M")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void Matrix3SetValueAtIndexDoubleIndex()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrix3SetValueAtIndexDoubleIndex START");
+            Matrix3 testingTarget = new Matrix3();
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix instance.");
+
+            for(uint indexRow = 0; indexRow < 3; ++indexRow)
+            {
+                for(uint indexColumn = 0; indexColumn < 3; ++indexColumn)
+                {
+                    float expectResult = indexColumn * 0.1f + indexRow * 1.0f;
+                    testingTarget.SetValueAtIndex(indexRow, indexColumn, expectResult);
+                    Assert.AreEqual(expectResult, testingTarget.ValueOfIndex(indexRow, indexColumn), "The value of index is not correct!");
+                }
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3SetValueAtIndexDoubleIndex END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Test Tizen.NUI.Matrix3.operator * with Matrix3.")]
+        [Property("SPEC", "Tizen.NUI.Matrix3.operator *() A")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void Matrix3MultiplyOperator()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrix3MultiplyOperator START");
+            Matrix3 testingTarget = new Matrix3();
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix instance.");
+
+            try
+            {
+                Matrix3 rhs = new Matrix3(1.0f, 0.0f, 0.0f, 0.0f, 2.0f, 0.0f, 0.0f, 0.0f, 3.0f);
+                Matrix3 ret = testingTarget * rhs;
+                rhs.Dispose();
+                ret.Dispose();
+            }
+            catch (Exception e)
+            {
+                tlog.Debug(tag, e.Message.ToString());
+                Assert.Fail("Caught Exception : Failed!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3MultiplyOperator END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Test Tizen.NUI.Matrix3.operator * with Vector3.")]
+        [Property("SPEC", "Tizen.NUI.Matrix3.operator *() A")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void Matrix3MultiplyOperatorWithVector3()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrix3MultiplyOperatorWithVector3 START");
+            Matrix3 testingTarget = new Matrix3();
+            Assert.IsNotNull(testingTarget, "Can't create success object Matrix.");
+            Assert.IsInstanceOf<Matrix3>(testingTarget, "Should return Matrix instance.");
+
+            try
+            {
+                Vector3 rhs = new Vector3();
+                Vector3 ret = testingTarget * rhs;
+                rhs.Dispose();
+                ret.Dispose();
+            }
+            catch (Exception e)
+            {
+                tlog.Debug(tag, e.Message.ToString());
+                Assert.Fail("Caught Exception : Failed!");
+            }
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3MultiplyOperatorWithVector4 END (OK)");
+        }
+
+        [Test]
+        [Category("P1")]
+        [Description("Test this[uint index]. Check whether this[uint index] returns expected value or not.")]
+        [Property("SPEC", "Tizen.NUI.Matrix3.this[uint] A")]
+        [Property("SPEC_URL", "-")]
+        [Property("CRITERIA", "MR")]
+        [Property("AUTHOR", "Eunki Hong, eunkiki.hong@samsung.com")]
+        public void this_SET_GET_VALUE()
+        {
+            /* TEST CODE */
+            tlog.Debug(tag, $"Matrix3this_SET_GET_VALUE START");
+            Matrix3 testingTarget = new Matrix3();
+            try
+            {
+                testingTarget[0] = 100.0f;
+                testingTarget[1] = 200.0f;
+            }
+            catch (Exception e)
+            {
+                tlog.Debug(tag, e.Message.ToString());
+                Assert.Fail("Caught Exception : Failed!");
+            }
+            Assert.AreEqual(100.0f, testingTarget[0], "The value of index[0] is not correct!");
+            Assert.AreEqual(200.0f, testingTarget[1], "The value of index[1] is not correct!");
+            testingTarget.Dispose();
+            tlog.Debug(tag, $"Matrix3this_SET_GET_VALUE END (OK)");
+        }
     }
 }
index ac20da7..58dd238 100755 (executable)
@@ -25,7 +25,7 @@
 
   <Import Project="..\Common\dependencies.props" />
   <ItemGroup>
-    <PackageReference Include="Tizen.NET" Version="10.0.0.17099">
+    <PackageReference Include="Tizen.NET" Version="10.0.0.*">
       <ExcludeAssets>Runtime</ExcludeAssets>
     </PackageReference>
     <PackageReference Include="Tizen.NET.Sdk" Version="1.1.6" />
index 0a8b1a6..6fe4af3 100755 (executable)
@@ -27,11 +27,6 @@ namespace Tizen.NUI.Components.Devel.Tests
                 return base.AccessibilityGetName();
             }
 
-            public bool MyAccessibilityShouldReportZeroChildren()
-            {
-                return base.AccessibilityShouldReportZeroChildren();
-            }
-
             public bool MyHandleControlStateOnTouch(Touch touch)
             {
                 return base.HandleControlStateOnTouch(touch);
@@ -108,7 +103,6 @@ namespace Tizen.NUI.Components.Devel.Tests
 
             testingTarget.Text = "Button";
             tlog.Debug(tag, "AccessibilityGetName : " + testingTarget.MyAccessibilityGetName());
-            tlog.Debug(tag, "AccessibilityShouldReportZeroChildren : " + testingTarget.MyAccessibilityShouldReportZeroChildren());
 
             testingTarget.Dispose();
             tlog.Debug(tag, $"ButtonAccessibilityGetName END (OK)");
index 41d5924..119cdd4 100755 (executable)
@@ -118,10 +118,6 @@ namespace Tizen.NUI.Components.Devel.Tests
                 Pickers = new PickerStyle()
                 {
                     StartScrollOffset = new Size(10, 10),
-                    Divider = new ViewStyle()
-                    {
-                        Position = new Position(30, 40),
-                    }
                 },
                 CellPadding = new Size2D(20, 20),
             };
@@ -212,10 +208,6 @@ namespace Tizen.NUI.Components.Devel.Tests
                 Pickers = new PickerStyle()
                 {
                     StartScrollOffset = new Size(10, 10),
-                    Divider = new ViewStyle()
-                    {
-                        Position = new Position(30, 40),
-                    }
                 },
                 CellPadding = new Size2D(20, 20),
             };
index bef9c94..836f4f9 100755 (executable)
@@ -85,15 +85,7 @@ namespace Tizen.NUI.Components.Devel.Tests
         {
             tlog.Debug(tag, $"PickerConstructorWithPickStyle START");
 
-            PickerStyle style = new PickerStyle()
-            {
-                Divider = new ViewStyle()
-                {
-                    Focusable = true,
-                    Size = new Size(100, 2),
-                    Position = new Position(100, 200)
-                },
-            };
+            PickerStyle style = new PickerStyle() { };
 
             var testingTarget = new Picker(style);
             Assert.IsNotNull(testingTarget, "null handle");
index f0c54ce..55706d0 100755 (executable)
@@ -36,11 +36,6 @@ namespace Tizen.NUI.Components.Devel.Tests
             {
                 base.OnEnabled(enabled);
             }
-
-            public bool AccessibilityShouldReportZeroChildrenImpl()
-            {
-                return base.AccessibilityShouldReportZeroChildren();
-            }
         }
 
         [Test]
@@ -105,31 +100,5 @@ namespace Tizen.NUI.Components.Devel.Tests
             testingTarget.Dispose();
             tlog.Debug(tag, $"ProgressOnEnabled END (OK)");
         }
-
-        [Test]
-        [Category("P1")]
-        [Description("Progress AccessibilityShouldReportZeroChildren.")]
-        [Property("SPEC", "Tizen.NUI.Components.Progress.AccessibilityShouldReportZeroChildren M")]
-        [Property("SPEC_URL", "-")]
-        [Property("CRITERIA", "MR")]
-        [Property("COVPARAM", "")]
-        [Property("AUTHOR", "guowei.wang@samsung.com")]
-        public void ProgressAccessibilityShouldReportZeroChildren()
-        {
-            tlog.Debug(tag, $"ProgressAccessibilityShouldReportZeroChildren START");
-
-            var testingTarget = new ProgressImpl()
-            {
-                Size = new Size(100, 200)
-            };
-            Assert.IsNotNull(testingTarget, "null handle");
-            Assert.IsInstanceOf<ProgressImpl>(testingTarget, "Should return ProgressImpl instance.");
-
-            var result = testingTarget.AccessibilityShouldReportZeroChildrenImpl();
-            tlog.Debug(tag, "AccessibilityShouldReportZeroChildren : " + result);
-
-            testingTarget.Dispose();
-            tlog.Debug(tag, $"ProgressAccessibilityShouldReportZeroChildren END (OK)");
-        }
     }
 }
index 83da3e6..b7a7b30 100755 (executable)
@@ -608,10 +608,10 @@ namespace Tizen.NUI.Components.Devel.Tests
             Assert.IsInstanceOf<ScrollableBase>(testingTarget, "Should return ScrollableBase instance.");
 
             testingTarget.FadeScrollbar = false;
-            Assert.AreEqaul(false, testingTarget.FadeScrollbar, "Should be equal.");
+            Assert.AreEqual(false, testingTarget.FadeScrollbar, "Should be equal.");
 
             testingTarget.FadeScrollbar = true;
-            Assert.AreEqaul(true, testingTarget.FadeScrollbar, "Should be equal.");
+            Assert.AreEqual(true, testingTarget.FadeScrollbar, "Should be equal.");
 
             testingTarget.Dispose();
             tlog.Debug(tag, $"ScrollableBaseFadeScrollbar END (OK)");
index 53df9c6..dcc814c 100755 (executable)
@@ -52,11 +52,6 @@ namespace Tizen.NUI.Components.Devel.Tests
             public MySlider() : base()
             { }
 
-            public bool OnAccessibilityShouldReportZeroChildren()
-            {
-                return base.AccessibilityShouldReportZeroChildren();
-            }
-
             public void MyOnUpdate()
             {
                 base.OnUpdate();
@@ -549,34 +544,6 @@ namespace Tizen.NUI.Components.Devel.Tests
 
         [Test]
         [Category("P1")]
-        [Description("Slider AccessibilityShouldReportZeroChildren.")]
-        [Property("SPEC", "Tizen.NUI.Components.Slider.AccessibilityShouldReportZeroChildren M")]
-        [Property("SPEC_URL", "-")]
-        [Property("CRITERIA", "MR")]
-        [Property("COVPARAM", "")]
-        [Property("AUTHOR", "guowei.wang@samsung.com")]
-        [Obsolete]
-        public void SliderAccessibilityShouldReportZeroChildren()
-        {
-            tlog.Debug(tag, $"SliderAccessibilityShouldReportZeroChildren START");
-
-            var testingTarget = new MySlider()
-            {
-                Direction = Slider.DirectionType.Vertical,
-                IsEnabled = true,
-            };
-            Assert.IsNotNull(testingTarget, "null handle");
-            Assert.IsInstanceOf<Slider>(testingTarget, "Should return Slider instance.");
-
-            var result = testingTarget.OnAccessibilityShouldReportZeroChildren();
-            tlog.Debug(tag, "AccessibilityShouldReportZeroChildren : " + result);
-
-            testingTarget.Dispose();
-            tlog.Debug(tag, $"SliderAccessibilityShouldReportZeroChildren END (OK)");
-        }
-
-        [Test]
-        [Category("P1")]
         [Description("Slider OnUpdate.")]
         [Property("SPEC", "Tizen.NUI.Components.Slider.OnUpdate M")]
         [Property("SPEC_URL", "-")]
index 266e569..c34bc00 100755 (executable)
@@ -34,11 +34,6 @@ namespace Tizen.NUI.Components.Devel.Tests
             {
                 base.RemoveView(view);
             }
-
-            public void OnSelect(int index)
-            {
-                base.Select(index);
-            }
         }
 
         [SetUp]
@@ -117,8 +112,6 @@ namespace Tizen.NUI.Components.Devel.Tests
             testingTarget.OnAddView(dummy1);
             testingTarget.OnAddView(dummy2);
 
-            testingTarget.OnSelect(0);
-
             try
             {
                 testingTarget.OnRemoveView(dummy1);
index 3d2623c..fe4cd84 100755 (executable)
@@ -58,13 +58,7 @@ namespace Tizen.NUI.Components.Devel.Tests
 
             TimePickerStyle ts = new TimePickerStyle()
             {
-                Pickers = new PickerStyle()
-                {
-                    Divider = new ViewStyle()
-                    {
-                        Position = new Position(100, 100),
-                    }
-                }
+                Pickers = new PickerStyle(),
             };
 
             var testingTarget = new TimePicker(ts);
@@ -219,10 +213,6 @@ namespace Tizen.NUI.Components.Devel.Tests
                 Pickers = new PickerStyle()
                 {
                     StartScrollOffset = new Size(10, 10),
-                    Divider = new ViewStyle()
-                    {
-                        Position = new Position(30, 40),
-                    }
                 },
                 CellPadding = new Size2D(20, 20),
             };