[NUI][AT-SPI] Promote ReadingInfoTypes to Container
authorArtur Świgoń <a.swigon@samsung.com>
Thu, 28 Mar 2024 12:47:58 +0000 (13:47 +0100)
committerJaehyun Cho <jaehyun0cho@gmail.com>
Tue, 16 Apr 2024 09:40:13 +0000 (18:40 +0900)
This way both View and Layer can use this API.

src/Tizen.NUI/src/internal/Interop/Interop.ControlDevel.cs
src/Tizen.NUI/src/public/BaseComponents/ViewAccessibility.cs
src/Tizen.NUI/src/public/Common/Container.cs

index f002d0a..ce2b034 100755 (executable)
@@ -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")]
index e44f6a1..12424fd 100755 (executable)
@@ -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 ******************* //
         ///////////////////////////////////////////////////////////////////
 
index da75095..5bb920c 100755 (executable)
@@ -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)