From 42adbd511130be659d83c39be2ae14e889eb1e05 Mon Sep 17 00:00:00 2001 From: whqwe Date: Wed, 22 Nov 2023 21:28:26 +0800 Subject: [PATCH] rename to navigation indicator Signed-off-by: whqwe --- interfaces/innerkits/wm/wm_common.h | 2 +- .../kits/napi/window_runtime/window_napi/js_window.cpp | 2 +- .../napi/window_runtime/window_napi/js_window_utils.cpp | 4 ++-- previewer/include/wm_common.h | 2 +- window_scene/session/host/src/scene_session.cpp | 2 +- window_scene/session_manager/src/scene_session_manager.cpp | 6 +++--- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/interfaces/innerkits/wm/wm_common.h b/interfaces/innerkits/wm/wm_common.h index e630eec46c..0327db4c0f 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 cbd3775efa..62f10672b6 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 3798cf7677..28c1cf1325 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 44a1c695f6..accb96019b 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 4b09a155e5..876fb89edb 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 2ff21f1e87..c40e78a436 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); } } }; -- Gitee