From 0b2d3a120096a790160622e904441270210ddd20 Mon Sep 17 00:00:00 2001 From: Shinwoo Kim Date: Tue, 1 Jun 2021 11:08:06 +0900 Subject: [PATCH 1/1] Revert "[Tizen][AT-SPI] Set default value of ReadingInfoTypes" This reverts commit 21ca0977fc96c16cf990be1f096b205800e385ca. --- .../utc-Dali-Accessibility-Controls-BridgeUp.cpp | 16 ---------------- .../internal/controls/control/control-data-impl.cpp | 9 --------- 2 files changed, 25 deletions(-) diff --git a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp index fdd8f10..c68e84f 100644 --- a/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp +++ b/automated-tests/src/dali-toolkit-internal/utc-Dali-Accessibility-Controls-BridgeUp.cpp @@ -460,22 +460,6 @@ int UtcDaliControlReadingInfoType(void) auto control = Control::New(); auto reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control); - - for ( auto i = 0u; i < 4; ++i) - DALI_TEST_CHECK ( reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]); - - reading_info_type[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = false; - reading_info_type[Dali::Accessibility::ReadingInfoType::STATE] = false; - reading_info_type[Dali::Accessibility::ReadingInfoType::NAME] = false; - reading_info_type[Dali::Accessibility::ReadingInfoType::ROLE] = false; - - DevelControl::SetAccessibilityReadingInfoType(control, reading_info_type); - - reading_info_type = DevelControl::GetAccessibilityReadingInfoType(control); - - for ( auto i = 0u; i < 4; ++i) - DALI_TEST_CHECK ( false == reading_info_type[ static_cast< Dali::Accessibility::ReadingInfoType >( i ) ]); - reading_info_type[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = true; reading_info_type[Dali::Accessibility::ReadingInfoType::STATE] = true; reading_info_type[Dali::Accessibility::ReadingInfoType::NAME] = true; diff --git a/dali-toolkit/internal/controls/control/control-data-impl.cpp b/dali-toolkit/internal/controls/control/control-data-impl.cpp index d5e77cb..8aa43d4 100644 --- a/dali-toolkit/internal/controls/control/control-data-impl.cpp +++ b/dali-toolkit/internal/controls/control/control-data-impl.cpp @@ -1474,15 +1474,6 @@ Dali::Accessibility::ReadingInfoTypes Control::Impl::GetAccessibilityReadingInfo { place->Get(value); } - else - { - Dali::Accessibility::ReadingInfoTypes types; - types[Dali::Accessibility::ReadingInfoType::NAME] = true; - types[Dali::Accessibility::ReadingInfoType::ROLE] = true; - types[Dali::Accessibility::ReadingInfoType::DESCRIPTION] = true; - types[Dali::Accessibility::ReadingInfoType::STATE] = true; - return types; - } if(value.empty()) { -- 2.7.4