diff --git a/frameworks/acfwk/src/accessibility_config_impl.cpp b/frameworks/acfwk/src/accessibility_config_impl.cpp index 8c5fab61..c3d18e42 100644 --- a/frameworks/acfwk/src/accessibility_config_impl.cpp +++ b/frameworks/acfwk/src/accessibility_config_impl.cpp @@ -495,7 +495,7 @@ void AccessibilityConfig::Impl::UpdateHighContrastTextEnabled(const bool enabled } highContrastText_ = enabled; std::map>>::iterator it = - configObservers_.find(CONFIG_HIGH_CONTRASTE_TEXT); + configObservers_.find(CONFIG_HIGH_CONTRAST_TEXT); if (it == configObservers_.end()) { return; } @@ -596,7 +596,7 @@ void AccessibilityConfig::Impl::NotifyHighContrastTextChanged( if (observer) { ConfigValue configValue; configValue.highContrastText = state; - observer->OnConfigChanged(CONFIG_HIGH_CONTRASTE_TEXT, configValue); + observer->OnConfigChanged(CONFIG_HIGH_CONTRAST_TEXT, configValue); } else { HILOG_ERROR("end configObservers_ is null"); } diff --git a/interfaces/innerkits/acfwk/BUILD.gn b/interfaces/innerkits/acfwk/BUILD.gn index 9433fa0d..0ef8ac71 100755 --- a/interfaces/innerkits/acfwk/BUILD.gn +++ b/interfaces/innerkits/acfwk/BUILD.gn @@ -53,7 +53,6 @@ ohos_shared_library("accessibilityconfig") { external_deps = [ "ability_base:want", - "ability_runtime:abilitykit_native", "c_utils:utils", "hiviewdfx_hilog_native:libhilog", "ipc:ipc_core", diff --git a/interfaces/innerkits/acfwk/include/accessibility_config.h b/interfaces/innerkits/acfwk/include/accessibility_config.h index 4f8cf5ab..d9c3abca 100644 --- a/interfaces/innerkits/acfwk/include/accessibility_config.h +++ b/interfaces/innerkits/acfwk/include/accessibility_config.h @@ -23,7 +23,7 @@ namespace OHOS { namespace AccessibilityConfig { enum CONFIG_ID : int32_t { - CONFIG_HIGH_CONTRASTE_TEXT = 0, + CONFIG_HIGH_CONTRAST_TEXT = 0, CONFIG_INVERT_COLOR, CONFIG_DALTONIZATION_COLOR_FILTER, CONFIG_CONTENT_TIMEOUT, diff --git a/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp b/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp index a986ba12..0001afd0 100644 --- a/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp +++ b/interfaces/kits/napi/accessibility_config/src/napi_accessibility_config.cpp @@ -277,7 +277,7 @@ void NAccessibilityConfig::SetConfigExecute(napi_env env, void* data) } auto &instance = Singleton::GetInstance(); switch (callbackInfo->id_) { - case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT: + case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT: instance.SetHighContrastTextState(callbackInfo->boolConfig_); break; case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR: @@ -344,7 +344,7 @@ void NAccessibilityConfig::GetConfigComplete(napi_env env, napi_status status, v napi_get_undefined(env, &undefined); HILOG_INFO("callbackInfo->id_ = %{public}d", callbackInfo->id_); switch (callbackInfo->id_) { - case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT: + case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT: case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR: case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_ANIMATION_OFF: case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_SCREEN_MAGNIFICATION: @@ -399,7 +399,7 @@ void NAccessibilityConfig::GetConfigExecute(napi_env env, void* data) } auto &instance = Singleton::GetInstance(); switch (callbackInfo->id_) { - case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT: + case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT: instance.GetHighContrastTextState(callbackInfo->boolConfig_); break; case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR: @@ -482,7 +482,7 @@ napi_value NAccessibilityConfig::SetConfig(napi_env env, napi_callback_info info HILOG_INFO("ConfigID = %{public}d", obj->GetConfigId()); switch (obj->GetConfigId()) { - case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRASTE_TEXT: + case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_HIGH_CONTRAST_TEXT: case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_INVERT_COLOR: case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_ANIMATION_OFF: case OHOS::AccessibilityConfig::CONFIG_ID::CONFIG_SCREEN_MAGNIFICATION: diff --git a/interfaces/kits/napi/accessibility_config/src/native_module.cpp b/interfaces/kits/napi/accessibility_config/src/native_module.cpp index 9de67f1d..2cc4ca75 100644 --- a/interfaces/kits/napi/accessibility_config/src/native_module.cpp +++ b/interfaces/kits/napi/accessibility_config/src/native_module.cpp @@ -43,7 +43,7 @@ static napi_value InitHighContrastText(napi_env env) sizeof(configDesc) / sizeof(configDesc[0]), configDesc)); NAccessibilityConfigClass* nativeObj = - new(std::nothrow) NAccessibilityConfigClass(OHOS::AccessibilityConfig::CONFIG_HIGH_CONTRASTE_TEXT); + new(std::nothrow) NAccessibilityConfigClass(OHOS::AccessibilityConfig::CONFIG_HIGH_CONTRAST_TEXT); if (!nativeObj) { HILOG_ERROR("Failed to create nativeObj."); return nullptr; diff --git a/interfaces/kits/napi/src/napi_accessibility_config_observer.cpp b/interfaces/kits/napi/src/napi_accessibility_config_observer.cpp index 685bc60a..4f0ba3be 100644 --- a/interfaces/kits/napi/src/napi_accessibility_config_observer.cpp +++ b/interfaces/kits/napi/src/napi_accessibility_config_observer.cpp @@ -63,7 +63,7 @@ void NAccessibilityConfigObserver::OnConfigChanged(const ConfigValue &value) case CONFIG_AUDIO_BALANCE: NotifyFloatChanged2JS(value.audioBalance); break; - case CONFIG_HIGH_CONTRASTE_TEXT: + case CONFIG_HIGH_CONTRAST_TEXT: NotifyStateChanged2JS(value.highContrastText); break; case CONFIG_INVERT_COLOR: