From 752aff61efbf6494e99d0b0528229b3c4e09ad21 Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Thu, 21 Jan 2021 14:24:32 +0900 Subject: [PATCH] Revert "[NUI] Add DeleteAccessibilityAttribute" This reverts commit d6a57e870b299c228b5ac11d4d2970758906e49c. --- src/Tizen.NUI.Components/Controls/Button.Internal.cs | 1 - src/Tizen.NUI.Components/Controls/Loading.cs | 1 - src/Tizen.NUI.Components/Controls/ScrollableBase.cs | 1 - .../src/internal/Interop/Interop.AccessibilityManager.cs | 3 --- .../src/public/Accessibility/AccessibilityManager.cs | 12 ------------ 5 files changed, 18 deletions(-) diff --git a/src/Tizen.NUI.Components/Controls/Button.Internal.cs b/src/Tizen.NUI.Components/Controls/Button.Internal.cs index ca6dcf3..82ff7a5 100755 --- a/src/Tizen.NUI.Components/Controls/Button.Internal.cs +++ b/src/Tizen.NUI.Components/Controls/Button.Internal.cs @@ -362,7 +362,6 @@ namespace Tizen.NUI.Components if (type == DisposeTypes.Explicit) { - AccessibilityManager.Instance.DeleteAccessibilityAttribute(this); Extension?.OnDispose(this); if (buttonIcon != null) diff --git a/src/Tizen.NUI.Components/Controls/Loading.cs b/src/Tizen.NUI.Components/Controls/Loading.cs index f929646..2e192f8 100755 --- a/src/Tizen.NUI.Components/Controls/Loading.cs +++ b/src/Tizen.NUI.Components/Controls/Loading.cs @@ -246,7 +246,6 @@ namespace Tizen.NUI.Components //Called by User //Release your own managed resources here. //You should release all of your own disposable objects here. - AccessibilityManager.Instance.DeleteAccessibilityAttribute(this); RemoveVisual("loadingImageVisual"); } diff --git a/src/Tizen.NUI.Components/Controls/ScrollableBase.cs b/src/Tizen.NUI.Components/Controls/ScrollableBase.cs index 1300858..90efec2 100755 --- a/src/Tizen.NUI.Components/Controls/ScrollableBase.cs +++ b/src/Tizen.NUI.Components/Controls/ScrollableBase.cs @@ -967,7 +967,6 @@ namespace Tizen.NUI.Components if (type == DisposeTypes.Explicit) { - AccessibilityManager.Instance.DeleteAccessibilityAttribute(this); StopOverShootingShadowAnimation(); StopScroll(); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.AccessibilityManager.cs b/src/Tizen.NUI/src/internal/Interop/Interop.AccessibilityManager.cs index 91ce4a0..7deba36 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.AccessibilityManager.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.AccessibilityManager.cs @@ -20,9 +20,6 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_AccessibilityManager_SetAccessibilityAttribute")] public static extern void SetAccessibilityAttribute(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, int jarg3, string jarg4); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_AccessibilityManager_DeleteAccessibilityAttribute")] - public static extern void AccessibilityManager_DeleteAccessibilityAttribute(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_AccessibilityManager_GetAccessibilityAttribute")] public static extern string GetAccessibilityAttribute(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, int jarg3); diff --git a/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs b/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs index 6de9279..4295847 100755 --- a/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs +++ b/src/Tizen.NUI/src/public/Accessibility/AccessibilityManager.cs @@ -486,18 +486,6 @@ namespace Tizen.NUI.Accessibility Interop.AccessibilityManager.SetAccessibilityAttribute(SwigCPtr, View.getCPtr(view), (int)type, text); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - - /// - /// Delete the information of the specified view's accessibility attribute. - /// - /// The view to delete - /// This will be public opened after ACR done. Before ACR, need to be hidden as inhouse API. - [EditorBrowsable(EditorBrowsableState.Never)] - public void DeleteAccessibilityAttribute(View view) - { - Interop.AccessibilityManager.AccessibilityManager_DeleteAccessibilityAttribute(SwigCPtr, View.getCPtr(view)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } /// /// Gets the text of the specified view's accessibility attribute. -- 2.7.4