openharmony/window_window_manager
1
0
Fork 0
mirror of https://gitee.com/openharmony/window_window_manager synced 2024-11-23 06:50:40 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

startAbility支持ssupportWindowMode编码规范整改

Browse Source 
Signed-off-by: zyh990312 <zhaoyuhang21@huawei.com>
This commit is contained in:
zyh990312 2024-11-16 16:34:30 +08:00
parent 80594c669f
commit 8714e38917
21 changed files with 56 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
test/common/mock/mock_IWindow.h
View File

@ -31,7 +31,7 @@ public:
MOCK_METHOD4(UpdateWindowRect, WMError(const struct Rect& rect, bool decoStatus, WindowSizeChangeReason reason,
const std::shared_ptr<RSTransaction>& rsTransaction));
MOCK_METHOD1(UpdateWindowMode, WMError(WindowMode mode));
MOCK_METHOD1(UpdateWindowWindowModeSupportType, WMError(uint32_t windowModeSupportType));
MOCK_METHOD1(UpdateWindowModeSupportType, WMError(uint32_t windowModeSupportType));
MOCK_METHOD1(UpdateFocusStatus, WMError(bool focused));
MOCK_METHOD2(UpdateAvoidArea, WMError(const sptr<AvoidArea>& avoidArea, AvoidAreaType type));
MOCK_METHOD1(UpdateWindowState, WMError(WindowState state));

2
test/fuzztest/wms/windowagent_fuzzer/window_agent_fuzzer.cpp
View File

@ -63,7 +63,7 @@ void CheckWindowAgentFunctionsPart1(sptr<WindowAgent> agent, const uint8_t* data
uint32_t windowModeSupportType;
startPos += GetObject<uint32_t>(windowModeSupportType, data + startPos, size - startPos);
agent->UpdateWindowWindowModeSupportType(windowModeSupportType);
agent->UpdateWindowModeSupportType(windowModeSupportType);
agent->UpdateFocusStatus(boolVal);
agent->NotifyForegroundInteractiveStatus(boolVal);

34
test/systemtest/wms/window_mode_support_info_test.cpp
View File

@ -25,7 +25,7 @@ using namespace testing::ext;
namespace OHOS {
namespace Rosen {
using Utils = WindowTestUtils;
class WindowWindowModeSupportTypeTest : public testing::Test {
class WindowModeSupportTypeTest : public testing::Test {
public:
static void SetUpTestCase();
static void TearDownTestCase();
@ -37,7 +37,7 @@ private:
static constexpr uint32_t WAIT_SYANC_US = 100000;
};
void WindowWindowModeSupportTypeTest::SetUpTestCase()
void WindowModeSupportTypeTest::SetUpTestCase()
{
auto display = DisplayManager::GetInstance().GetDisplayById(0);
ASSERT_TRUE((display != nullptr));
@ -45,11 +45,11 @@ void WindowWindowModeSupportTypeTest::SetUpTestCase()
Utils::InitByDisplayRect(displayRect);
}
void WindowWindowModeSupportTypeTest::TearDownTestCase()
void WindowModeSupportTypeTest::TearDownTestCase()
{
}
void WindowWindowModeSupportTypeTest::SetUp()
void WindowModeSupportTypeTest::SetUp()
{
fullAppInfo_1_ = {
.name = "FullWindow",
@ -71,17 +71,17 @@ void WindowWindowModeSupportTypeTest::SetUp()
};
}
void WindowWindowModeSupportTypeTest::TearDown()
void WindowModeSupportTypeTest::TearDown()
{
}
namespace {
/**
* @tc.name: WindowWindowModeSupportType01
* @tc.name: WindowModeSupportType01
* @tc.desc: SetRequestWindowModeSupportType | GetRequestWindowModeSupportType
* @tc.type: FUNC
*/
HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType01, Function | MediumTest | Level3)
HWTEST_F(WindowModeSupportTypeTest, WindowModeSupportType01, Function | MediumTest | Level3)
{
const sptr<Window>& window = Utils::CreateTestWindow(fullAppInfo_1_);
if (window == nullptr) {
@ -93,11 +93,11 @@ HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType01, Functio
}
/**
* @tc.name: WindowWindowModeSupportType02
* @tc.name: WindowModeSupportType02
* @tc.desc: windowModeSupportType test for single window, only support fullScreen mode
* @tc.type: FUNC
*/
HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType02, Function | MediumTest | Level3)
HWTEST_F(WindowModeSupportTypeTest, WindowModeSupportType02, Function | MediumTest | Level3)
{
const sptr<Window>& window = Utils::CreateTestWindow(fullAppInfo_1_);
if (window == nullptr) {
@ -121,11 +121,11 @@ HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType02, Functio
}
/**
* @tc.name: WindowWindowModeSupportType03
* @tc.name: WindowModeSupportType03
* @tc.desc: windowModeSupportType test for single window, support both fullScreen and floating mode
* @tc.type: FUNC
*/
HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType03, Function | MediumTest | Level3)
HWTEST_F(WindowModeSupportTypeTest, WindowModeSupportType03, Function | MediumTest | Level3)
{
const sptr<Window>& window = Utils::CreateTestWindow(fullAppInfo_1_);
if (window == nullptr) {
@ -153,11 +153,11 @@ HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType03, Functio
}
/**
* @tc.name: WindowWindowModeSupportType04
* @tc.name: WindowModeSupportType04
* @tc.desc: windowModeSupportType test for single window, window mode is not supported when show, show failed
* @tc.type: FUNC
*/
HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType04, Function | MediumTest | Level3)
HWTEST_F(WindowModeSupportTypeTest, WindowModeSupportType04, Function | MediumTest | Level3)
{
const sptr<Window>& window = Utils::CreateTestWindow(fullAppInfo_1_);
if (window == nullptr) {
@ -172,11 +172,11 @@ HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType04, Functio
}
/**
* @tc.name: WindowWindowModeSupportType05
* @tc.name: WindowModeSupportType05
* @tc.desc: windowModeSupportType test for layout cascade
* @tc.type: FUNC
*/
HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType05, Function | MediumTest | Level3)
HWTEST_F(WindowModeSupportTypeTest, WindowModeSupportType05, Function | MediumTest | Level3)
{
const sptr<Window>& window1 = Utils::CreateTestWindow(fullAppInfo_1_);
if (window1 == nullptr) {
@ -203,11 +203,11 @@ HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType05, Functio
}
/**
* @tc.name: WindowWindowModeSupportType06
* @tc.name: WindowModeSupportType06
* @tc.desc: windowModeSupportType test for layout tile
* @tc.type: FUNC
*/
HWTEST_F(WindowWindowModeSupportTypeTest, WindowWindowModeSupportType06, Function | MediumTest | Level3)
HWTEST_F(WindowModeSupportTypeTest, WindowModeSupportType06, Function | MediumTest | Level3)
{
const sptr<Window>& window = Utils::CreateTestWindow(fullAppInfo_1_);
if (window == nullptr) {

10
utils/include/window_helper.h
View File

@ -524,9 +524,9 @@ public:
static bool IsOnlySupportSplitAndShowWhenLocked(bool isShowWhenLocked, uint32_t windowModeSupportType)
{
uint32_t splitModeInfo = (WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_PRIMARY |
WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY);
if (isShowWhenLocked && (splitModeInfo == windowModeSupportType)) {
uint32_t splitMode = (WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_PRIMARY |
WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY);
if (isShowWhenLocked && (splitMode == windowModeSupportType)) {
return true;
}
return false;
@ -548,8 +548,8 @@ public:
return true;
}
if ((!IsWindowModeSupported(windowModeSupportType, winMode)) ||
(IsOnlySupportSplitAndShowWhenLocked(info->GetShowFlagWhenLocked(), windowModeSupportType))) {
if (!IsWindowModeSupported(windowModeSupportType, winMode) ||
IsOnlySupportSplitAndShowWhenLocked(info->GetShowFlagWhenLocked(), windowModeSupportType)) {
return false;
}
return true;

12
utils/test/unittest/window_property_test.cpp
View File

@ -176,20 +176,20 @@ HWTEST_F(WindowPropertyTest, SetAbilityInfo, Function | SmallTest | Level2)
HWTEST_F(WindowPropertyTest, ResumeLastWindowMode, Function | SmallTest | Level2)
{
WindowProperty winPropDst;
winPropDst.windowModeSupportType_ = WindowModeSupport::WINDOW_MODE_SUPPORT_PIP;
winPropDst.lastMode_ = WindowMode::WINDOW_MODE_PIP;
winPropDst.windowModeSupportType_ = WindowModeSupport::WINDOW_MODE_SUPPORT_PIP;
winPropDst.lastMode_ = WindowMode::WINDOW_MODE_PIP;
winPropDst.mode_ = WindowMode::WINDOW_MODE_UNDEFINED;
winPropDst.ResumeLastWindowMode();
ASSERT_EQ(WindowMode::WINDOW_MODE_PIP, winPropDst.mode_);
winPropDst.windowModeSupportType_ = WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY;
winPropDst.lastMode_ = WindowMode::WINDOW_MODE_PIP;
winPropDst.windowModeSupportType_ = WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY;
winPropDst.lastMode_ = WindowMode::WINDOW_MODE_PIP;
winPropDst.mode_ = WindowMode::WINDOW_MODE_UNDEFINED;
winPropDst.ResumeLastWindowMode();
ASSERT_EQ(WindowMode::WINDOW_MODE_UNDEFINED, winPropDst.mode_);
winPropDst.windowModeSupportType_ = WindowModeSupport::WINDOW_MODE_SUPPORT_FLOATING;
winPropDst.lastMode_ = WindowMode::WINDOW_MODE_PIP;
winPropDst.windowModeSupportType_ = WindowModeSupport::WINDOW_MODE_SUPPORT_FLOATING;
winPropDst.lastMode_ = WindowMode::WINDOW_MODE_PIP;
winPropDst.mode_ = WindowMode::WINDOW_MODE_UNDEFINED;
winPropDst.ResumeLastWindowMode();
ASSERT_EQ(WindowMode::WINDOW_MODE_FLOATING, winPropDst.mode_);

2
window_scene/session/host/src/scene_session.cpp
View File

@ -5224,7 +5224,7 @@ WMError SceneSession::HandleActionUpdateWindowModeSupportType(const sptr<WindowS
WSPropertyChangeAction action)
{
if (!property->GetSystemCalling()) {
TLOGE(WmsLogTag::DEFAULT, "Update property windowModeSupportType permission denied!");
TLOGE(WmsLogTag::DEFAULT, "permission denied!");
return WMError::WM_ERROR_NOT_SYSTEM_APP;
}

2
wm/include/window_agent.h
View File

@ -30,7 +30,7 @@ public:
WMError UpdateWindowRect(const struct Rect& rect, bool decoStatus, WindowSizeChangeReason reason,
const std::shared_ptr<RSTransaction>& rsTransaction = nullptr) override;
WMError UpdateWindowMode(WindowMode mode) override;
WMError UpdateWindowWindowModeSupportType(uint32_t windowModeSupportType) override;
WMError UpdateWindowModeSupportType(uint32_t windowModeSupportType) override;
WMError UpdateFocusStatus(bool focused) override;
WMError UpdateAvoidArea(const sptr<AvoidArea>& avoidArea, AvoidAreaType type) override;
WMError UpdateWindowState(WindowState state) override;

2
wm/include/zidl/window_interface.h
View File

@ -58,7 +58,7 @@ public:
virtual WMError UpdateWindowRect(const struct Rect& rect, bool decoStatus, WindowSizeChangeReason reason,
const std::shared_ptr<RSTransaction>& rsTransaction = nullptr) = 0;
virtual WMError UpdateWindowMode(WindowMode mode) = 0;
virtual WMError UpdateWindowWindowModeSupportType(uint32_t windowModeSupportType) = 0;
virtual WMError UpdateWindowModeSupportType(uint32_t windowModeSupportType) = 0;
virtual WMError UpdateFocusStatus(bool focused) = 0;
virtual WMError UpdateAvoidArea(const sptr<AvoidArea>& avoidArea, AvoidAreaType type) = 0;
virtual WMError UpdateWindowState(WindowState state) = 0;

2
wm/include/zidl/window_proxy.h
View File

@ -32,7 +32,7 @@ public:
WMError UpdateWindowRect(const struct Rect& rect, bool decoStatus, WindowSizeChangeReason reason,
const std::shared_ptr<RSTransaction>& rsTransaction = nullptr) override;
WMError UpdateWindowMode(WindowMode mode) override;
WMError UpdateWindowWindowModeSupportType(uint32_t windowModeSupportType) override;
WMError UpdateWindowModeSupportType(uint32_t windowModeSupportType) override;
WMError UpdateFocusStatus(bool focused) override;
WMError UpdateAvoidArea(const sptr<AvoidArea>& avoidArea, AvoidAreaType type) override;
WMError UpdateWindowState(WindowState state) override;

2
wm/src/window_agent.cpp
View File

@ -49,7 +49,7 @@ WMError WindowAgent::UpdateWindowMode(WindowMode mode)
return WMError::WM_OK;
}
WMError WindowAgent::UpdateWindowWindowModeSupportType(uint32_t windowModeSupportType)
WMError WindowAgent::UpdateWindowModeSupportType(uint32_t windowModeSupportType)
{
if (window_ == nullptr) {
WLOGFE("window_ is nullptr");

3
wm/src/window_scene_session_impl.cpp
View File

@ -2412,7 +2412,8 @@ WMError WindowSceneSessionImpl::Recover(uint32_t reason)
return WMError::WM_ERROR_DEVICE_NOT_SUPPORT;
}
if (!(WindowHelper::IsWindowModeSupported(property_->GetWindowModeSupportType(),
WindowMode::WINDOW_MODE_FLOATING) || property_->GetCompatibleModeInPc())) {
WindowMode::WINDOW_MODE_FLOATING) ||
property_->GetCompatibleModeInPc())) {
TLOGE(WmsLogTag::WMS_LAYOUT, "not support floating, can not Recover");
return WMError::WM_ERROR_INVALID_OPERATION;
}

2
wm/src/zidl/window_proxy.cpp
View File

@ -103,7 +103,7 @@ WMError WindowProxy::UpdateWindowMode(WindowMode mode)
return WMError::WM_OK;
}
WMError WindowProxy::UpdateWindowWindowModeSupportType(uint32_t windowModeSupportType)
WMError WindowProxy::UpdateWindowModeSupportType(uint32_t windowModeSupportType)
{
MessageParcel data;
MessageParcel reply;

2
wm/src/zidl/window_stub.cpp
View File

@ -104,7 +104,7 @@ int WindowStub::OnRemoteRequest(uint32_t code, MessageParcel& data, MessageParce
TLOGE(WmsLogTag::WMS_LAYOUT, "read windowModeSupportType failed");
return ERR_INVALID_DATA;
}
UpdateWindowWindowModeSupportType(windowModeSupportType);
UpdateWindowModeSupportType(windowModeSupportType);
break;
}
case WindowMessage::TRANS_ID_UPDATE_FOCUS_STATUS: {

10
wm/test/unittest/window_agent_test.cpp
View File

@ -87,17 +87,17 @@ HWTEST_F(WindowAgentTest, UpdateWindowMode, Function | SmallTest | Level2)
}
/**
* @tc.name: UpdateWindowWindowModeSupportType
* @tc.desc: UpdateWindowWindowModeSupportType
* @tc.name: UpdateWindowModeSupportType
* @tc.desc: UpdateWindowModeSupportType
* @tc.type: FUNC
*/
HWTEST_F(WindowAgentTest, UpdateWindowWindowModeSupportType, Function | SmallTest | Level2)
HWTEST_F(WindowAgentTest, UpdateWindowModeSupportType, Function | SmallTest | Level2)
{
WMError err = windowAgent_->UpdateWindowWindowModeSupportType(WindowModeSupport::WINDOW_MODE_SUPPORT_FULLSCREEN);
WMError err = windowAgent_->UpdateWindowModeSupportType(WindowModeSupport::WINDOW_MODE_SUPPORT_FULLSCREEN);
ASSERT_EQ(err, WMError::WM_OK);
windowAgent_->window_ = nullptr;
err = windowAgent_->UpdateWindowWindowModeSupportType(WindowModeSupport::WINDOW_MODE_SUPPORT_FULLSCREEN);
err = windowAgent_->UpdateWindowModeSupportType(WindowModeSupport::WINDOW_MODE_SUPPORT_FULLSCREEN);
ASSERT_EQ(err, WMError::WM_ERROR_NULLPTR);
}

6
wm/test/unittest/window_proxy_test.cpp
View File

@ -76,13 +76,13 @@ HWTEST_F(WindowProxyTest, UpdateWindowMode01, Function | SmallTest | Level2)
}
/**
* @tc.name: UpdateWindowWindowModeSupportType01
* @tc.name: UpdateWindowModeSupportType01
* @tc.desc: normal function
* @tc.type: FUNC
*/
HWTEST_F(WindowProxyTest, UpdateWindowWindowModeSupportType01, Function | SmallTest | Level2)
HWTEST_F(WindowProxyTest, UpdateWindowModeSupportType01, Function | SmallTest | Level2)
{
WMError err = windowProxy_->UpdateWindowWindowModeSupportType(WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_PRIMARY);
WMError err = windowProxy_->UpdateWindowModeSupportType(WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_PRIMARY);
ASSERT_EQ(err, WMError::WM_OK);
}

2
wmserver/src/window_layout_policy_cascade.cpp
View File

@ -67,7 +67,7 @@ void WindowLayoutPolicyCascade::Reorder()
}
// if window don't support floating mode, or default rect of cascade is not satisfied with limits
if (!WindowHelper::IsWindowModeSupported(node->GetWindowModeSupportType(),
WindowMode::WINDOW_MODE_FLOATING) ||
WindowMode::WINDOW_MODE_FLOATING) ||
!WindowHelper::IsRectSatisfiedWithSizeLimits(rect, node->GetWindowUpdatedSizeLimits())) {
MinimizeApp::AddNeedMinimizeApp(node, MinimizeReason::LAYOUT_CASCADE);
continue;

2
wmserver/src/window_node_container.cpp
View File

@ -2229,7 +2229,7 @@ void WindowNodeContainer::UpdateWindowModeSupportTypeWhenKeyguardChange(const sp
}
node->SetWindowModeSupportType(windowModeSupportType);
if (node->GetWindowToken() != nullptr) {
node->GetWindowToken()->UpdateWindowWindowModeSupportType(windowModeSupportType);
node->GetWindowToken()->UpdateWindowModeSupportType(windowModeSupportType);
}
}

8
wmserver/src/window_pair.cpp
View File

@ -195,11 +195,11 @@ void WindowPair::Clear()
{
WLOGI("Clear window pair.");
DumpPairInfo();
auto splitModeInfo = (WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_PRIMARY |
WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY);
auto splitMode = (WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_PRIMARY |
WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY);
if (primary_ != nullptr && primary_->GetWindowProperty() != nullptr &&
primary_->GetWindowToken() != nullptr) {
if (primary_->GetWindowModeSupportType() == splitModeInfo) {
if (primary_->GetWindowModeSupportType() == splitMode) {
MinimizeApp::AddNeedMinimizeApp(primary_, MinimizeReason::SPLIT_QUIT);
MinimizeApp::ExecuteMinimizeTargetReasons(MinimizeReason::SPLIT_QUIT);
} else {
@ -216,7 +216,7 @@ void WindowPair::Clear()
}
if (secondary_ != nullptr && secondary_->GetWindowProperty() != nullptr &&
secondary_->GetWindowToken() != nullptr) {
if (secondary_->GetWindowModeSupportType() == splitModeInfo) {
if (secondary_->GetWindowModeSupportType() == splitMode) {
MinimizeApp::AddNeedMinimizeApp(secondary_, MinimizeReason::SPLIT_QUIT);
MinimizeApp::ExecuteMinimizeTargetReasons(MinimizeReason::SPLIT_QUIT);
} else {

2
wmserver/test/unittest/avoid_area_controller_test.cpp
View File

@ -80,7 +80,7 @@ public:
}
return WMError::WM_OK;
}
WMError UpdateWindowWindowModeSupportType(uint32_t windowModeSupportType) override
WMError UpdateWindowModeSupportType(uint32_t windowModeSupportType) override
{
return WMError::WM_OK;
}

2
wmserver/test/unittest/starting_window_test.cpp
View File

@ -157,7 +157,7 @@ HWTEST_F(StartingWindowTest, NeedToStopStartingWindow04, Function | SmallTest |
sptr<WindowNode> node = new WindowNode(CreateWindowProperty());
transitionInfo_->SetShowFlagWhenLocked(true);
node->SetWindowModeSupportType(WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_PRIMARY |
WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY);
WindowModeSupport::WINDOW_MODE_SUPPORT_SPLIT_SECONDARY);
ASSERT_EQ(false, WindowHelper::CheckSupportWindowMode(node->GetWindowMode(),
node->GetWindowModeSupportType(), transitionInfo_));
}

2
wmserver/test/unittest/window_node_test.cpp
View File

@ -60,7 +60,7 @@ public:
{
return WMError::WM_OK;
};
virtual WMError UpdateWindowWindowModeSupportType(uint32_t windowModeSupportType) override
virtual WMError UpdateWindowModeSupportType(uint32_t windowModeSupportType) override
{
return WMError::WM_OK;
};