Merge remote-tracking branch 'origin/API7' into tizen_5.5

diff --cc src/ElmSharp/ElmSharp/Window.cs
Simple merge

diff --cc src/Tizen.NUI/Tizen.NUI.sln
Simple merge

diff --cc src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
index 177b229,a6108bf..f8fe66e
--- 1/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
--- 2/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs
@@@ -901,21 -896,15 +896,26 @@@ namespace Tizen.NUI.BaseComponent
              }
          }
  
- 
-         internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ImageView obj)
+         /// <summary>
+         /// Get attribues, it is abstract function and must be override.
+         /// </summary>
+         /// <since_tizen> 6 </since_tizen>
+         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+         [EditorBrowsable(EditorBrowsableState.Never)]
+         protected override ViewStyle GetViewStyle()
          {
-             return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
+             return new ImageViewStyle();
 +        }
 +
 +        /// <summary>
 +        /// Get attribues, it is abstract function and must be override.
 +        /// </summary>
 +        /// <since_tizen> 6 </since_tizen>
 +        /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
 +        [EditorBrowsable(EditorBrowsableState.Never)]
 +        protected override ViewStyle GetViewStyle()
 +        {
 +            return new ImageViewStyle();
          }
  
          internal void SetImage(string url, Uint16Pair size)

diff --cc src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
index 8096acf,53f7408..635dc0a
--- 1/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
--- 2/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs
@@@ -1371,48 -1338,27 +1338,154 @@@ namespace Tizen.NUI.BaseComponent
              return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr;
          }
  
+         /// This will not be public opened.
+         [EditorBrowsable(EditorBrowsableState.Never)]
+         protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
+         {
+             Interop.TextLabel.delete_TextLabel(swigCPtr);
+         }
+ 
          /// <summary>
-         /// Dispose.
+         /// Get attribues, it is abstract function and must be override.
          /// </summary>
-         /// <since_tizen> 3 </since_tizen>
-         protected override void Dispose(DisposeTypes type)
+         /// <since_tizen> 6 </since_tizen>
+         /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
+         [EditorBrowsable(EditorBrowsableState.Never)]
+         protected override ViewStyle GetViewStyle()
+         {
+             return new TextLabelStyle();
+         }
+ 
+         internal static readonly BindableProperty TranslatableTextSelectorProperty = BindableProperty.Create("TranslatableTextSelector", typeof(Selector<string>), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) =>
+         {
+             var textLabel = (TextLabel)bindable;
++            textLabel.TranslatableTextSelector.Clone((Selector<string>)newValue);
++        },
++        defaultValueCreator: (bindable) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            return textLabel.TranslatableTextSelector;
++        });
++        internal static readonly BindableProperty TextSelectorProperty = BindableProperty.Create("TextSelector", typeof(Selector<string>), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) =>
 +        {
-             if (disposed)
++            var textLabel = (TextLabel)bindable;
++            textLabel.textSelector.Clone((Selector<string>)newValue);
++        },
++        defaultValueCreator: (bindable) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            return textLabel.textSelector;
++        });
++        internal static readonly BindableProperty FontFamilySelectorProperty = BindableProperty.Create("FontFamilySelector", typeof(Selector<string>), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            textLabel.fontFamilySelector.Clone((Selector<string>)newValue);
++        },
++        defaultValueCreator: (bindable) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            return textLabel.fontFamilySelector;
++        });
++        internal static readonly BindableProperty PointSizeSelectorProperty = BindableProperty.Create("PointSizeSelector", typeof(Selector<float?>), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            textLabel.pointSizeSelector.Clone((Selector<float?>)newValue);
++        },
++        defaultValueCreator: (bindable) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            return textLabel.pointSizeSelector;
++        });
++        internal static readonly BindableProperty TextColorSelectorProperty = BindableProperty.Create("TextColorSelector", typeof(Selector<Color>), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            textLabel.textColorSelector.Clone((Selector<Color>)newValue);
++        },
++        defaultValueCreator: (bindable) =>
++        {
++            var textLabel = (TextLabel)bindable;
++            return textLabel.textColorSelector;
++        });
++
++        private TriggerableSelector<string> translatableTextSelector;
++        private TriggerableSelector<string> TranslatableTextSelector
++        {
++            get
 +            {
-                 return;
++                if (null == translatableTextSelector)
++                {
++                    translatableTextSelector = new TriggerableSelector<string>(this, TranslatableTextProperty);
++                }
++                return translatableTextSelector;
 +            }
++        }
 +
-             //Release your own unmanaged resources here.
-             //You should not access any managed member here except static instance.
-             //because the execution order of Finalizes is non-deterministic.
++        private TriggerableSelector<string> _textSelector;
++        private TriggerableSelector<string> textSelector
++        {
++            get
++            {
++                if (null == _textSelector)
++                {
++                    _textSelector = new TriggerableSelector<string>(this, TextProperty);
++                }
++                return _textSelector;
++            }
++        }
++
++        private TriggerableSelector<string> _fontFamilySelector;
++        private TriggerableSelector<string> fontFamilySelector
++        {
++            get
++            {
++                if (null == _fontFamilySelector)
++                {
++                    _fontFamilySelector = new TriggerableSelector<string>(this, FontFamilyProperty);
++                }
++                return _fontFamilySelector;
++            }
++        }
 +
-             if (swigCPtr.Handle != global::System.IntPtr.Zero)
++        private TriggerableSelector<Color> _textColorSelector;
++        private TriggerableSelector<Color> textColorSelector
++        {
++            get
 +            {
-                 if (swigCMemOwn)
++                if (null == _textColorSelector)
 +                {
-                     swigCMemOwn = false;
-                     Interop.TextLabel.delete_TextLabel(swigCPtr);
++                    _textColorSelector = new TriggerableSelector<Color>(this, TextColorProperty);
 +                }
-                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
++                return _textColorSelector;
 +            }
++        }
 +
-             base.Dispose(type);
++        private TriggerableSelector<float?> _pointSizeSelector;
++        private TriggerableSelector<float?> pointSizeSelector
++        {
++            get
++            {
++                if (null == _pointSizeSelector)
++                {
++                    _pointSizeSelector = new TriggerableSelector<float?>(this, PointSizeProperty);
++                }
++                return _pointSizeSelector;
++            }
 +        }
 +
 +        /// <summary>
 +        /// Get attribues, it is abstract function and must be override.
 +        /// </summary>
 +        /// <since_tizen> 6 </since_tizen>
 +        /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API.
 +        [EditorBrowsable(EditorBrowsableState.Never)]
 +        protected override ViewStyle GetViewStyle()
 +        {
 +            return new TextLabelStyle();
 +        }
 +
 +        internal static readonly BindableProperty TranslatableTextSelectorProperty = BindableProperty.Create("TranslatableTextSelector", typeof(Selector<string>), typeof(TextLabel), null, propertyChanged: (bindable, oldValue, newValue) =>
 +        {
 +            var textLabel = (TextLabel)bindable;
              textLabel.TranslatableTextSelector.Clone((Selector<string>)newValue);
          },
          defaultValueCreator: (bindable) =>

diff --cc src/Tizen.NUI/src/public/BaseComponents/View.cs
Simple merge

diff --cc src/Tizen.NUI/src/public/Key.cs
Simple merge

diff --cc src/Tizen.NUI/src/public/PropertyValue.cs
index a4cab42,b0ea75d..31cf35b
--- 1/src/Tizen.NUI/src/public/PropertyValue.cs
--- 2/src/Tizen.NUI/src/public/PropertyValue.cs
+++ b/src/Tizen.NUI/src/public/PropertyValue.cs
@@@ -651,51 -643,31 +643,51 @@@ namespace Tizen.NU
              return ret;
          }
  
-         /// <summary>
-         /// Dispose.
-         /// </summary>
-         /// <since_tizen> 3 </since_tizen>
-         protected override void Dispose(DisposeTypes type)
+         /// This will not be public opened.
+         [EditorBrowsable(EditorBrowsableState.Never)]
+         protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr)
          {
-             if (disposed)
-             {
-                 return;
-             }
+             Interop.PropertyValue.delete_Property_Value(swigCPtr);
+         }
  
-             //Release your own unmanaged resources here.
-             //You should not access any managed member here except static instance.
-             //because the execution order of Finalizes is non-deterministic.
+         internal static PropertyValue CreateWithGuard(string value)
+         {
+             return value == null ? new PropertyValue() : new PropertyValue(value);
+         }
  
-             if (swigCPtr.Handle != global::System.IntPtr.Zero)
-             {
-                 if (swigCMemOwn)
-                 {
-                     swigCMemOwn = false;
-                     Interop.PropertyValue.delete_Property_Value(swigCPtr);
-                 }
-                 swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero);
-             }
-             base.Dispose(type);
+         internal static PropertyValue CreateWithGuard(Vector2 value)
+         {
+             return value == null ? new PropertyValue() : new PropertyValue(value);
+         }
+ 
+         internal static PropertyValue CreateWithGuard(Rectangle value)
+         {
+             return value == null ? new PropertyValue() : new PropertyValue(value);
+         }
+ 
+         internal static PropertyValue CreateWithGuard(Color value)
+         {
+             return value == null ? new PropertyValue() : new PropertyValue(value);
          }
 +
 +        internal static PropertyValue CreateWithGuard(string value)
 +        {
 +            return value == null ? new PropertyValue() : new PropertyValue(value);
 +        }
 +
 +        internal static PropertyValue CreateWithGuard(Vector2 value)
 +        {
 +            return value == null ? new PropertyValue() : new PropertyValue(value);
 +        }
 +
 +        internal static PropertyValue CreateWithGuard(Rectangle value)
 +        {
 +            return value == null ? new PropertyValue() : new PropertyValue(value);
 +        }
 +
 +        internal static PropertyValue CreateWithGuard(Color value)
 +        {
 +            return value == null ? new PropertyValue() : new PropertyValue(value);
 +        }
      }
  }

diff --cc src/Tizen.Sensor/Tizen.Sensor/SensorEnumerations.cs
Simple merge