openharmony/ability_ability_runtime
1
0
Fork 0
mirror of https://github.com/openharmony/ability_ability_runtime.git synced 2026-08-24 22:21:36 -04:00
Code Issues Packages Projects Releases Wiki Activity

fix differences

Browse Source 
Signed-off-by: renjianhao <renjianhao@h-partners.com>
This commit is contained in:
renjianhao
2026-02-13 16:11:11 +08:00
parent a31de6475e
commit f0fcca5041
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
frameworks/native/appkit/ability_runtime/app/js_ability_stage.cpp
+1 -1
View File
@@ -402,7 +402,7 @@ bool JsAbilityStage::CallOnPrepareTerminateAsync(napi_env env,
std::string JsAbilityStage::OnAcceptWant(const AAFwk::Want &want,
AppExecFwk::AbilityTransactionCallbackInfo<std::string> *callbackInfo, bool &isAsync)
{
TAG_LOGI(AAFwkTag::APPKIT, "OnAcceptWant called");
TAG_LOGD(AAFwkTag::APPKIT, "OnAcceptWant called");
AbilityStage::OnAcceptWant(want, callbackInfo, isAsync);
HandleScope handleScope(jsRuntime_);
frameworks/native/appkit/ability_runtime/context/js_system_configuration_updated_callback.cpp
+1 -1
View File
@@ -1,5 +1,5 @@
/*
* Copyright (c) 2023-2024 Huawei Device Co., Ltd.
* Copyright (c) 2026 Huawei Device Co., Ltd.
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
frameworks/native/appkit/app/ohos_application.cpp
+3
View File
@@ -1153,12 +1153,14 @@ bool OHOSApplication::isUpdateFontSize(Configuration &config, AbilityRuntime::Se
auto preLevle = ApplicationConfigurationManager::GetInstance().GetFontSetLevel();
if (level < preLevle) {
TAG_LOGW(AAFwkTag::APPKIT, "low level");
config.RemoveItem(AAFwk::GlobalConfigurationKey::SYSTEM_FONT_SIZE_SCALE);
return false;
}
std::string globalFontFollowSysteme = configuration_->GetItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE);
if (level == preLevle && !globalFontFollowSysteme.empty()) {
TAG_LOGW(AAFwkTag::APPKIT, "same level");
if (globalFontFollowSysteme.compare(ConfigurationInner::IS_APP_FONT_FOLLOW_SYSTEM) == 0) {
return true;
}
@@ -1167,6 +1169,7 @@ bool OHOSApplication::isUpdateFontSize(Configuration &config, AbilityRuntime::Se
}
// level > preLevle
TAG_LOGW(AAFwkTag::APPKIT, "high level");
configuration_->RemoveItem(AAFwk::GlobalConfigurationKey::APP_FONT_SIZE_SCALE);
ApplicationConfigurationManager::GetInstance().SetfontSetLevel(level);
return true;