diff --git a/interfaces/innerkits/wm/wm_common.h b/interfaces/innerkits/wm/wm_common.h index e630eec46cb377bd01efcf7de410b494315de627..0327db4c0f7aa36fcebf61c54c8da9bac2cbf404 100644 --- a/interfaces/innerkits/wm/wm_common.h +++ b/interfaces/innerkits/wm/wm_common.h @@ -473,7 +473,7 @@ enum class AvoidAreaType : uint32_t { TYPE_CUTOUT, // cutout of screen TYPE_SYSTEM_GESTURE, // area for system gesture TYPE_KEYBOARD, // area for soft input keyboard - TYPE_AI_NAVIGATION_BAR, // area for AI navigation bar + TYPE_NAVIGATION_INDICATOR, // area for navigation indicator }; /** diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp index cbd3775efad200b3ff94a3f6ce8c82daed54118c..62f10672b6d4aa780214877986cc7671857dfa0a 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window.cpp @@ -2190,7 +2190,7 @@ napi_value JsWindow::OnGetWindowAvoidAreaSync(napi_env env, napi_callback_info i uint32_t resultValue = 0; napi_get_value_uint32(env, nativeMode, &resultValue); avoidAreaType = static_cast(resultValue); - errCode = ((avoidAreaType > AvoidAreaType::TYPE_AI_NAVIGATION_BAR) || + errCode = ((avoidAreaType > AvoidAreaType::TYPE_NAVIGATION_INDICATOR) || (avoidAreaType < AvoidAreaType::TYPE_SYSTEM)) ? WmErrorCode::WM_ERROR_INVALID_PARAM : WmErrorCode::WM_OK; } diff --git a/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp b/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp index 3798cf76771283b231d82da444a04d556ad30beb..28c1cf1325dcae98faca4314b2bb7f4a4ecc7609 100644 --- a/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp +++ b/interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp @@ -111,8 +111,8 @@ napi_value AvoidAreaTypeInit(napi_env env) static_cast(AvoidAreaType::TYPE_SYSTEM_GESTURE))); napi_set_named_property(env, objValue, "TYPE_KEYBOARD", CreateJsValue(env, static_cast(AvoidAreaType::TYPE_KEYBOARD))); - napi_set_named_property(env, objValue, "TYPE_AI_BAR", - CreateJsValue(env, static_cast(AvoidAreaType::TYPE_AI_NAVIGATION_BAR))); + napi_set_named_property(env, objValue, "TYPE_NAVIGATION_INDICATOR", + CreateJsValue(env, static_cast(AvoidAreaType::TYPE_NAVIGATION_INDICATOR))); return objValue; } diff --git a/previewer/include/wm_common.h b/previewer/include/wm_common.h index 44a1c695f6c70b0c933df88ac9e610684ab8f020..accb96019b297718cc4ce8af88b0270653685df9 100644 --- a/previewer/include/wm_common.h +++ b/previewer/include/wm_common.h @@ -455,7 +455,7 @@ enum class AvoidAreaType : uint32_t { TYPE_CUTOUT, // cutout of screen TYPE_SYSTEM_GESTURE, // area for system gesture TYPE_KEYBOARD, // area for soft input keyboard - TYPE_AI_NAVIGATION_BAR, // area for AI navigation bar + TYPE_NAVIGATION_INDICATOR, // area for navigation indicator }; /** diff --git a/window_scene/session/host/src/scene_session.cpp b/window_scene/session/host/src/scene_session.cpp index 4b09a155e5bb80da1159c4bf40f8b20c2c9d9094..876fb89edbcc8683868ccf8be2146e14b9b15d5e 100644 --- a/window_scene/session/host/src/scene_session.cpp +++ b/window_scene/session/host/src/scene_session.cpp @@ -763,7 +763,7 @@ AvoidArea SceneSession::GetAvoidAreaByType(AvoidAreaType type) session->GetCutoutAvoidArea(rect, avoidArea); return avoidArea; } - case AvoidAreaType::TYPE_AI_NAVIGATION_BAR: { + case AvoidAreaType::TYPE_NAVIGATION_INDICATOR: { session->GetAINavigationBarArea(rect, avoidArea); return avoidArea; } diff --git a/window_scene/session_manager/src/scene_session_manager.cpp b/window_scene/session_manager/src/scene_session_manager.cpp index 2ff21f1e875ea6c731deaf07f4ac6e51e4a6d0d1..c40e78a436178c1d459964887fa3b7c554912926 100644 --- a/window_scene/session_manager/src/scene_session_manager.cpp +++ b/window_scene/session_manager/src/scene_session_manager.cpp @@ -4958,7 +4958,7 @@ void SceneSessionManager::UpdateNormalSessionAvoidArea( return; } uint32_t start = static_cast(AvoidAreaType::TYPE_SYSTEM); - uint32_t end = static_cast(AvoidAreaType::TYPE_AI_NAVIGATION_BAR); + uint32_t end = static_cast(AvoidAreaType::TYPE_NAVIGATION_INDICATOR); for (uint32_t avoidType = start; avoidType <= end; avoidType++) { AvoidArea avoidArea = sceneSession->GetAvoidAreaByType(static_cast(avoidType)); ret = UpdateSessionAvoidAreaIfNeed( @@ -5020,9 +5020,9 @@ WSError SceneSessionManager::NotifyAINavigationBarShowStatus(bool isVisible, WSR if (sceneSession == nullptr) { continue; } - AvoidArea avoidArea = sceneSession->GetAvoidAreaByType(AvoidAreaType::TYPE_AI_NAVIGATION_BAR); + AvoidArea avoidArea = sceneSession->GetAvoidAreaByType(AvoidAreaType::TYPE_NAVIGATION_INDICATOR); UpdateSessionAvoidAreaIfNeed(persistentId, sceneSession, avoidArea, - AvoidAreaType::TYPE_AI_NAVIGATION_BAR); + AvoidAreaType::TYPE_NAVIGATION_INDICATOR); } } };