openharmony/accessibility
1
0
Fork 0
mirror of https://gitee.com/openharmony/accessibility synced 2025-02-21 13:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

!1508 修复颜色反转无效值问题

Browse Source 
Merge pull request !1508 from 小发发/accessibility_241031
This commit is contained in:
openharmony_ci 2024-10-31 09:47:54 +00:00 committed by Gitee
commit f7d3ce90b7
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
frameworks/acfwk/src/accessibility_config_impl.cpp
View File

@ -1751,7 +1751,7 @@ uint32_t AccessibilityConfig::Impl::InvertDaltonizationColorInAtoHos(uint32_t fi
if (filter == DISPLAY_DALTONIZER_RED) {
return Protanomaly;
}
if (daltonizationColorFilter_ == DISPLAY_DALTONIZER_BLUE) {
if (filter == DISPLAY_DALTONIZER_BLUE) {
return Tritanomaly;
}
return filter;

8
services/aams/src/accessibility_settings_config.cpp
View File

@ -67,9 +67,11 @@ namespace {
const std::string SCREEN_READER_BUNDLE_ABILITY_NAME = "com.huawei.hmos.screenreader/AccessibilityExtAbility";
const std::string ACCESSIBILITY_SCREENREADER_ENABLED = "accessibility_screenreader_enabled";
constexpr int DOUBLE_CLICK_RESPONSE_TIME_MEDIUM = 300;
constexpr int DOUBLE_IGNORE_REPEAT_CLICK_TIME_SHORTEST = 100;
constexpr int DOUBLE_IGNORE_REPEAT_CLICK_TIME_SHORT = 400;
constexpr int DOUBLE_IGNORE_REPEAT_CLICK_TIME_MEDIUM = 700;
constexpr int DOUBLE_IGNORE_REPEAT_CLICK_TIME_LONG = 1000;
constexpr int DISPLAY_DALTONIZER_INVALID = -1;
constexpr int DISPLAY_DALTONIZER_GREEN = 12;
constexpr int DISPLAY_DALTONIZER_RED = 11;
constexpr int DISPLAY_DALTONIZER_BLUE = 13;
@ -383,6 +385,8 @@ RetError AccessibilitySettingsConfig::SetDaltonizationColorFilter(const uint32_t
daltonizationColorFilter = AccessibilityConfig::Protanomaly;
} else if (filter == DISPLAY_DALTONIZER_BLUE) {
daltonizationColorFilter = AccessibilityConfig::Tritanomaly;
} else if (filter == DISPLAY_DALTONIZER_INVALID) {
daltonizationColorFilter = 0;
}
auto ret = datashare_->PutIntValue(DALTONIZATION_COLOR_FILTER_KEY, static_cast<int32_t>(daltonizationColorFilter));
if (ret != RET_OK) {
@ -490,7 +494,9 @@ RetError AccessibilitySettingsConfig::SetIgnoreRepeatClickTime(const uint32_t ti
}
uint32_t ignoreRepeatClickTime = time;
if (time == DOUBLE_IGNORE_REPEAT_CLICK_TIME_SHORT) {
if (time == DOUBLE_IGNORE_REPEAT_CLICK_TIME_SHORTEST) {
ignoreRepeatClickTime = AccessibilityConfig::RepeatClickTimeoutShortest;
} else if (time == DOUBLE_IGNORE_REPEAT_CLICK_TIME_SHORT) {
ignoreRepeatClickTime = AccessibilityConfig::RepeatClickTimeoutShort;
} else if (time == DOUBLE_IGNORE_REPEAT_CLICK_TIME_MEDIUM) {
ignoreRepeatClickTime = AccessibilityConfig::RepeatClickTimeoutMedium;