Merge remote-tracking branch 'origin/API10' into tizen_7.0

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs
index f002d0a..ce2b034 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs
@@ -84,12 +84,12 @@ namespace Tizen.NUI
             public static extern void DaliToolkitDevelControlClearAccessibilityRelations(HandleRef arg1);
 
             [EditorBrowsable(EditorBrowsableState.Never)]
-            [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_SetAccessibilityReadingInfoType2")]
-            public static extern void DaliToolkitDevelControlSetAccessibilityReadingInfoTypes(HandleRef arg1, int arg2);
+            [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_SetReadingInfoTypes")]
+            public static extern void DaliAccessibilitySetReadingInfoTypes(HandleRef arg1, int arg2);
 
             [EditorBrowsable(EditorBrowsableState.Never)]
-            [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_GetAccessibilityReadingInfoType2")]
-            public static extern int DaliToolkitDevelControlGetAccessibilityReadingInfoTypes(HandleRef arg1);
+            [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Accessibility_GetReadingInfoTypes")]
+            public static extern int DaliAccessibilityGetReadingInfoTypes(HandleRef arg1);
 
             [EditorBrowsable(EditorBrowsableState.Never)]
             [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Toolkit_DevelControl_ClearAccessibilityHighlight")]

diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs
index 9dbd02d..0e61bf1 100755 (executable)
--- a/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs
+++ b/src/Tizen.NUI/src/internal/Interop/Interop.ViewProperty.cs
@@ -87,9 +87,6 @@ namespace Tizen.NUI
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_Property_ACCESSIBILITY_HIGHLIGHTABLE_get")]
             public static extern int AccessibilityHighlightableGet();
 
-            [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_Property_ACCESSIBILITY_ATTRIBUTES_get")]
-            public static extern int AccessibilityAttributesGet();
-
             [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_View_Property_DISPATCH_KEY_EVENTS_get")]
             public static extern int DispatchKeyEventsGet();
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
index e44f6a1..12424fd 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
@@ -198,33 +198,6 @@ namespace Tizen.NUI.BaseComponents
         }
 
         ///////////////////////////////////////////////////////////////////
-        // ********************* ReadingInfoType *********************** //
-        ///////////////////////////////////////////////////////////////////
-
-        /// <summary>
-        /// Sets accessibility reading information.
-        /// </summary>
-        /// <param name="type">Reading information type</param>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public void SetAccessibilityReadingInfoTypes(AccessibilityReadingInfoTypes type)
-        {
-            Interop.ControlDevel.DaliToolkitDevelControlSetAccessibilityReadingInfoTypes(SwigCPtr, (int)type);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-        }
-
-        /// <summary>
-        /// Gets accessibility reading information.
-        /// </summary>
-        /// <returns>Reading information type</returns>
-        [EditorBrowsable(EditorBrowsableState.Never)]
-        public AccessibilityReadingInfoTypes GetAccessibilityReadingInfoTypes()
-        {
-            AccessibilityReadingInfoTypes result = (AccessibilityReadingInfoTypes)Interop.ControlDevel.DaliToolkitDevelControlGetAccessibilityReadingInfoTypes(SwigCPtr);
-            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
-            return result;
-        }
-
-        ///////////////////////////////////////////////////////////////////
         // ******************** Accessibility States ******************* //
         ///////////////////////////////////////////////////////////////////
 

diff --git a/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs b/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs
index 825e27d..c46dd18 100755 (executable)
--- a/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/ViewEnum.cs
@@ -261,7 +261,6 @@ namespace Tizen.NUI.BaseComponents
             internal static readonly int AccessibilityTranslationDomain = Interop.ViewProperty.AccessibilityTranslationDomainGet();
             internal static readonly int AccessibilityRole = Interop.ViewProperty.AccessibilityRoleGet();
             internal static readonly int AccessibilityHighlightable = Interop.ViewProperty.AccessibilityHighlightableGet();
-            internal static readonly int AccessibilityAttributes = Interop.ViewProperty.AccessibilityAttributesGet();
             internal static readonly int DispatchKeyEvents = Interop.ViewProperty.DispatchKeyEventsGet();
             internal static readonly int AccessibilityHidden = Interop.ViewProperty.AccessibilityHiddenGet();
             internal static readonly int AutomationId = Interop.ViewProperty.AutomationIdGet();

diff --git a/src/Tizen.NUI/src/public/Common/Container.cs b/src/Tizen.NUI/src/public/Common/Container.cs
index da75095..5bb920c 100755 (executable)
--- a/src/Tizen.NUI/src/public/Common/Container.cs
+++ b/src/Tizen.NUI/src/public/Common/Container.cs
@@ -272,6 +272,29 @@ namespace Tizen.NUI
         [Obsolete("This has been deprecated in API9 and will be removed in API11. Use ChildCount property instead.")]
         public abstract UInt32 GetChildCount();
 
+        /// <summary>
+        /// Sets accessibility reading information.
+        /// </summary>
+        /// <param name="type">Reading information type</param>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public void SetAccessibilityReadingInfoTypes(AccessibilityReadingInfoTypes type)
+        {
+            Interop.ControlDevel.DaliAccessibilitySetReadingInfoTypes(SwigCPtr, (int)type);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+        }
+
+        /// <summary>
+        /// Gets accessibility reading information.
+        /// </summary>
+        /// <returns>Reading information type</returns>
+        [EditorBrowsable(EditorBrowsableState.Never)]
+        public AccessibilityReadingInfoTypes GetAccessibilityReadingInfoTypes()
+        {
+            AccessibilityReadingInfoTypes result = (AccessibilityReadingInfoTypes)Interop.ControlDevel.DaliAccessibilityGetReadingInfoTypes(SwigCPtr);
+            if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve();
+            return result;
+        }
+
         internal abstract View FindCurrentChildById(uint id);
 
         internal override void OnParentResourcesChanged(IEnumerable<KeyValuePair<string, object>> values)