From 5aa30aec97436544c92f78b1f20eb6ed27235c34 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Thu, 14 Apr 2022 17:35:53 +0900 Subject: [PATCH] [NUI] Add to set AccessibilityName and Description in some components - Some NUI Components have text parts and they need to be connected with Accessibillity features. (`AccessibilityName` and `AccessibiityDescription`) Signed-off-by: Seoyeon Kim --- src/Tizen.NUI.Components/Controls/AlertDialog.cs | 13 +++++++++++-- src/Tizen.NUI.Components/Controls/Button.Internal.cs | 2 +- src/Tizen.NUI.Components/Controls/Button.cs | 1 - src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs | 11 ++++++++++- .../Controls/RecyclerView/Item/DefaultGridItem.cs | 10 +++++++++- .../Controls/RecyclerView/Item/DefaultLinearItem.cs | 4 +--- 6 files changed, 32 insertions(+), 9 deletions(-) diff --git a/src/Tizen.NUI.Components/Controls/AlertDialog.cs b/src/Tizen.NUI.Components/Controls/AlertDialog.cs index ba9e69a..c37f63b 100755 --- a/src/Tizen.NUI.Components/Controls/AlertDialog.cs +++ b/src/Tizen.NUI.Components/Controls/AlertDialog.cs @@ -1,5 +1,5 @@ /* - * Copyright(c) 2021 Samsung Electronics Co., Ltd. + * Copyright(c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -441,7 +441,7 @@ namespace Tizen.NUI.Components } /// - /// AccessibilityGetName. + /// Gets accessibility name. /// [EditorBrowsable(EditorBrowsableState.Never)] protected override string AccessibilityGetName() @@ -457,6 +457,15 @@ namespace Tizen.NUI.Components } /// + /// Gets accessibility description. + /// + [EditorBrowsable(EditorBrowsableState.Never)] + protected override string AccessibilityGetDescription() + { + return Message; + } + + /// /// Initialize AT-SPI object. /// [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI.Components/Controls/Button.Internal.cs b/src/Tizen.NUI.Components/Controls/Button.Internal.cs index ab4e503..69b1d69 100644 --- a/src/Tizen.NUI.Components/Controls/Button.Internal.cs +++ b/src/Tizen.NUI.Components/Controls/Button.Internal.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI.Components private bool styleApplied = false; /// - /// Get accessibility name. + /// Gets accessibility name. /// [EditorBrowsable(EditorBrowsableState.Never)] protected override string AccessibilityGetName() diff --git a/src/Tizen.NUI.Components/Controls/Button.cs b/src/Tizen.NUI.Components/Controls/Button.cs index 3496661..86bcef2 100755 --- a/src/Tizen.NUI.Components/Controls/Button.cs +++ b/src/Tizen.NUI.Components/Controls/Button.cs @@ -383,7 +383,6 @@ namespace Tizen.NUI.Components internal set { buttonText = value; - AccessibilityManager.Instance.SetAccessibilityAttribute(this, AccessibilityManager.AccessibilityAttribute.Label, buttonText.Text); } } diff --git a/src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs b/src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs index 5485227..f7532ba 100755 --- a/src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs +++ b/src/Tizen.NUI.Components/Controls/Navigation/AppBar.cs @@ -1,5 +1,5 @@ /* - * Copyright(c) 2021 Samsung Electronics Co., Ltd. + * Copyright(c) 2022 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -538,6 +538,15 @@ namespace Tizen.NUI.Components } } + /// + /// Gets accessibility name. + /// + [EditorBrowsable(EditorBrowsableState.Never)] + protected override string AccessibilityGetName() + { + return Title; + } + /// [EditorBrowsable(EditorBrowsableState.Never)] public override void OnInitialize() diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs index 6ac1af4..e691019 100755 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultGridItem.cs @@ -205,7 +205,6 @@ namespace Tizen.NUI.Components { itemLabel = value; layoutChanged = true; - AccessibilityManager.Instance.SetAccessibilityAttribute(this, AccessibilityManager.AccessibilityAttribute.Label, itemLabel.Text); } } @@ -477,6 +476,15 @@ namespace Tizen.NUI.Components } /// + /// Gets accessibility name. + /// + [EditorBrowsable(EditorBrowsableState.Never)] + protected override string AccessibilityGetName() + { + return itemLabel.Text; + } + + /// /// Initializes AT-SPI object. /// [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs index 1b7c77f..f09d29f 100755 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/Item/DefaultLinearItem.cs @@ -156,7 +156,6 @@ namespace Tizen.NUI.Components internal set { itemLabel = value; - AccessibilityManager.Instance.SetAccessibilityAttribute(this, AccessibilityManager.AccessibilityAttribute.Label, itemLabel.Text); } } @@ -210,7 +209,6 @@ namespace Tizen.NUI.Components internal set { itemSubLabel = value; - AccessibilityManager.Instance.SetAccessibilityAttribute(this, AccessibilityManager.AccessibilityAttribute.Label, itemSubLabel.Text); } } @@ -360,7 +358,7 @@ namespace Tizen.NUI.Components } /// - /// Get accessibility name. + /// Gets accessibility name. /// [EditorBrowsable(EditorBrowsableState.Never)] protected override string AccessibilityGetName() -- 2.7.4