diff --git a/wmserver/include/window_zorder_policy.h b/wmserver/include/window_zorder_policy.h index bb819c33..2b218aea 100644 --- a/wmserver/include/window_zorder_policy.h +++ b/wmserver/include/window_zorder_policy.h @@ -58,10 +58,11 @@ private: { WindowType::WINDOW_TYPE_VOLUME_OVERLAY, 112 }, { WindowType::WINDOW_TYPE_NAVIGATION_BAR, 113 }, { WindowType::WINDOW_TYPE_KEYGUARD, 114 }, - { WindowType::WINDOW_TYPE_DRAGGING_EFFECT, 115 }, - { WindowType::WINDOW_TYPE_POINTER, 116 }, - { WindowType::WINDOW_TYPE_BOOT_ANIMATION, 117 }, - { WindowType::WINDOW_TYPE_FREEZE_DISPLAY, 118 }, + // reserve 115 for app window above keyguard, 116 for input method window above keyguard + { WindowType::WINDOW_TYPE_DRAGGING_EFFECT, 117 }, + { WindowType::WINDOW_TYPE_POINTER, 118 }, + { WindowType::WINDOW_TYPE_BOOT_ANIMATION, 119 }, + { WindowType::WINDOW_TYPE_FREEZE_DISPLAY, 120 }, }; }; } diff --git a/wmserver/src/window_node_container.cpp b/wmserver/src/window_node_container.cpp index 500e833f..210fa0e2 100644 --- a/wmserver/src/window_node_container.cpp +++ b/wmserver/src/window_node_container.cpp @@ -1368,7 +1368,8 @@ void WindowNodeContainer::RaiseInputMethodWindowPriorityIfNeeded(const sptrchildren_.end()) { WLOGFI("raise input method float window priority."); - node->priority_ = zorderPolicy_->GetWindowPriority(WindowType::WINDOW_TYPE_KEYGUARD) + 1; + node->priority_ = zorderPolicy_->GetWindowPriority( + WindowType::WINDOW_TYPE_KEYGUARD) + 2; // 2: higher than keyguard and show when locked window } }