From d7fe67ec4e18a6bfdd5af5d8e2200a3e31c5a791 Mon Sep 17 00:00:00 2001 From: Swift Kim Date: Mon, 25 Apr 2022 15:21:49 +0900 Subject: [PATCH] Unsupport the invert colors accessibility feature --- .../platform/tizen/accessibility_settings.cc | 34 +++++-------------- shell/platform/tizen/accessibility_settings.h | 4 +-- 2 files changed, 10 insertions(+), 28 deletions(-) diff --git a/shell/platform/tizen/accessibility_settings.cc b/shell/platform/tizen/accessibility_settings.cc index 84a3e4ca0da2d..cc09eace2d75f 100644 --- a/shell/platform/tizen/accessibility_settings.cc +++ b/shell/platform/tizen/accessibility_settings.cc @@ -32,16 +32,6 @@ AccessibilitySettings::AccessibilitySettings(FlutterTizenEngine* engine) #endif #ifdef TV_PROFILE - bool nagative_color = false; - ret = system_settings_get_value_bool( - SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR, &nagative_color); - if (ret != SYSTEM_SETTINGS_ERROR_NONE) { - FT_LOG(Error) << "Failed to get value of accessibility negative color."; - } - system_settings_set_changed_cb( - SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR, - OnAccessibilityFeatureStateChanged, this); - int high_contrast = 0; ret = system_settings_get_value_int( SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST, &high_contrast); @@ -49,9 +39,9 @@ AccessibilitySettings::AccessibilitySettings(FlutterTizenEngine* engine) FT_LOG(Error) << "Failed to get value of accessibility high contrast."; } system_settings_set_changed_cb(SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST, - OnAccessibilityFeatureStateChanged, this); + OnHighContrastStateChanged, this); - engine_->UpdateAccessibilityFeatures(nagative_color, high_contrast); + engine_->UpdateAccessibilityFeatures(false, high_contrast); #endif } @@ -60,34 +50,26 @@ AccessibilitySettings::~AccessibilitySettings() { system_settings_unset_changed_cb(SYSTEM_SETTINGS_KEY_ACCESSIBILITY_TTS); #endif #ifdef TV_PROFILE - system_settings_unset_changed_cb( - SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR); system_settings_unset_changed_cb( SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST); #endif } -void AccessibilitySettings::OnAccessibilityFeatureStateChanged( +void AccessibilitySettings::OnHighContrastStateChanged( system_settings_key_e key, void* user_data) { #ifdef TV_PROFILE auto* self = reinterpret_cast(user_data); - bool nagative_color = false; - int ret = system_settings_get_value_bool( - SYSTEM_SETTINGS_KEY_ACCESSIBILITY_NEGATIVE_COLOR, &nagative_color); - if (ret != SYSTEM_SETTINGS_ERROR_NONE) { - FT_LOG(Error) << "Failed to get value of accessibility negative color."; - } - - int high_contrast = 0; - ret = system_settings_get_value_int( - SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST, &high_contrast); + int enabled = 0; + int ret = system_settings_get_value_int( + SYSTEM_SETTINGS_KEY_ACCESSIBILITY_HIGHCONTRAST, &enabled); if (ret != SYSTEM_SETTINGS_ERROR_NONE) { FT_LOG(Error) << "Failed to get value of accessibility high contrast."; + return; } - self->engine_->UpdateAccessibilityFeatures(nagative_color, high_contrast); + self->engine_->UpdateAccessibilityFeatures(false, enabled); #endif } diff --git a/shell/platform/tizen/accessibility_settings.h b/shell/platform/tizen/accessibility_settings.h index 72de4ac7d97ec..f986f91f84093 100644 --- a/shell/platform/tizen/accessibility_settings.h +++ b/shell/platform/tizen/accessibility_settings.h @@ -17,8 +17,8 @@ class AccessibilitySettings { virtual ~AccessibilitySettings(); private: - static void OnAccessibilityFeatureStateChanged(system_settings_key_e key, - void* user_data); + static void OnHighContrastStateChanged(system_settings_key_e key, + void* user_data); static void OnScreenReaderStateChanged(system_settings_key_e key, void* user_data);