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

correct the comment format

Browse Source 
Signed-off-by: yxn <yexinnian3@huawei.com>
This commit is contained in:
yxn 2024-11-18 12:32:50 +08:00
parent 9a15af473e
commit 43e25c8469
179 changed files with 668 additions and 151 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
AppDemo/window/immersive/entry/src/main/ets/MainAbility/pages/index.ets
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
import router from '@system.router';
import window from '@ohos.window'
@Entry

1
dm/src/display.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "display.h"
#include <cstdint>

1
dm/src/screen_manager.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "screen_manager.h"
#include <map>

1
dm/src/zidl/display_manager_agent_stub.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "zidl/display_manager_agent_stub.h"
#include <vector>

3
dm/test/unittest/display_manager_agent_proxy_test.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "display_manager_proxy.h"
#include "display_manager_adapter.h"
#include "display_manager.h"
@ -318,7 +319,6 @@ HWTEST_F(DisplayManagerAgentProxyTest, OnScreenConnect01, Function | SmallTest |
ASSERT_EQ(resultValue, 1);
}
/**
* @tc.name: OnScreenDisconnect
* @tc.desc: OnScreenDisconnect
@ -523,7 +523,6 @@ HWTEST_F(DisplayManagerAgentProxyTest, OnDisplayChange01, Function | SmallTest |
ASSERT_EQ(resultValue, 1);
}
/**
* @tc.name: OnScreenshot
* @tc.desc: OnScreenshot

3
dm/test/unittest/display_manager_test.cpp
View File

@ -949,7 +949,6 @@ HWTEST_F(DisplayManagerTest, UnregisterCaptureStatusListener03, Function | Small
listener.clear();
}
/**
* @tc.name: RegisterDisplayUpdateListener01
* @tc.desc: RegisterDisplayUpdateListener01 fun
@ -1240,6 +1239,7 @@ HWTEST_F(DisplayManagerTest, NotifyCaptureStatusChanged01, Function | SmallTest
DisplayManager::GetInstance().pImpl_->NotifyCaptureStatusChanged(isCapture);
ASSERT_EQ(DisplayManager::GetInstance().pImpl_->powerEventListenerAgent_, nullptr);
}
/**
* @tc.name: RegisterFoldAngleListener03
* @tc.desc: RegisterFoldAngleListener03 fun
@ -1398,7 +1398,6 @@ HWTEST_F(DisplayManagerTest, UnregisterCaptureStatusListener06, Function | Small
listener.clear();
}
/**
* @tc.name: RegisterDisplayUpdateListener02
* @tc.desc: RegisterDisplayUpdateListener02 fun

1
dm/test/unittest/display_test.cpp
View File

@ -154,6 +154,7 @@ HWTEST_F(DisplayTest, SetWaterfallCompression02, Function | SmallTest | Level1)
DisplayCutoutController::SetIsWaterfallDisplay(isWaterfallDisplayOrigin);
ASSERT_EQ(isWaterfallDisplayOrigin, DisplayCutoutController::IsWaterfallDisplay());
}
/**
* @tc.name: GetName01
* @tc.desc: GetName function cover

1
dm/test/unittest/screen_group_test.cpp
View File

@ -101,6 +101,7 @@ HWTEST_F(ScreenGroupTest, UpdateScreenGroupInfo03, Function | SmallTest | Level2
std::vector<Point> pos = screenGroup->GetChildPositions();
ASSERT_EQ(position.size(), pos.size());
}
/**
* @tc.name: GetChildIds
* @tc.desc: for interface coverage & check GetChildIds

3
dm/test/unittest/screen_manager_test.cpp
View File

@ -328,6 +328,7 @@ HWTEST_F(ScreenManagerTest, OnScreenGroupChange01, Function | SmallTest | Level1
screenManagerListener->OnScreenGroupChange(trigger, screenInfos, groupEvent);
ScreenManager::GetInstance().pImpl_->screenManagerListener_ = nullptr;
}
/**
* @tc.name: RemoveVirtualScreenFromGroup
* @tc.desc: for interface coverage & check func RemoveVirtualScreenFromGroup
@ -349,6 +350,7 @@ HWTEST_F(ScreenManagerTest, RemoveVirtualScreenFromGroup, Function | SmallTest |
result = ScreenManager::GetInstance().RemoveVirtualScreenFromGroup(testScreens);
ASSERT_EQ(DMError::DM_OK, result);
}
/**
* @tc.name: SetScreenRotationLocked
* @tc.desc: for interface coverage & check SetScreenRotationLocked
@ -419,6 +421,7 @@ HWTEST_F(ScreenManagerTest, RegisterScreenGroupListener, Function | SmallTest |
ASSERT_EQ(DMError::DM_OK, result);
}
}
/**
* @tc.name: RegisterVirtualScreenGroupListener
* @tc.desc: for interface coverage and

1
dm_lite/src/display_lite.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "display_lite.h"
#include <cstdint>

1
dm_lite/src/screen_manager_lite.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "screen_manager_lite.h"
#include <cinttypes>
#include "display_manager_adapter_lite.h"

1
dmserver/include/sensor_plugin.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef SENSOR_PLUGIN_H
#define SENSOR_PLUGIN_H

1
dmserver/src/display_manager_config.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "display_manager_config.h"
#include <climits>

1
dmserver/src/sensor_plugin.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "sensor_plugin.h"
namespace OHOS {

11
dmserver/test/unittest/abstract_display_test.cpp
View File

@ -85,6 +85,7 @@ HWTEST_F(AbstractDisplayTest, BindAbstractScreen01, Function | SmallTest | Level
sptr<AbstractScreen> abstractScreen = nullptr;
ASSERT_EQ(false, absDisplay->BindAbstractScreen(abstractScreen));
}
/**
* @tc.name: BindAbstractScreen
* @tc.desc: BindAbstractScreen test
@ -96,6 +97,7 @@ HWTEST_F(AbstractDisplayTest, BindAbstractScreen02, Function | SmallTest | Level
abstractScreen->activeIdx_ = -1;
ASSERT_EQ(false, absDisplay->BindAbstractScreen(abstractScreen));
}
/**
* @tc.name: CalculateXYDpi
* @tc.desc: CalculateXYDpi test
@ -114,6 +116,7 @@ HWTEST_F(AbstractDisplayTest, CalculateXYDpi, Function | SmallTest | Level3)
absDisplay->CalculateXYDpi(phyWidth, phyHeight);
ASSERT_EQ(1, absDisplay->phyHeight_);
}
/**
* @tc.name: GetRefreshRate
* @tc.desc: GetRefreshRate test
@ -126,6 +129,7 @@ HWTEST_F(AbstractDisplayTest, GetRefreshRate, Function | SmallTest | Level3)
absDisplay->GetRefreshRate();
ASSERT_EQ(1, absDisplay->refreshRate_);
}
/**
* @tc.name: GetOffsetX
* @tc.desc: GetOffsetX test
@ -137,6 +141,7 @@ HWTEST_F(AbstractDisplayTest, GetOffsetX, Function | SmallTest | Level3)
absDisplay->SetOffsetX(offsetX);
ASSERT_EQ(1, absDisplay->GetOffsetX());
}
/**
* @tc.name: GetOffsetY
* @tc.desc: GetOffsetX test
@ -148,6 +153,7 @@ HWTEST_F(AbstractDisplayTest, GetOffsetY, Function | SmallTest | Level3)
absDisplay->SetOffsetY(offsetY);
ASSERT_EQ(1, absDisplay->GetOffsetY());
}
/**
* @tc.name: UpdateXDpi
* @tc.desc: UpdateXDpi test
@ -161,6 +167,7 @@ HWTEST_F(AbstractDisplayTest, UpdateXDpi, Function | SmallTest | Level3)
absDisplay->UpdateXDpi();
ASSERT_EQ(UINT32_MAX, absDisplay->phyWidth_);
}
/**
* @tc.name: UpdateYDpi
* @tc.desc: UpdateYDpi test
@ -174,6 +181,7 @@ HWTEST_F(AbstractDisplayTest, UpdateYDpi, Function | SmallTest | Level3)
absDisplay->UpdateYDpi();
ASSERT_EQ(UINT32_MAX, absDisplay->phyHeight_);
}
/**
* @tc.name: SetId
* @tc.desc: SetId test
@ -185,6 +193,7 @@ HWTEST_F(AbstractDisplayTest, SetId, Function | SmallTest | Level3)
absDisplay->SetId(id);
ASSERT_EQ(1, absDisplay->GetId());
}
/**
* @tc.name: SetDisplayOrientation
* @tc.desc: SetDisplayOrientation test
@ -196,6 +205,7 @@ HWTEST_F(AbstractDisplayTest, SetDisplayOrientation, Function | SmallTest | Leve
absDisplay->SetDisplayOrientation(displayOrientation);
ASSERT_EQ(DisplayOrientation::PORTRAIT, absDisplay->GetDisplayOrientation());
}
/**
* @tc.name: GetRotationAndGetOrientation
* @tc.desc: GetRotationAndGetOrientation test
@ -209,6 +219,7 @@ HWTEST_F(AbstractDisplayTest, GetRotationAndGetOrientation, Function | SmallTest
absDisplay->GetOrientation();
ASSERT_EQ(1, absDisplay->GetId());
}
/**
* @tc.name: SetFreezeFlag
* @tc.desc: SetFreezeFlag test

51
dmserver/test/unittest/abstract_screen_controller_test.cpp
View File

@ -89,6 +89,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenDisconnected01, Function | S
absController_->ProcessScreenDisconnected(rsId);
ASSERT_EQ(false, absController_->screenIdManager_.ConvertToDmsScreenId(rsId, dmsId));
}
/**
* @tc.name: ProcessScreenDisconnected
* @tc.desc: ProcessScreenDisconnected test
@ -104,6 +105,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenDisconnected02, Function | S
ASSERT_EQ(false, absController_->screenIdManager_.ConvertToDmsScreenId(rsId, dmsId));
ASSERT_EQ(absController_->dmsScreenMap_.end(), absController_->dmsScreenMap_.find(dmsId));
}
/**
* @tc.name: ProcessScreenDisconnected
* @tc.desc: ProcessScreenDisconnected test
@ -118,6 +120,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenDisconnected03, Function | S
ASSERT_EQ(false, absController_->screenIdManager_.ConvertToDmsScreenId(rsId, dmsId));
ASSERT_NE(absController_->dmsScreenMap_.end(), absController_->dmsScreenMap_.find(dmsId));
}
/**
* @tc.name: SetScreenRotateAnimation
* @tc.desc: SetScreenRotateAnimation test
@ -132,6 +135,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenRotateAnimation01, Function | Sm
absController_->SetScreenRotateAnimation(screen, 1, Rotation::ROTATION_0, true);
ASSERT_EQ(Rotation::ROTATION_270, screen->rotation_);
}
/**
* @tc.name: SetScreenRotateAnimation
* @tc.desc: SetScreenRotateAnimation test
@ -146,6 +150,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenRotateAnimation02, Function | Sm
absController_->SetScreenRotateAnimation(screen, 1, Rotation::ROTATION_270, true);
ASSERT_EQ(Rotation::ROTATION_0, screen->rotation_);
}
/**
* @tc.name: SetScreenRotateAnimation
* @tc.desc: SetScreenRotateAnimation test
@ -160,6 +165,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenRotateAnimation03, Function | Sm
absController_->SetScreenRotateAnimation(screen, 1, Rotation::ROTATION_270, false);
ASSERT_EQ(Rotation::ROTATION_0, screen->rotation_);
}
/**
* @tc.name: MakeMirror
* @tc.desc: MakeMirror test
@ -171,6 +177,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror01, Function | SmallTest | Leve
ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(5, screens));
ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR));
}
/**
* @tc.name: MakeMirror
* @tc.desc: MakeMirror test
@ -183,6 +190,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror02, Function | SmallTest | Leve
ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(2, screens));
ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR));
}
/**
* @tc.name: MakeMirror
* @tc.desc: MakeMirror test
@ -197,6 +205,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror03, Function | SmallTest | Leve
ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(2, screens));
ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR));
}
/**
* @tc.name: MakeMirror
* @tc.desc: MakeMirror test
@ -211,6 +220,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror04, Function | SmallTest | Leve
ASSERT_TRUE(DMError::DM_OK != absController_->MakeMirror(2, screens));
ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR));
}
/**
* @tc.name: MakeMirror
* @tc.desc: MakeMirror test
@ -225,6 +235,7 @@ HWTEST_F(AbstractScreenControllerTest, MakeMirror05, Function | SmallTest | Leve
ASSERT_TRUE(DMError::DM_OK == absController_->MakeMirror(2, screens));
ASSERT_EQ(DMError::DM_OK, absController_->StopScreens(screens, ScreenCombination::SCREEN_MIRROR));
}
/**
* @tc.name: ProcessScreenConnected
* @tc.desc: ProcessScreenConnected test
@ -236,6 +247,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenConnected01, Function | Smal
absController_->ProcessScreenConnected(id);
ASSERT_EQ(true, absController_->screenIdManager_.HasRsScreenId(id));
}
/**
* @tc.name: OnRsScreenConnectionChange
* @tc.desc: OnRsScreenConnectionChange test
@ -248,6 +260,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange01, Function |
absController_->OnRsScreenConnectionChange(rsScreenId, event);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: OnRsScreenConnectionChange
* @tc.desc: OnRsScreenConnectionChange test
@ -260,6 +273,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange02, Function |
absController_->OnRsScreenConnectionChange(rsScreenId, event);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: OnRsScreenConnectionChange
* @tc.desc: OnRsScreenConnectionChange test
@ -272,6 +286,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange03, Function |
absController_->OnRsScreenConnectionChange(rsScreenId, event);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: OnRsScreenConnectionChange
* @tc.desc: OnRsScreenConnectionChange test
@ -284,6 +299,7 @@ HWTEST_F(AbstractScreenControllerTest, OnRsScreenConnectionChange04, Function |
absController_->OnRsScreenConnectionChange(rsScreenId, event);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: GetAllValidScreenIds
* @tc.desc: GetAllValidScreenIds test
@ -295,6 +311,7 @@ HWTEST_F(AbstractScreenControllerTest, GetAllValidScreenIds, Function | SmallTes
std::vector<ScreenId> valid {0, 1, 2, 3};
ASSERT_EQ(valid, absController_->GetAllValidScreenIds(screenIds));
}
/**
* @tc.name: GetRSDisplayNodeByScreenId
* @tc.desc: GetRSDisplayNodeByScreenId test
@ -306,6 +323,7 @@ HWTEST_F(AbstractScreenControllerTest, GetRSDisplayNodeByScreenId, Function | Sm
std::shared_ptr<RSDisplayNode> node = nullptr;
ASSERT_EQ(node, absController_->GetRSDisplayNodeByScreenId(id));
}
/**
* @tc.name: UpdateRSTree
* @tc.desc: UpdateRSTree test
@ -318,6 +336,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree01, Function | SmallTest | Le
absController_->UpdateRSTree(id, id, node, true, true);
ASSERT_EQ(nullptr, absController_->GetAbstractScreen(id));
}
/**
* @tc.name: UpdateRSTree
* @tc.desc: UpdateRSTree test
@ -332,6 +351,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree02, Function | SmallTest | Le
ASSERT_NE(nullptr, absController_->GetAbstractScreen(id));
ASSERT_EQ(nullptr, absController_->GetAbstractScreen(parentId));
}
/**
* @tc.name: UpdateRSTree
* @tc.desc: UpdateRSTree test
@ -348,6 +368,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree03, Function | SmallTest | Le
parentScreen->rsDisplayNode_ = nullptr;
absController_->UpdateRSTree(id, parentId, node, true, true);
}
/**
* @tc.name: UpdateRSTree
* @tc.desc: UpdateRSTree test
@ -365,6 +386,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree04, Function | SmallTest | Le
parentScreen->rsDisplayNode_ = std::make_shared<RSDisplayNode>(config);;
absController_->UpdateRSTree(id, parentId, node, true, true);
}
/**
* @tc.name: UpdateRSTree
* @tc.desc: UpdateRSTree test
@ -382,6 +404,7 @@ HWTEST_F(AbstractScreenControllerTest, UpdateRSTree05, Function | SmallTest | Le
parentScreen->rsDisplayNode_ = std::make_shared<RSDisplayNode>(config);;
absController_->UpdateRSTree(id, parentId, node, true, false);
}
/**
* @tc.name: RegisterAbstractScreenCallback
* @tc.desc: RegisterAbstractScreenCallback test
@ -393,6 +416,7 @@ HWTEST_F(AbstractScreenControllerTest, RegisterAbstractScreenCallback, Function
absController_->RegisterAbstractScreenCallback(cb);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: AddToGroupLocked
* @tc.desc: AddToGroupLocked test
@ -403,6 +427,7 @@ HWTEST_F(AbstractScreenControllerTest, AddToGroupLocked, Function | SmallTest |
ASSERT_EQ(false, absController_->dmsScreenGroupMap_.empty());
ASSERT_EQ(nullptr, absController_->AddToGroupLocked(screenVec[0]));
}
/**
* @tc.name: RemoveFromGroupLocked
* @tc.desc: RemoveFromGroupLocked test
@ -414,6 +439,7 @@ HWTEST_F(AbstractScreenControllerTest, RemoveFromGroupLocked01, Function | Small
screen->groupDmsId_ = 0;
ASSERT_EQ(nullptr, absController_->RemoveFromGroupLocked(screen));
}
/**
* @tc.name: RemoveChildFromGroup
* @tc.desc: RemoveChildFromGroup test
@ -427,6 +453,7 @@ HWTEST_F(AbstractScreenControllerTest, RemoveChildFromGroup01, Function | SmallT
screenGroup->screenMap_.insert(std::make_pair(dmsId, screen));
ASSERT_EQ(true, absController_->RemoveChildFromGroup(screen, screenGroup));
}
/**
* @tc.name: AddAsSuccedentScreenLocked
* @tc.desc: AddAsSuccedentScreenLocked test
@ -438,6 +465,7 @@ HWTEST_F(AbstractScreenControllerTest, AddAsSuccedentScreenLocked01, Function |
absController_->dmsScreenMap_.erase(absController_->GetDefaultAbstractScreenId());
ASSERT_EQ(nullptr, absController_->AddAsSuccedentScreenLocked(screen));
}
/**
* @tc.name: AddAsSuccedentScreenLocked
* @tc.desc: AddAsSuccedentScreenLocked test
@ -448,6 +476,7 @@ HWTEST_F(AbstractScreenControllerTest, AddAsSuccedentScreenLocked02, Function |
sptr<AbstractScreen> screen = screenVec[0];
ASSERT_EQ(nullptr, absController_->AddAsSuccedentScreenLocked(screen));
}
/**
* @tc.name: CreateVirtualScreen
* @tc.desc: CreateVirtualScreen test
@ -509,6 +538,7 @@ HWTEST_F(AbstractScreenControllerTest, DestroyVirtualScreen01, Function | SmallT
ScreenId id = 5;
ASSERT_EQ(DMError::DM_ERROR_INVALID_PARAM, absController_->DestroyVirtualScreen(id));
}
/**
* @tc.name: DestroyVirtualScreen
* @tc.desc: DestroyVirtualScreen test
@ -519,6 +549,7 @@ HWTEST_F(AbstractScreenControllerTest, DestroyVirtualScreen02, Function | SmallT
ScreenId id = 1;
ASSERT_EQ(DMError::DM_OK, absController_->DestroyVirtualScreen(id));
}
/**
* @tc.name: SetVirtualScreenSurface
* @tc.desc: SetVirtualScreenSurface test
@ -530,6 +561,7 @@ HWTEST_F(AbstractScreenControllerTest, SetVirtualScreenSurface01, Function | Sma
sptr<Surface> surface = nullptr;
ASSERT_EQ(DMError::DM_ERROR_RENDER_SERVICE_FAILED, absController_->SetVirtualScreenSurface(id, surface));
}
/**
* @tc.name: SetBuildInDefaultOrientation
* @tc.desc: SetBuildInDefaultOrientation test
@ -541,6 +573,7 @@ HWTEST_F(AbstractScreenControllerTest, SetBuildInDefaultOrientation, Function |
absController_->SetBuildInDefaultOrientation(orientation);
ASSERT_EQ(orientation, absController_->buildInDefaultOrientation_);
}
/**
* @tc.name: SetOrientation
* @tc.desc: SetOrientation test
@ -552,6 +585,7 @@ HWTEST_F(AbstractScreenControllerTest, SetOrientation01, Function | SmallTest |
Orientation orientation = Orientation::BEGIN;
ASSERT_EQ(DMError::DM_ERROR_NULLPTR, absController_->SetOrientation(1, orientation, true));
}
/**
* @tc.name: SetOrientation
* @tc.desc: SetOrientation test
@ -577,6 +611,7 @@ HWTEST_F(AbstractScreenControllerTest, SetOrientation02, Function | SmallTest |
ret = absController_->SetOrientation(1, orientation, isFromWindow, false);
ASSERT_EQ(DMError::DM_OK, ret);
}
/**
* @tc.name: SetRotation
* @tc.desc: SetRotation test
@ -591,6 +626,7 @@ HWTEST_F(AbstractScreenControllerTest, SetRotation01, Function | SmallTest | Lev
ASSERT_EQ(false, absController_->SetRotation(1, Rotation::ROTATION_0, false));
ASSERT_EQ(false, absController_->SetRotation(1, Rotation::ROTATION_0, true));
}
/**
* @tc.name: SetScreenActiveMode
* @tc.desc: SetScreenActiveMode test
@ -600,6 +636,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenActiveMode01, Function | SmallTe
{
ASSERT_TRUE(DMError::DM_OK != absController_->SetScreenActiveMode(5, 0));
}
/**
* @tc.name: SetScreenActiveMode
* @tc.desc: SetScreenActiveMode test
@ -610,6 +647,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenActiveMode02, Function | SmallTe
absController_->screenIdManager_.dms2RsScreenIdMap_.erase(1);
ASSERT_TRUE(DMError::DM_OK != absController_->SetScreenActiveMode(1, 0));
}
/**
* @tc.name: ProcessScreenModeChanged
* @tc.desc: ProcessScreenModeChanged test
@ -620,6 +658,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged01, Function | Sm
absController_->ProcessScreenModeChanged(7);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: ProcessScreenModeChanged
* @tc.desc: ProcessScreenModeChanged test
@ -630,6 +669,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged02, Function | Sm
absController_->ProcessScreenModeChanged(5);
ASSERT_EQ(nullptr, absController_->dmsScreenMap_[5]);
}
/**
* @tc.name: ProcessScreenModeChanged
* @tc.desc: ProcessScreenModeChanged test
@ -640,6 +680,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged03, Function | Sm
absController_->ProcessScreenModeChanged(2);
ASSERT_NE(nullptr, absController_->dmsScreenMap_[2]);
}
/**
* @tc.name: ProcessScreenModeChanged
* @tc.desc: ProcessScreenModeChanged test
@ -653,6 +694,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged04, Function | Sm
absController_->ProcessScreenModeChanged(2);
ASSERT_NE(nullptr, absController_->dmsScreenMap_[2]);
}
/**
* @tc.name: ProcessScreenModeChanged
* @tc.desc: ProcessScreenModeChanged test
@ -666,6 +708,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessScreenModeChanged05, Function | Sm
absController_->ProcessScreenModeChanged(2);
ASSERT_NE(nullptr, absController_->dmsScreenMap_[2]);
}
/**
* @tc.name: ChangeScreenGroup
* @tc.desc: ChangeScreenGroup test
@ -689,6 +732,7 @@ HWTEST_F(AbstractScreenControllerTest, ChangeScreenGroup01, Function | SmallTest
absController_->ChangeScreenGroup(group, screens, startPoints, true, ScreenCombination::SCREEN_ALONE);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: ChangeScreenGroup
* @tc.desc: ChangeScreenGroup test
@ -713,6 +757,7 @@ HWTEST_F(AbstractScreenControllerTest, ChangeScreenGroup02, Function | SmallTest
absController_->ChangeScreenGroup(group, screens, startPoints, true, ScreenCombination::SCREEN_ALONE);
ASSERT_EQ(6, absController_->dmsScreenMap_.size());
}
/**
* @tc.name: ChangeScreenGroup
* @tc.desc: ChangeScreenGroup test
@ -896,6 +941,7 @@ HWTEST_F(AbstractScreenControllerTest, SetScreenPowerForAll, Function | SmallTes
ASSERT_EQ(false, absController_->SetScreenPowerForAll(ScreenPowerState::POWER_OFF,
PowerStateChangeReason::POWER_BUTTON));
}
/**
* @tc.name: SetVirtualPixelRatio
* @tc.desc: SetVirtualPixelRatio test
@ -909,6 +955,7 @@ HWTEST_F(AbstractScreenControllerTest, SetVirtualPixelRatio01, Function | SmallT
screen->isScreenGroup_ = true;
ASSERT_EQ(DMError::DM_ERROR_NULLPTR, absController_->SetVirtualPixelRatio(id, ratio));
}
/**
* @tc.name: SetVirtualPixelRatio
* @tc.desc: SetVirtualPixelRatio test
@ -921,6 +968,7 @@ HWTEST_F(AbstractScreenControllerTest, SetVirtualPixelRatio02, Function | SmallT
absController_->abstractScreenCallback_ = nullptr;
ASSERT_EQ(DMError::DM_OK, absController_->SetVirtualPixelRatio(id, ratio));
}
/**
* @tc.name: RegisterRsScreenConnectionChangeListener
* @tc.desc: RegisterRsScreenConnectionChangeListener test
@ -933,6 +981,7 @@ HWTEST_F(AbstractScreenControllerTest, RegisterRsScreenConnectionChangeListener,
ASSERT_EQ(true, absController_->OnRemoteDied(agent));
agent.clear();
}
/**
* @tc.name: RemoveSurfaceNodeFromScreen
* @tc.desc: RemoveSurfaceNodeFromScreen test
@ -945,6 +994,7 @@ HWTEST_F(AbstractScreenControllerTest, RemoveSurfaceNodeFromScreen, Function | S
ASSERT_EQ(DMError::DM_ERROR_NULLPTR, absController_->RemoveSurfaceNodeFromScreen(dmsScreenId, surfaceNode));
ASSERT_EQ(nullptr, absController_->GetAbstractScreen(dmsScreenId));
}
/**
* @tc.name: ProcessDefaultScreenReconnected
* @tc.desc: ProcessDefaultScreenReconnected test
@ -961,6 +1011,7 @@ HWTEST_F(AbstractScreenControllerTest, ProcessDefaultScreenReconnected01, Functi
absController_->ProcessDefaultScreenReconnected(rsScreenId);
ASSERT_EQ(nullptr, absController_->GetAbstractScreen(rsScreenId));
}
/**
* @tc.name: ProcessDefaultScreenReconnected
* @tc.desc: ProcessDefaultScreenReconnected test

6
dmserver/test/unittest/abstract_screen_test.cpp
View File

@ -88,6 +88,7 @@ HWTEST_F(AbstractScreenTest, GetScreenMode, Function | SmallTest | Level3)
ASSERT_EQ(mode0, (absScreen_->GetAbstractScreenModes())[0]);
ASSERT_EQ(mode1, (absScreen_->GetAbstractScreenModes())[1]);
}
/**
* @tc.name: ConvertToScreenInfo
* @tc.desc: Convert to screen info
@ -97,6 +98,7 @@ HWTEST_F(AbstractScreenTest, ConvertToScreenInfo, Function | SmallTest | Level3)
{
ASSERT_NE(nullptr, absScreen_->ConvertToScreenInfo());
}
/**
* @tc.name: RSTree
* @tc.desc: RS tree
@ -135,7 +137,6 @@ HWTEST_F(AbstractScreenTest, RSTree, Function | SmallTest | Level3)
absScreen_->rsDisplayNode_ = nullptr;
}
/**
* @tc.name: InitRSDisplayNode
* @tc.desc: InitRSDisplayNode
@ -204,6 +205,7 @@ HWTEST_F(AbstractScreenTest, ColorGamut, Function | SmallTest | Level3)
gamutMap = ScreenGamutMap::GAMUT_MAP_HDR_EXTENSION;
ASSERT_EQ(DMError::DM_ERROR_RENDER_SERVICE_FAILED, absScreen0->GetScreenGamutMap(gamutMap));
}
/**
* @tc.name: FillScreenInfo
* @tc.desc: Fill screen info
@ -223,6 +225,7 @@ HWTEST_F(AbstractScreenTest, FillScreenInfo, Function | SmallTest | Level3)
absScreen_->FillScreenInfo(info);
ASSERT_EQ(2.f, info->virtualPixelRatio_);
}
/**
* @tc.name: CalcRotation
* @tc.desc: Calc rotation
@ -415,7 +418,6 @@ HWTEST_F(AbstractScreenTest, GetChildPosition, Function | SmallTest | Level3)
ASSERT_EQ(screenId, 1);
}
/**
* @tc.name: AddChild01
* @tc.desc: Add child

2
dmserver/test/unittest/display_cutout_controller_test.cpp
View File

@ -95,7 +95,6 @@ HWTEST_F(DisplayCutoutControllerTest, GetCutoutInfo, Function | SmallTest | Leve
ASSERT_NE(cutoutInfo, nullptr);
}
/**
* @tc.name: CalcBuiltInDisplayWaterfallRects
* @tc.desc: CalcBuiltInDisplayWaterfallRects
@ -118,7 +117,6 @@ HWTEST_F(DisplayCutoutControllerTest, CalcBuiltInDisplayWaterfallRects, Function
ASSERT_TRUE(controller->waterfallDisplayAreaRects_.isUninitialized());
}
/**
* @tc.name: CalcBuiltInDisplayWaterfallRectsByRotation
* @tc.desc: CalcBuiltInDisplayWaterfallRectsByRotation

6
dmserver/test/unittest/display_manager_agent_controller_test.cpp
View File

@ -96,6 +96,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnScreenConnect, Function | SmallTes
GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size();
ASSERT_EQ(result, 1);
}
/**
* @tc.name: OnScreenChange
* @tc.desc: OnScreenChange test
@ -122,6 +123,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnScreenChange, Function | SmallTest
GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size();
ASSERT_EQ(result, 1);
}
/**
* @tc.name: OnScreenGroupChange
* @tc.desc: OnScreenChange test
@ -152,6 +154,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnScreenGroupChange, Function | Smal
GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size();
ASSERT_EQ(result, 1);
}
/**
* @tc.name: OnDisplayCreate
* @tc.desc: OnDisplayCreate test
@ -176,6 +179,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnDisplayCreate, Function | SmallTes
GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size();
ASSERT_EQ(result, 0);
}
/**
* @tc.name: OnDisplayDestroy
* @tc.desc: OnDisplayDestroy test
@ -199,6 +203,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnDisplayDestroy, Function | SmallTe
GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size();
ASSERT_EQ(result, 0);
}
/**
* @tc.name: OnDisplayChange
* @tc.desc: OnDisplayChange test
@ -227,6 +232,7 @@ HWTEST_F(DisplayManagerAgentControllerTest, OnDisplayChange, Function | SmallTes
GetAgentsByType(DisplayManagerAgentType::SCREEN_EVENT_LISTENER).size();
ASSERT_EQ(result, 0);
}
/**
* @tc.name: OnScreenshot
* @tc.desc: OnScreenshot test

9
dmserver/test/unittest/display_manager_proxy_test.cpp
View File

@ -77,6 +77,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDefaultDisplayInfo01, Function | SmallTest
auto displayInfo3 = proxy2.GetDefaultDisplayInfo();
ASSERT_EQ(nullptr, displayInfo3);
}
/**
* @tc.name: GetDisplayInfoById01
* @tc.desc: test DisplayManagerProxy::GetDisplayInfoById
@ -100,6 +101,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDisplayInfoById01, Function | SmallTest | L
auto displayInfo3 = proxy2.GetDisplayInfoById(0);
ASSERT_EQ(nullptr, displayInfo3);
}
/**
* @tc.name: GetDisplayInfoByScreen01
* @tc.desc: test DisplayManagerProxy::GetDisplayInfoByScreen
@ -123,6 +125,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDisplayInfoByScreen01, Function | SmallTest
auto displayInfo3 = proxy2.GetDisplayInfoByScreen(0);
ASSERT_EQ(nullptr, displayInfo3);
}
/**
* @tc.name: CreateVirtualScreen01
* @tc.desc: test DisplayManagerProxy::CreateVirtualScreen
@ -152,6 +155,7 @@ HWTEST_F(DisplayManagerProxyTest, CreateVirtualScreen01, Function | SmallTest |
auto screenId3 = proxy2.CreateVirtualScreen(virtualOption2, displayManagerAgent2);
ASSERT_EQ(SCREEN_ID_INVALID, screenId3);
}
/**
* @tc.name: DestroyVirtualScreen01
* @tc.desc: test DisplayManagerProxy::DestroyVirtualScreen
@ -175,6 +179,7 @@ HWTEST_F(DisplayManagerProxyTest, DestroyVirtualScreen01, Function | SmallTest |
auto result3 = proxy2.DestroyVirtualScreen(0);
ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result3);
}
/**
* @tc.name: SetVirtualScreenSurface01
* @tc.desc: test DisplayManagerProxy::SetVirtualScreenSurface
@ -201,6 +206,7 @@ HWTEST_F(DisplayManagerProxyTest, SetVirtualScreenSurface01, Function | SmallTes
auto result4 = proxy2.SetVirtualScreenSurface(0, surface->GetProducer());
ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result4);
}
/**
* @tc.name: SetOrientation01
* @tc.desc: test DisplayManagerProxy::SetOrientation
@ -224,6 +230,7 @@ HWTEST_F(DisplayManagerProxyTest, SetOrientation01, Function | SmallTest | Level
auto result3 = proxy2.SetOrientation(0, Orientation::VERTICAL);
ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result3);
}
/**
* @tc.name: GetDisplaySnapshot01
* @tc.desc: test DisplayManagerProxy::GetDisplaySnapshot
@ -246,6 +253,7 @@ HWTEST_F(DisplayManagerProxyTest, GetDisplaySnapshot01, Function | SmallTest | L
auto result3 = proxy2.GetDisplaySnapshot(0);
ASSERT_EQ(nullptr, result3);
}
/**
* @tc.name: GetScreenSupportedColorGamuts01
* @tc.desc: test DisplayManagerProxy::GetScreenSupportedColorGamuts
@ -269,6 +277,7 @@ HWTEST_F(DisplayManagerProxyTest, GetScreenSupportedColorGamuts01, Function | Sm
auto result3 = proxy2.GetScreenSupportedColorGamuts(0, gamutVector);
ASSERT_EQ(DMError::DM_ERROR_IPC_FAILED, result3);
}
/**
* @tc.name: GetScreenColorGamut01
* @tc.desc: test DisplayManagerProxy::GetScreenColorGamut

2
dmserver/test/unittest/screen_rotation_controller_test.cpp
View File

@ -118,7 +118,6 @@ HWTEST_F(ScreenRotationControllerTest, DefaultDeviceRotationOffset, Function | S
ASSERT_EQ(180, ScreenRotationController::defaultDeviceRotationOffset_);
}
/**
* @tc.name: CalcTargetDisplayRotation
* @tc.desc: Calc target display rotation
@ -606,6 +605,7 @@ HWTEST_F(ScreenRotationControllerTest, CalcRotationDegree, Function | SmallTest
GravityData data2 = {1.f, 1.f, 1.f};
ASSERT_EQ(315, GravitySensorSubscriber::CalcRotationDegree(&data2));
}
/**
* @tc.name: CalcSensorRotation
* @tc.desc: Calc sensor rotation

12
interfaces/innerkits/extension/window_extension_connection.h
View File

@ -51,22 +51,26 @@ public:
* @param rsSurfaceNode Surface node from RS.
*/
virtual void OnWindowReady(const std::shared_ptr<RSSurfaceNode>& rsSurfaceNode) = 0;
/**
* @brief Callback when window extension disconnected.
*/
virtual void OnExtensionDisconnected() = 0;
/**
* @brief Callback when receive key event.
*
* @param event Keyboard event.
*/
virtual void OnKeyEvent(const std::shared_ptr<MMI::KeyEvent>& event) = 0;
/**
* @brief Callback when receive pointer event.
*
* @param event Pointer event.
*/
virtual void OnPointerEvent(const std::shared_ptr<MMI::PointerEvent>& event) = 0;
/**
* @brief Callback when press back button.
*/
@ -84,10 +88,12 @@ public:
* @brief Constructor for WindowExtensionConnection.
*/
WindowExtensionConnection();
/**
* @brief Deconstructor for WindowExtensionConnection.
*/
~WindowExtensionConnection();
/**
* @brief Deconstructor for WindowExtensionConnection.
*
@ -100,6 +106,7 @@ public:
*/
int ConnectExtension(const AppExecFwk::ElementName& element, const Rect& rect,
uint32_t uid, uint32_t windowId, const sptr<IWindowExtensionCallback>& callback) const;
/**
* @brief Deconstructor for WindowExtensionConnection.
*
@ -114,22 +121,27 @@ public:
int ConnectExtension(const AppExecFwk::ElementName& element, const Rect& rect,
uint32_t uid, uint32_t windowId, const sptr<IWindowExtensionCallback>& callback,
const sptr<ExtensionSession>& extensionSession) const;
/**
* @brief Disconnect window extension.
*/
void DisconnectExtension() const;
/**
* @brief Show window extension.
*/
void Show() const;
/**
* @brief Hide window extension.
*/
void Hide() const;
/**
* @brief Request focus of window extension.
*/
void RequestFocus() const;
/**
* @brief Set bounds of window extension.
*

173
interfaces/innerkits/wm/window.h
View File

File diff suppressed because it is too large Load Diff

2
interfaces/innerkits/wm/window_accessibility_controller.h
View File

@ -36,6 +36,7 @@ public:
* @param scale Parameter of zooming.
*/
void SetAnchorAndScale(int32_t x, int32_t y, float scale);
/**
* @brief Set anchor offset, only take effect for the main display.
*
@ -43,6 +44,7 @@ public:
* @param deltaY Y coordinate offset of anchor.
*/
void SetAnchorOffset(int32_t deltaX, int32_t deltaY);
/**
* @brief Turn off the func of window zoom.
*/

32
interfaces/innerkits/wm/window_manager.h
View File

@ -68,6 +68,7 @@ public:
* @param screenId ID of the screen that is connected to the WMS, screenId is currently always 0.
*/
virtual void OnConnected(int32_t userId, int32_t screenId) = 0;
/**
* @brief Notify caller when WMS disconnected
*
@ -91,6 +92,7 @@ public:
* @param focusChangeInfo Window info while its focus status changed.
*/
virtual void OnFocused(const sptr<FocusChangeInfo>& focusChangeInfo) = 0;
/**
* @brief Notify caller when window lose focus
*
@ -114,7 +116,6 @@ public:
virtual void OnWindowModeUpdate(WindowModeType mode) = 0;
};
/**
* @class ISystemBarChangedListener
*
@ -218,6 +219,7 @@ public:
* @brief Default construct of AccessibilityWindowInfo.
*/
AccessibilityWindowInfo() = default;
/**
* @brief Default deconstruct of AccessibilityWindowInfo.
*/
@ -230,6 +232,7 @@ public:
* @return True means marshall success, false means marshall failed.
*/
virtual bool Marshalling(Parcel& parcel) const override;
/**
* @brief Unmarshalling AccessibilityWindowInfo.
*
@ -266,6 +269,7 @@ public:
* @brief Default construct of UnreliableWindowInfo.
*/
UnreliableWindowInfo() = default;
/**
* @brief Default deconstruct of UnreliableWindowInfo.
*/
@ -278,6 +282,7 @@ public:
* @return True means marshall success, false means marshall failed.
*/
virtual bool Marshalling(Parcel& parcel) const override;
/**
* @brief Unmarshalling UnreliableWindowInfo.
*
@ -428,6 +433,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterWMSConnectionChangedListener(const sptr<IWMSConnectionChangedListener>& listener);
/**
* @brief Unregister WMS connection status changed listener.
* @attention Callable only by u0 system user.
@ -435,6 +441,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterWMSConnectionChangedListener();
/**
* @brief Register focus changed listener.
*
@ -442,6 +449,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterFocusChangedListener(const sptr<IFocusChangedListener>& listener);
/**
* @brief Unregister focus changed listener.
*
@ -449,6 +457,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterFocusChangedListener(const sptr<IFocusChangedListener>& listener);
/**
* @brief Register window mode listener.
*
@ -456,6 +465,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterWindowModeChangedListener(const sptr<IWindowModeChangedListener>& listener);
/**
* @brief Unregister window mode listener.
*
@ -463,6 +473,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterWindowModeChangedListener(const sptr<IWindowModeChangedListener>& listener);
/**
* @brief Get window mode type.
*
@ -470,6 +481,7 @@ public:
* @return WM_OK means get success, others means get failed.
*/
WMError GetWindowModeType(WindowModeType& windowModeType) const;
/**
* @brief Register system bar changed listener.
*
@ -477,6 +489,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterSystemBarChangedListener(const sptr<ISystemBarChangedListener>& listener);
/**
* @brief Unregister system bar changed listener.
*
@ -484,6 +497,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterSystemBarChangedListener(const sptr<ISystemBarChangedListener>& listener);
/**
* @brief Register window updated listener.
*
@ -491,6 +505,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterWindowUpdateListener(const sptr<IWindowUpdateListener>& listener);
/**
* @brief Unregister window updated listener.
*
@ -498,6 +513,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterWindowUpdateListener(const sptr<IWindowUpdateListener>& listener);
/**
* @brief Register visibility changed listener.
*
@ -505,6 +521,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterVisibilityChangedListener(const sptr<IVisibilityChangedListener>& listener);
/**
* @brief Unregister visibility changed listener.
*
@ -512,6 +529,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterVisibilityChangedListener(const sptr<IVisibilityChangedListener>& listener);
/**
* @brief Register drawingcontent changed listener.
*
@ -535,6 +553,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterCameraFloatWindowChangedListener(const sptr<ICameraFloatWindowChangedListener>& listener);
/**
* @brief Unregister camera float window changed listener.
*
@ -542,6 +561,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterCameraFloatWindowChangedListener(const sptr<ICameraFloatWindowChangedListener>& listener);
/**
* @brief Register water mark flag changed listener.
*
@ -549,6 +569,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterWaterMarkFlagChangedListener(const sptr<IWaterMarkFlagChangedListener>& listener);
/**
* @brief Unregister water mark flag changed listener.
*
@ -556,6 +577,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterWaterMarkFlagChangedListener(const sptr<IWaterMarkFlagChangedListener>& listener);
/**
* @brief Register gesture navigation enabled changed listener.
*
@ -564,6 +586,7 @@ public:
*/
WMError RegisterGestureNavigationEnabledChangedListener(
const sptr<IGestureNavigationEnabledChangedListener>& listener);
/**
* @brief Unregister gesture navigation enabled changed listener.
*
@ -632,12 +655,14 @@ public:
* @return WM_OK means minimize success, others means minimize failed.
*/
WMError MinimizeAllAppWindows(DisplayId displayId);
/**
* @brief Toggle all app windows to the foreground.
*
* @return WM_OK means toggle success, others means toggle failed.
*/
WMError ToggleShownStateForAllAppWindows();
/**
* @brief Set window layout mode.
*
@ -645,6 +670,7 @@ public:
* @return WM_OK means set success, others means set failed.
*/
WMError SetWindowLayoutMode(WindowLayoutMode mode);
/**
* @brief Get accessibility window info.
*
@ -652,6 +678,7 @@ public:
* @return WM_OK means get success, others means get failed.
*/
WMError GetAccessibilityWindowInfo(std::vector<sptr<AccessibilityWindowInfo>>& infos) const;
/**
* @brief Get unreliable window info.
*
@ -660,6 +687,7 @@ public:
*/
WMError GetUnreliableWindowInfo(int32_t windowId,
std::vector<sptr<UnreliableWindowInfo>>& infos) const;
/**
* @brief Get visibility window info.
*
@ -667,6 +695,7 @@ public:
* @return WM_OK means get success, others means get failed.
*/
WMError GetVisibilityWindowInfo(std::vector<sptr<WindowVisibilityInfo>>& infos) const;
/**
* @brief Set gesture navigation enabled.
*
@ -751,6 +780,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterVisibleWindowNumChangedListener(const sptr<IVisibleWindowNumChangedListener>& listener);
/**
* @brief Unregister visible main window num changed listener.
*

14
interfaces/innerkits/wm/window_manager_lite.h
View File

@ -48,6 +48,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterFocusChangedListener(const sptr<IFocusChangedListener>& listener);
/**
* @brief Unregister focus changed listener.
*
@ -55,6 +56,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterFocusChangedListener(const sptr<IFocusChangedListener>& listener);
/**
* @brief Register visibility changed listener.
*
@ -62,6 +64,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterVisibilityChangedListener(const sptr<IVisibilityChangedListener>& listener);
/**
* @brief Unregister visibility changed listener.
*
@ -69,6 +72,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterVisibilityChangedListener(const sptr<IVisibilityChangedListener>& listener);
/**
* @brief Get visibility window info.
*
@ -76,6 +80,7 @@ public:
* @return WM_OK means get success, others means get failed.
*/
WMError GetVisibilityWindowInfo(std::vector<sptr<WindowVisibilityInfo>>& infos) const;
/**
* @brief Get focus window.
*
@ -83,6 +88,7 @@ public:
* @return FocusChangeInfo object about focus window.
*/
void GetFocusWindowInfo(FocusChangeInfo& focusInfo);
/**
* @brief Register drawingcontent changed listener.
*
@ -98,6 +104,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterDrawingContentChangedListener(const sptr<IDrawingContentChangedListener>& listener);
/**
* @brief Register window mode listener.
*
@ -105,6 +112,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterWindowModeChangedListener(const sptr<IWindowModeChangedListener>& listener);
/**
* @brief Unregister window mode listener.
*
@ -178,7 +186,7 @@ public:
* @return WM_OK if raise success
*/
WMError RaiseWindowToTop(int32_t persistentId);
/**
* @brief Register WMS connection status changed listener.
* @attention Callable only by u0 system user. A process only supports successful registration once.
@ -205,6 +213,7 @@ public:
* @return WM_OK means register success, others means unregister failed.
*/
WMError RegisterWindowStyleChangedListener(const sptr<IWindowStyleChangedListener>& listener);
/**
* @brief Unregister WindowStyle changed listener.
*
@ -212,6 +221,7 @@ public:
* @return WM_OK means unregister success, others means unregister failed.
*/
WMError UnregisterWindowStyleChangedListener(const sptr<IWindowStyleChangedListener>& listener);
/**
* @brief Get window style type.
*
@ -283,7 +293,7 @@ public:
* @return WM_OK means register success, others means register failed.
*/
WMError RegisterWindowUpdateListener(const sptr<IWindowUpdateListener>& listener);
/**
* @brief Unregister window updated listener.
*

1
interfaces/innerkits/wm/window_option.h
View File

@ -139,6 +139,7 @@ public:
* @param y The position y of hit offset.
*/
void SetHitOffset(int32_t x, int32_t y);
/**
* @brief Set window tag.
*

1
interfaces/kits/cj/window_runtime/window_ffi.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "window_ffi.h"
#include <transaction/rs_interfaces.h>
#include "pixel_map_impl.h"

1
interfaces/kits/cj/window_runtime/window_ffi.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef WINDOW_FFI_H
#define WINDOW_FFI_H

1
interfaces/kits/cj/window_runtime/window_impl.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "window_impl.h"
#include <regex>
#include <sstream>

1
interfaces/kits/cj/window_runtime/window_impl.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef WINDOW_IMPL_H
#define WINDOW_IMPL_H

1
interfaces/kits/cj/window_runtime/window_manager_impl.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "window_manager_impl.h"
#include "ability.h"
#include "ability_context.h"

1
interfaces/kits/cj/window_runtime/window_manager_impl.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef WINDOW_MANAGER_IMPL_H
#define WINDOW_MANAGER_IMPL_H

3
interfaces/kits/dmndk/dm/oh_display_info.h
View File

@ -158,10 +158,13 @@ typedef enum {
typedef struct {
/** rect left */
int32_t left;
/** rect top */
int32_t top;
/** rect width */
uint32_t width;
/** rect height */
uint32_t height;
} NativeDisplayManager_Rect;

1
interfaces/kits/napi/extension_window/js_extension_window_register_manager.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "js_extension_window_register_manager.h"
#include "singleton_container.h"
#include "window_manager.h"

1
interfaces/kits/napi/screenshot/native_screenshot_module.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "native_screenshot_module.h"
#include <cinttypes>

1
interfaces/kits/napi/window_runtime/window_manager_napi/js_window_manager.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "js_err_utils.h"
#include "js_window_manager.h"
#include <ability.h>

1
interfaces/kits/napi/window_runtime/window_napi/js_extension_window_config.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "js_extension_window_config.h"
#include <string>
#include "js_window_utils.h"

4
interfaces/kits/napi/window_runtime/window_napi/js_window.h
View File

@ -178,7 +178,7 @@ public:
*/
static napi_value CreateSubWindowWithOptions(napi_env env, napi_callback_info info);
/*
/**
* Gesture Back
*/
static napi_value SetGestureBackEnabled(napi_env env, napi_callback_info info);
@ -327,7 +327,7 @@ private:
*/
napi_value OnCreateSubWindowWithOptions(napi_env env, napi_callback_info info);
/*
/**
* Gesture Back
*/
napi_value OnSetGestureBackEnabled(napi_env env, napi_callback_info info);

1
interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "js_window_register_manager.h"
#include "singleton_container.h"
#include "window_manager.h"

1
interfaces/kits/napi/window_runtime/window_napi/js_window_register_manager.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_JS_WINDOW_REGISTER_MANAGER_H
#define OHOS_JS_WINDOW_REGISTER_MANAGER_H
#include <map>

1
interfaces/kits/napi/window_runtime/window_napi/js_window_utils.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "js_window_utils.h"
#include <iomanip>
#include <regex>

3
interfaces/kits/ndk/wm/oh_window_comm.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OH_WINDOW_COMM_H
#define OH_WINDOW_COMM_H
@ -29,8 +30,10 @@ extern "C" {
typedef enum {
/** succ. */
OK = 0,
/** window id is invaild. */
INVAILD_WINDOW_ID = 1000,
/** failed. */
SERVICE_ERROR = 2000,
} WindowManager_ErrorCode;

1
interfaces/kits/ndk/wm/oh_window_event_filter.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OH_WINDOW_EVENT_FILTER_H
#define OH_WINDOW_EVENT_FILTER_H

2
previewer/include/window.h
View File

@ -356,6 +356,7 @@ public:
{
return WMError::WM_ERROR_DEVICE_NOT_SUPPORT;
}
/**
* @brief Set the application modality of main window.
*
@ -366,6 +367,7 @@ public:
{
return WMError::WM_ERROR_DEVICE_NOT_SUPPORT;
}
/**
* @brief Set the modality of sub window.
*

1
previewer/mock/js_window_register_manager.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "js_window_register_manager.h"
#include "window_manager_hilog.h"

1
previewer/mock/js_window_register_manager.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_JS_WINDOW_REGISTER_MANAGER_H
#define OHOS_JS_WINDOW_REGISTER_MANAGER_H
#include <map>

1
previewer/mock/window_manager_napi/js_window_manager.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "js_err_utils.h"
#include "js_window_manager.h"
#include "js_window.h"

1
snapshot/src/snapshot_utils.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "snapshot_utils.h"
#include <cerrno>

2
snapshot/test/unittest/snapshot_utils_test.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <fcntl.h>
#include <gtest/gtest.h>
#include "display.h"
@ -336,7 +337,6 @@ HWTEST_F(SnapshotUtilsTest, Write10, Function | MediumTest | Level3)
ASSERT_FALSE(SnapShotUtils::WriteToJpeg(1, param));
}
/**
* @tc.name: CheckWHValid
* @tc.desc: Check width and height whether valid

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

@ -13,7 +13,6 @@
* limitations under the License.
*/
#include "iremote_broker.h"
#include "window.h"
#include "zidl/window_interface.h"

1
test/common/mock/mock_RSIWindowAnimationController.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef FRAMEWORKS_WM_TEST_UT_MOCK_RSIWINDOWANIMATIONCONTROLLER_H
#define FRAMEWORKS_WM_TEST_UT_MOCK_RSIWINDOWANIMATIONCONTROLLER_H

1
test/common/utils/src/common_test_utils.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <iostream>
#include "common_test_utils.h"

1
test/systemtest/dms/display_manager_test.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <gtest/gtest.h>
#include <transaction/rs_transaction.h>
#include <ui/rs_surface_node.h>

1
test/systemtest/wms/window_dialogwindow_test.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include <gtest/gtest.h>
#include "ability_context_impl.h"
#include "window.h"

1
test/systemtest/wms/window_layout_integration_test.cpp
View File

@ -581,6 +581,7 @@ HWTEST_F(WindowLayoutTest, resize08, Function | MediumTest | Level3)
ret = window->Resize(windowLimits.maxWidth_ + 100, windowLimits.maxHeight_ + 100);
EXPECT_EQ(WMError::WM_ERROR_INVALID_OPERATION, ret);
}
/**
* @tc.name: SetWindowLimitsDataRoute
* @tc.desc: test data route for SetWindowLimits

1
test/systemtest/wms/window_rotation_test.cpp
View File

@ -238,7 +238,6 @@ HWTEST_F(WindowRotationTest, WindowRotationTest3, Function | MediumTest | Level3
sleep(SPLIT_TEST_SLEEP_S);
}
/**
* @tc.name: WindowRotationTest4
* @tc.desc: create window with orientation after setting screen default orientation.

1
test/systemtest/wms/window_systemsubwindow_test.cpp
View File

@ -343,6 +343,7 @@ HWTEST_F(WindowSystemSubWindowTest, SystemSubWindow06, Function | MediumTest | L
ASSERT_EQ(WMError::WM_OK, subWindow->Destroy());
ASSERT_EQ(WMError::WM_OK, baseWindow->Destroy());
}
/**
* @tc.name: SystemSubWindow07
* @tc.desc: create sub windows with dialog

1
utils/include/agent_death_recipient.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_AGENT_DEATH_RECIPIENT_H
#define OHOS_ROSEN_AGENT_DEATH_RECIPIENT_H

1
utils/include/atomic_map.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef ATOMIC_MAP_H
#define ATOMIC_MAP_H

1
utils/include/display_change_info.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_DISPLAY_CHANGFE_INFO_H
#define OHOS_ROSEN_DISPLAY_CHANGFE_INFO_H

3
utils/include/focus_change_info.h
View File

@ -29,16 +29,19 @@ public:
* @brief Default construct of FocusChangeInfo
*/
FocusChangeInfo() = default;
/**
* @brief Construct of FocusChangeInfo
*/
FocusChangeInfo(uint32_t winId, DisplayId displayId, int32_t pid, int32_t uid, WindowType type,
const sptr<IRemoteObject>& abilityToken): windowId_(winId), displayId_(displayId), pid_(pid), uid_(uid),
windowType_(type), abilityToken_(abilityToken) {};
/**
* @brief Deconstruct of FocusChangeInfo
*/
~FocusChangeInfo() = default;
/**
* @brief Marshalling FocusChangeInfo.
*

3
utils/include/window_drawing_content_info.h
View File

@ -41,6 +41,7 @@ public:
* @brief Default construct of WindowDrawingContentInfo.
*/
WindowDrawingContentInfo() = default;
/**
* @brief Construct of WindowDrawingContentInfo.
*
@ -53,6 +54,7 @@ public:
WindowDrawingContentInfo(uint32_t winId, int32_t pid, int32_t uid, bool drawingContentState,
WindowType winType) : windowId_(winId), pid_(pid), uid_(uid),
drawingContentState_(drawingContentState), windowType_(winType) {};
/**
* @brief Deconstruct of WindowDrawingContentInfo.
*/
@ -65,6 +67,7 @@ public:
* @return True means marshall success, false means marshall failed.
*/
virtual bool Marshalling(Parcel& parcel) const override;
/**
* @brief Unmarshalling WindowDrawingContentInfo.
*

2
utils/include/window_visibility_info.h
View File

@ -56,6 +56,7 @@ public:
* @brief Default construct of WindowVisibilityInfo.
*/
WindowVisibilityInfo() = default;
/**
* @brief Construct of WindowVisibilityInfo.
*
@ -87,6 +88,7 @@ public:
* @return True means marshall success, false means marshall failed.
*/
virtual bool Marshalling(Parcel& parcel) const override;
/**
* @brief Unmarshalling WindowVisibilityInfo.
*

1
utils/include/wm_occlusion_region.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_WM_OCCLUSION_REGION_H
#define OHOS_ROSEN_WM_OCCLUSION_REGION_H

1
utils/src/surface_reader_handler_impl.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "surface_reader_handler_impl.h"
#include "window_manager_hilog.h"

1
utils/src/wm_math.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "wm_math.h"
#include <cstdlib>

1
utils/src/wm_occlusion_region.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "wm_occlusion_region.h"
#include <map>

3
utils/test/unittest/permission_test.cpp
View File

@ -68,6 +68,7 @@ HWTEST_F(PermissionTest, IsSystemServiceCalling, Function | SmallTest | Level2)
bool result = Permission::IsSystemServiceCalling(true, true);
ASSERT_EQ(true, result);
}
/**
* @tc.name: IsSystemCallingOrStartByHdcd
* @tc.desc: test fuction : IsSystemCallingOrStartByHdcd
@ -80,6 +81,7 @@ HWTEST_F(PermissionTest, IsSystemCallingOrStartByHdcd, Function | SmallTest | Le
bool result2 = Permission::IsSystemCallingOrStartByHdcd(true);
ASSERT_EQ(true, result2);
}
/**
* @tc.name: IsStartByInputMethod
* @tc.desc: test fuction : IsStartByInputMethod
@ -90,6 +92,7 @@ HWTEST_F(PermissionTest, IsStartByInputMethod, Function | SmallTest | Level2)
bool result = Permission::IsStartByInputMethod();
ASSERT_EQ(false, result);
}
/**
* @tc.name: CheckIsCallingBundleName
* @tc.desc: test fuction : CheckIsCallingBundleName

4
utils/test/unittest/surface_draw_test.cpp
View File

@ -135,6 +135,7 @@ HWTEST_F(SurfaceDrawTest, DrawImage01, Function | SmallTest | Level1)
ASSERT_FALSE(SurfaceDraw::DrawImage(surfaceNode, -1, -1, IMAGE_PLACE_HOLDER_PNG_PATH));
window->Destroy();
}
/**
* @tc.name: DecodeImageToPixelMap
* @tc.desc: SurfaceDraw::DecodeImageToPixelMap test
@ -145,6 +146,7 @@ HWTEST_F(SurfaceDrawTest, DecodeImageToPixelMap01, Function | SmallTest | Level1
ASSERT_EQ(SurfaceDraw::DecodeImageToPixelMap(""), nullptr);
ASSERT_NE(SurfaceDraw::DecodeImageToPixelMap(IMAGE_PLACE_HOLDER_PNG_PATH), nullptr);
}
/**
* @tc.name: DrawMasking
* @tc.desc: SurfaceDraw::DrawMasking test
@ -175,6 +177,7 @@ HWTEST_F(SurfaceDrawTest, DrawMasking01, Function | SmallTest | Level1)
SurfaceDraw::DrawMasking(surfaceNode, screenRect, transRect);
window->Destroy();
}
/**
* @tc.name: DoDrawImageRect
* @tc.desc: SurfaceDraw::DoDrawImageRect test
@ -210,6 +213,7 @@ HWTEST_F(SurfaceDrawTest, DoDrawImageRect01, Function | SmallTest | Level1)
ASSERT_TRUE(SurfaceDraw::DoDrawImageRect(buffer, rect, pixelMap, color, false));
window->Destroy();
}
/**
* @tc.name: GetSurfaceSnapshot
* @tc.desc: SurfaceDraw::GetSurfaceSnapshot test

3
utils/test/unittest/surface_reader_test.cpp
View File

@ -42,6 +42,7 @@ HWTEST_F(SurfaceReaderTest, Init, Function | SmallTest | Level2)
delete reader;
GTEST_LOG_(INFO) << "SurfaceReaderTest: Init end";
}
/**
* @tc.name: OnVsync
* @tc.desc: normal function
@ -55,6 +56,7 @@ HWTEST_F(SurfaceReaderTest, OnVsync, Function | SmallTest | Level2)
delete reader;
ASSERT_EQ(res, true);
}
/**
* @tc.name: GetSurface
* @tc.desc: normal function
@ -68,6 +70,7 @@ HWTEST_F(SurfaceReaderTest, GetSurface, Function | SmallTest | Level2)
ASSERT_NE(surface, nullptr);
delete reader;
}
/**
* @tc.name: SetHandler
* @tc.desc: normal function

6
utils/test/unittest/utils_all_test.cpp
View File

@ -85,6 +85,7 @@ HWTEST_F(UtilsAllTest, ADROnRemoteDied01, Function | SmallTest | Level2)
deathRecipient->OnRemoteDied(remoteObj);
ASSERT_EQ(1, remoteObj->count_);
}
/**
* @tc.name: PRCount01
* @tc.desc: test PerformReporter::count
@ -100,6 +101,7 @@ HWTEST_F(UtilsAllTest, PRCount01, Function | SmallTest | Level2)
reporter.timeSplitCount_.clear();
ASSERT_EQ(1, reporter.totalCount_);
}
/**
* @tc.name: SCAddSingleton01
* @tc.desc: test SingletonContainer::AddSingleton
@ -151,6 +153,7 @@ HWTEST_F(UtilsAllTest, SCSetSingleton01, Function | SmallTest | Level2)
singletonContainer.stringMap.erase("test");
delete testObj;
}
/**
* @tc.name: SCDependOn01
* @tc.desc: test SingletonContainer::DependOn
@ -177,6 +180,7 @@ HWTEST_F(UtilsAllTest, SCDependOn01, Function | SmallTest | Level2)
singletonContainer.stringMap.erase("test");
id = singletonContainer.dependencySetMap.erase(id);
}
/**
* @tc.name: SRHOnImageAvailable01
* @tc.desc: test SurfaceReaderHandlerImpl::OnImageAvailable
@ -192,6 +196,7 @@ HWTEST_F(UtilsAllTest, SRHOnImageAvailable, Function | SmallTest | Level2)
surfaceReaderHandlerImpl->OnImageAvailable(nullptr);
ASSERT_EQ(true, surfaceReaderHandlerImpl->flag_);
}
/**
* @tc.name: SRHGetPixelMap01
* @tc.desc: test SurfaceReaderHandlerImpl::GetPixelMap
@ -206,6 +211,7 @@ HWTEST_F(UtilsAllTest, SRHGetPixelMap, Function | SmallTest | Level2)
surfaceReaderHandlerImpl->flag_ = true;
surfaceReaderHandlerImpl->GetPixelMap();
}
/**
* @tc.name: SysCapUtilGetClientName
* @tc.desc: test SysCapUtil::GetClientName

1
utils/test/unittest/window_frame_trace_impl_test.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "window_frame_trace.h"
#include <gtest/gtest.h>
#include <unistd.h>

1
utils/test/unittest/window_transition_info_test.cpp
View File

@ -88,6 +88,7 @@ HWTEST_F(WindowTransitionInfoTest, WindowTransitionInfo01, Function | SmallTest
ASSERT_EQ(1, winTransitionInfo2->supportWindowModes_.size());
ASSERT_EQ(AppExecFwk::SupportWindowMode::SPLIT, winTransitionInfo2->supportWindowModes_[0]);
}
/**
* @tc.name: Marshalling
* @tc.desc: WindowTransitionInfo::Marshalling test

1
utils/test/unittest/wm_math_test.cpp
View File

@ -97,6 +97,7 @@ HWTEST_F(WmMathTest, TransformMatrix, Function | SmallTest | Level2)
ASSERT_EQ(true, MathHelper::NearZero((scale - scaleComp).Length()));
ASSERT_EQ(true, MathHelper::NearZero((translation - translationComp).Length()));
}
/**
* @tc.name: TransformWithPerspDiv
* @tc.desc: Create transform matrix

7
utils/test/unittest/wm_occlusion_region_test.cpp
View File

@ -127,6 +127,7 @@ HWTEST_F(WmOcclusionRegionTest, Update01, Function | SmallTest | Level2)
delete rootNode;
}
/**
* @tc.name: Node::GetAndRange01
* @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetAndRange
@ -171,6 +172,7 @@ HWTEST_F(WmOcclusionRegionTest, GetAndRange01, Function | SmallTest | Level2)
delete rootNode;
}
/**
* @tc.name: Node::GetOrRange01
* @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetOrRange
@ -225,6 +227,7 @@ HWTEST_F(WmOcclusionRegionTest, GetOrRange01, Function | SmallTest | Level2)
delete rootNode;
}
/**
* @tc.name: Node::GetXOrRange01
* @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetXOrRange
@ -277,6 +280,7 @@ HWTEST_F(WmOcclusionRegionTest, GetXOrRange01, Function | SmallTest | Level2)
delete rootNode;
}
/**
* @tc.name: Node::GetSubRange01
* @tc.desc: test WmOcclusionRegion WmOcclusion::Node::GetSubRange
@ -326,6 +330,7 @@ HWTEST_F(WmOcclusionRegionTest, GetSubRange01, Function | SmallTest | Level2)
delete rootNode;
}
/**
* @tc.name: Region::UpdateRects01
* @tc.desc: test WmOcclusionRegion WmOcclusion::Region::UpdateRects
@ -365,6 +370,7 @@ HWTEST_F(WmOcclusionRegionTest, UpdateRects01, Function | SmallTest | Level2)
}
delete region;
}
/**
* @tc.name: Region::MakeBound01
* @tc.desc: test WmOcclusionRegion WmOcclusion::Region::MakeBound
@ -396,6 +402,7 @@ HWTEST_F(WmOcclusionRegionTest, MakeBound01, Function | SmallTest | Level2)
delete region;
}
/**
* @tc.name: Region::RegionOpLocal01
* @tc.desc: test WmOcclusionRegion WmOcclusion::Region::RegionOpLocal

1
window_scene/intention_event/src/intention_event_manager.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "intention_event_manager.h"
#ifdef IMF_ENABLE

19
window_scene/interfaces/include/ws_common.h
View File

@ -196,78 +196,97 @@ enum class FocusChangeReason {
* default focus change reason
*/
DEFAULT = 0,
/**
* focus change for move up
*/
MOVE_UP,
/**
* focus change for click
*/
CLICK,
/**
* focus change for foreground
*/
FOREGROUND,
/**
* focus change for background
*/
BACKGROUND,
/**
* focus change for split screen.5
*/
SPLIT_SCREEN,
/**
* focus change for full screen
*/
FULL_SCREEN,
/**
* focus change for global search
*/
SCB_SESSION_REQUEST,
/**
* focus change for floating scene
*/
FLOATING_SCENE,
/**
* focus change for losing focus
*/
SCB_SESSION_REQUEST_UNFOCUS,
/**
* focus change for client requerst.10
*/
CLIENT_REQUEST,
/**
* focus change for wind
*/
WIND,
/**
* focus change for app foreground
*/
APP_FOREGROUND,
/**
* focus change for app background
*/
APP_BACKGROUND,
/**
* focus change for recent,Multitasking
*/
RECENT,
/**
* focus change for inner app.
*/
SCB_START_APP,
/**
* focus for setting focuable.
*/
FOCUSABLE,
/**
* select last focused app when requestSessionUnFocus.
*/
LAST_FOCUSED_APP,
/**
* focus for zOrder pass through VOICE_INTERACTION.
*/
VOICE_INTERACTION,
/**
* focus change max.
*/

1
window_scene/screen_session_manager/include/fold_screen_controller/dual_display_fold_policy.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_WINDOW_SCENE_DUAL_DISPLAY_FOLD_POLICY_H
#define OHOS_ROSEN_WINDOW_SCENE_DUAL_DISPLAY_FOLD_POLICY_H

1
window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_controller.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_CONTROLLER_H
#define OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_CONTROLLER_H

1
window_scene/screen_session_manager/include/fold_screen_controller/fold_screen_policy.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_POLICY_H
#define OHOS_ROSEN_WINDOW_SCENE_FOLD_SCREEN_POLICY_H

1
window_scene/screen_session_manager/include/fold_screen_controller/single_display_fold_policy.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_FOLD_POLICY_H
#define OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_FOLD_POLICY_H

1
window_scene/screen_session_manager/include/fold_screen_controller/single_display_pocket_fold_policy.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_POCKET_FOLD_POLICY_H
#define OHOS_ROSEN_WINDOW_SCENE_SINGLE_DISPLAY_POCKET_FOLD_POLICY_H

1
window_scene/screen_session_manager/include/screen_sensor_plugin.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef SCREEN_SENSOR_PLUGIN_H
#define SCREEN_SENSOR_PLUGIN_H

1
window_scene/screen_session_manager/include/screen_setting_helper.h
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef OHOS_ROSEN_WINDOW_SCENE_SCREEN_SETTING_HELPER_H
#define OHOS_ROSEN_WINDOW_SCENE_SCREEN_SETTING_HELPER_H

1
window_scene/screen_session_manager/src/screen_scene_config.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "screen_scene_config.h"
#include <climits>

1
window_scene/screen_session_manager/src/screen_sensor_plugin.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "screen_sensor_plugin.h"
namespace OHOS {

1
window_scene/screen_session_manager/src/screen_session_dumper.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "screen_session_dumper.h"
#include <csignal>

1
window_scene/screen_session_manager/src/screen_setting_helper.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "screen_setting_helper.h"
#include "window_manager_hilog.h"

20
window_scene/session/host/include/scene_session.h
View File

@ -181,7 +181,7 @@ public:
WSError OnDefaultDensityEnabled(bool isDefaultDensityEnabled) override;
WSError RaiseToAppTop() override;
/*
/**
* Window Layout
*/
WSError UpdateSizeChangeReason(SizeChangeReason reason) override;
@ -383,14 +383,14 @@ public:
void RegisterDefaultDensityEnabledCallback(NotifyDefaultDensityEnabledFunc&& callback);
void RegisterForceSplitListener(const NotifyForceSplitFunc& func);
/*
/**
* Dialog Window
*/
void RegisterBindDialogSessionCallback(NotifyBindDialogSessionFunc&& callback);
void SetUpdatePrivateStateAndNotifyFunc(const UpdatePrivateStateAndNotifyFunc& func);
/*
/**
* Window Input Event
*/
void RegisterTouchOutsideCallback(NotifyTouchOutsideFunc&& callback);
@ -575,7 +575,7 @@ protected:
sptr<SpecificSessionCallback> specificCallback_ = nullptr;
sptr<SessionChangeCallback> sessionChangeCallback_ = nullptr;
/*
/**
* Dialog window
*/
NotifyBindDialogSessionFunc onBindDialogTarget_;
@ -592,19 +592,19 @@ protected:
NotifyMainSessionModalTypeChangeFunc onMainSessionModalTypeChange_;
NotifySessionModalTypeChangeFunc onSessionModalTypeChange_;
/*
/**
* PiP Window
*/
NotifyPrepareClosePiPSessionFunc onPrepareClosePiPSession_;
/*
/**
* Window Lifecycle
*/
NotifyShowWhenLockedFunc onShowWhenLockedFunc_;
NotifyForceHideChangeFunc onForceHideChangeFunc_;
ClearCallbackMapFunc clearCallbackMapFunc_;
/*
/**
* PC Fold Screen
*/
sptr<PcFoldScreenController> pcFoldScreenController_ = nullptr;
@ -616,7 +616,7 @@ protected:
NotifyRestoreMainWindowFunc onRestoreMainWindowFunc_;
NotifySetWindowRectAutoSaveFunc onSetWindowRectAutoSaveFunc_;
/*
/**
* Window Layout
*/
NotifyDefaultDensityEnabledFunc onDefaultDensityEnabledFunc_;
@ -827,12 +827,12 @@ private:
*/
NotifyVisibleChangeFunc notifyVisibleChangeFunc_;
/*
/**
* Window Input Event
*/
NotifyTouchOutsideFunc onTouchOutside_;
/*
/**
* Window Rotation
*/
NotifyReqOrientationChangeFunc onRequestedOrientationChange_;

14
window_scene/session/host/include/session.h
View File

@ -479,7 +479,7 @@ public:
bool GetForegroundInteractiveStatus() const;
virtual void SetForegroundInteractiveStatus(bool interactive);
/*
/**
* Window Lifecycle
*/
bool GetIsPendingToBackgroundState() const;
@ -520,7 +520,7 @@ public:
void SetAppInstanceKey(const std::string& appInstanceKey);
std::string GetAppInstanceKey() const;
/*
/**
* Starting Window
*/
WSError RemoveStartingWindow() override;
@ -531,7 +531,7 @@ public:
void SetUseStartingWindowAboveLocked(bool useStartingWindowAboveLocked);
bool UseStartingWindowAboveLocked() const;
/*
/**
* Window Hierarchy
*/
void ProcessClickModalWindowOutside(int32_t posX, int32_t posY);
@ -695,12 +695,12 @@ protected:
mutable std::shared_mutex keyEventMutex_;
bool rectChangeListenerRegistered_ = false;
/*
/**
* Window Hierarchy
*/
NotifyClickModalWindowOutsideFunc clickModalWindowOutsideFunc_;
/*
/**
* Window Pipeline
*/
uint32_t dirtyFlags_ = 0; // only accessed on SSM thread
@ -795,7 +795,7 @@ private:
std::atomic<bool> rectChangeBySystem_ { false };
std::atomic_bool foregroundInteractiveStatus_ { true };
/*
/**
* Window Lifecycle
*/
std::atomic<bool> isAttach_ { false };
@ -808,7 +808,7 @@ private:
DetectTaskInfo detectTaskInfo_;
mutable std::shared_mutex detectTaskInfoMutex_;
/*
/**
* Starting Window
*/
bool enableRemoveStartingWindow_ { false };

1
window_scene/session/host/include/zidl/session_interface.h
View File

@ -283,6 +283,7 @@ public:
virtual WSError RequestFocus(bool isFocused) { return WSError::WS_OK; }
virtual void NotifyExtensionEventAsync(uint32_t notifyEvent) {};
/**
* @brief Callback for session modal type changes.
*

2
window_scene/session/host/include/zidl/session_proxy.h
View File

@ -112,7 +112,7 @@ public:
*/
WMError SetGestureBackEnabled(bool isEnabled) override;
/*
/**
* Starting Window
*/
WSError RemoveStartingWindow() override;

12
window_scene/session/host/src/pc_fold_screen_controller.cpp
View File

@ -203,7 +203,7 @@ bool PcFoldScreenManager::NeedDoThrowSlip(ScreenSide startSide, const WSRectF& v
return false;
}
/*
/**
* move rect to other side
* @param rect: current side, moved to other side
* @param titleHeight: used in arrange rule to avoid title bar
@ -305,7 +305,7 @@ void PcFoldScreenManager::MappingRectInScreenSideWithArrangeRule(ScreenSide side
}
}
/*
/**
* init rule: move rect to center of display
* @param titleHeight: in vp
*/
@ -318,7 +318,7 @@ void PcFoldScreenManager::ApplyInitArrangeRule(WSRect& rect, WSRect& lastArrange
lastArrangedRect = { rect.posX_, rect.posY_, RULE_TRANS_X * vpr, titleHeight * vpr };
}
/*
/**
* init rule: move rect to bottom-right of last arranged position
* @param titleHeight: in vp
*/
@ -378,7 +378,7 @@ void PcFoldScreenController::RecordMoveRects(const WSRect& rect)
TimeHelper::GetDuration(movingRectRecords_[0].first, movingRectRecords_[movingRectRecords_.size() - 1].first));
}
/*
/**
* if move fast, window can be throwed to other side
* @param rect: current rect. if throwed, move it to other side
* @param topAvoidHeight: avoid status bar
@ -411,7 +411,7 @@ bool PcFoldScreenController::ThrowSlip(DisplayId displayId, WSRect& rect,
return true;
}
/*
/**
* resize to fullscreen in one side considering avoid area
* @param rect: resize in its side
*/
@ -449,7 +449,7 @@ int32_t PcFoldScreenController::GetPersistentId() const
return sceneSession->GetPersistentId();
}
/*
/**
* get height of title bar
* @return: vp
*/

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

@ -2585,7 +2585,7 @@ void SceneSession::HandleMoveDragEnd(WSRect& rect, SizeChangeReason reason)
OnSessionEvent(SessionEvent::EVENT_END_MOVE);
}
/*
/**
* move with init velocity
* @return true: rect change notified when move
*/

4
window_scene/session_manager/include/extension_session_manager.h
View File

@ -36,6 +36,7 @@ public:
* @return sptr<ExtensionSession> return session if create extension session success;Otherwise, return nullptr
*/
sptr<ExtensionSession> RequestExtensionSession(const SessionInfo& sessionInfo);
/**
* @brief active extension session
*
@ -44,6 +45,7 @@ public:
*/
WSError RequestExtensionSessionActivation(const sptr<ExtensionSession>& extensionSession, uint32_t hostWindowId,
const std::function<void(WSError)>&& resultCallback);
/**
* @brief background extension session
*
@ -52,6 +54,7 @@ public:
*/
WSError RequestExtensionSessionBackground(
const sptr<ExtensionSession>& extensionSession, const std::function<void(WSError)>&& resultCallback);
/**
* @brief destroy extension session
*
@ -60,6 +63,7 @@ public:
*/
WSError RequestExtensionSessionDestruction(
const sptr<ExtensionSession>& extensionSession, const std::function<void(WSError)>&& resultCallback);
/**
* @brief destroy extension session done
*

72
window_scene/session_manager/include/scene_session_manager.h
View File

@ -142,7 +142,7 @@ public:
void OnGetSurfaceNodeIdsFromMissionIds(std::vector<uint64_t>& missionIds,
std::vector<uint64_t>& surfaceNodeIds, bool isBlackList = false) override;
/*
/**
* Fold Screen Status Change Report
*/
void OnScreenFoldStatusChanged(const std::vector<std::string>& screenFoldInfo) override;
@ -208,7 +208,7 @@ public:
void SetDumpUITreeFunc(const DumpUITreeFunc& func);
const AppWindowSceneConfig& GetWindowSceneConfig() const;
/*
/**
* Window Rotate Animation
*/
void UpdateRotateAnimationConfig(const RotateAnimationConfig& config);
@ -222,7 +222,7 @@ public:
WMError UnregisterWindowManagerAgent(WindowManagerAgentType type,
const sptr<IWindowManagerAgent>& windowManagerAgent) override;
/*
/**
* Dump
*/
WSError GetAllSessionDumpInfo(std::string& info);
@ -234,7 +234,7 @@ public:
WSError DumpSessionAll(std::vector<std::string>& infos) override;
WSError DumpSessionWithId(int32_t persistentId, std::vector<std::string>& infos) override;
/*
/**
* Window Focus
*/
WSError SetFocusedSessionId(int32_t persistentId);
@ -308,7 +308,7 @@ public:
WMError GetTopWindowId(uint32_t mainWinId, uint32_t& topWinId) override;
WMError GetParentMainWindowId(int32_t windowId, int32_t& mainWindowId) override;
/*
/**
* PC Window
*/
WMError IsPcOrPadFreeMultiWindowMode(bool& isPcOrPadFreeMultiWindowMode) override;
@ -338,7 +338,7 @@ public:
void SetRootSceneProcessBackEventFunc(const RootSceneProcessBackEventFunc& processBackEventFunc);
void RegisterWindowChanged(const WindowChangedFunc& func);
/*
/**
* Collaborator
*/
void SetAbilityManagerCollaboratorRegisteredFunc(const AbilityManagerCollaboratorRegisteredFunc& func);
@ -371,7 +371,7 @@ public:
void RegisterCreateSubSessionListener(int32_t persistentId, const NotifyCreateSubSessionFunc& func);
void UnregisterCreateSubSessionListener(int32_t persistentId);
/*
/**
* Window Immersive
*/
WSError GetIsLayoutFullScreen(bool& isLayoutFullScreen);
@ -430,7 +430,7 @@ public:
int32_t GetCustomDecorHeight(int32_t persistentId);
/*
/**
* Free Multi Window
*/
WSError SwitchFreeMultiWindow(bool enable);
@ -447,13 +447,13 @@ public:
void ProcessDisplayScale(sptr<DisplayInfo>& displayInfo);
WMError GetRootMainWindowId(int32_t persistentId, int32_t& hostWindowId);
/*
/**
* Multi Window
*/
void SetCloseTargetFloatWindowFunc(const ProcessCloseTargetFloatWindowFunc& func);
WMError CloseTargetFloatWindow(const std::string& bundleName);
/*
/**
* Fold Screen Status Change Report
*/
WMError ReportScreenFoldStatusChange(const std::vector<std::string>& screenFoldInfo);
@ -466,24 +466,24 @@ public:
WMError GetProcessSurfaceNodeIdByPersistentId(const int32_t pid,
const std::vector<int32_t>& persistentIds, std::vector<uint64_t>& surfaceNodeIds) override;
/*
/**
* Window ZOrder: PC
*/
void RefreshPcZOrderList(uint32_t startZOrder, std::vector<int32_t>&& persistentIds);
/*
/**
* Window Watermark
*/
WMError SetProcessWatermark(int32_t pid, const std::string& watermarkName, bool isEnabled) override;
/*
/**
* Window Snapshot
*/
WMError SkipSnapshotForAppProcess(int32_t pid, bool skip) override;
WMError SkipSnapshotByUserIdAndBundleNames(int32_t userId,
const std::vector<std::string>& bundleNameList) override;
/*
/**
* Multi instance
*/
int32_t GetMaxInstanceCount(const std::string& bundleName);
@ -491,19 +491,19 @@ public:
std::string GetLastInstanceKey(const std::string& bundleName);
void RefreshAppInfo(const std::string& bundleName);
/*
/**
* Window Property
*/
WMError ReleaseForegroundSessionScreenLock() override;
/*
/**
* PiP Window
*/
WMError CloseTargetPiPWindow(const std::string& bundleName);
WMError GetCurrentPiPWindowInfo(std::string& bundleName);
void SetStartPiPFailedListener(NotifyStartPiPFailedFunc&& func);
/*
/**
* Screen Manager
*/
WMError GetDisplayIdByWindowId(const std::vector<uint64_t>& windowIds,
@ -567,14 +567,14 @@ private:
bool GetSessionRSVisible(const sptr<Session>& session,
const std::vector<std::pair<uint64_t, WindowVisibilityState>>& currVisibleData);
/*
/**
* Window Pipeline
*/
void ProcessFocusZOrderChange(uint32_t dirty);
void PostProcessFocus();
void PostProcessProperty(uint32_t dirty);
/*
/**
* Window Focus
*/
std::vector<std::pair<int32_t, sptr<SceneSession>>> GetSceneSessionVector(CmpFunc cmp);
@ -686,7 +686,7 @@ private:
void RegisterSessionSnapshotFunc(const sptr<SceneSession>& sceneSession);
void ResetWantInfo(const sptr<SceneSession>& sceneSession);
/*
/**
* Window Rotate Animation
*/
void RegisterAcquireRotateAnimationConfigFunc(const sptr<SceneSession>& sceneSession);
@ -718,21 +718,21 @@ private:
void RegisterSecSurfaceInfoListener();
void UpdatePiPWindowStateChanged(const std::string& bundleName, bool isForeground);
/*
/**
* UIExtension
*/
void DestroyUIServiceExtensionSubWindow(const sptr<SceneSession>& sceneSession);
WSError CheckSubSessionStartedByExtensionAndSetDisplayId(const sptr<IRemoteObject>& token,
const sptr<WindowSessionProperty>& property, const sptr<ISessionStage>& sessionStage);
/*
/**
* Multi User
*/
bool IsPcSceneSessionLifecycle(const sptr<SceneSession>& sceneSession);
bool IsNeedChangeLifeCycleOnUserSwitch(const sptr<SceneSession>& sceneSession, int32_t pid);
WSError StartOrMinimizeUIAbilityBySCB(const sptr<SceneSession>& sceneSession, bool isUserActive);
/*
/**
* Gesture Back
*/
void UpdateGestureBackEnabled(int32_t persistentId);
@ -780,12 +780,12 @@ private:
AppWindowSceneConfig appWindowSceneConfig_;
/*
/**
* Window Rotate Animation
*/
RotateAnimationConfig rotateAnimationConfig_;
/*
/**
* PiP Window
*/
NotifyStartPiPFailedFunc startPiPFailedFunc_;
@ -803,7 +803,7 @@ private:
bool needBlockNotifyUnfocusStatus_ {false};
bool isPrepareTerminateEnable_ {false};
/*
/**
* DFX
*/
bool openDebugTrace_ {false};
@ -876,7 +876,7 @@ private:
AAFwk::MissionSnapshot& sessionSnapshot);
sptr<AAFwk::IAbilityManagerCollaborator> GetCollaboratorByType(int32_t collaboratorType);
/*
/**
* Collaborator
*/
AbilityManagerCollaboratorRegisteredFunc abilityManagerCollaboratorRegisteredFunc_;
@ -932,7 +932,7 @@ private:
void HideNonSecureSubWindows(const sptr<SceneSession>& sceneSession);
WSError HandleSecureSessionShouldHide(const sptr<SceneSession>& sceneSession);
/*
/**
* Window Snapshot
*/
void SetSessionSnapshotSkipForAppProcess(const sptr<SceneSession>& sceneSession) REQUIRES(SCENE_GUARD);
@ -954,12 +954,12 @@ private:
bool JudgeNeedNotifyPrivacyInfo(DisplayId displayId, const std::unordered_set<std::string>& privacyBundles);
WSError CheckSessionPropertyOnRecovery(const sptr<WindowSessionProperty>& property, bool isSpecificSession);
/*
/**
* Window Visibility
*/
bool NotifyVisibleChange(int32_t persistentId);
/*
/**
* Fold Screen Status Change Report
*/
WMError MakeScreenFoldData(const std::vector<std::string>& screenFoldInfo, ScreenFoldData& screenFoldData);
@ -967,13 +967,13 @@ private:
WMError ReportScreenFoldStatus(const ScreenFoldData& data);
void RecoveryVisibilityPidCount(int32_t pid);
/*
/**
* Window Watermark
*/
bool SetSessionWatermarkForAppProcess(const sptr<SceneSession>& sceneSession);
void RemoveProcessWatermarkPid(int32_t pid);
/*
/**
* Window Snapshot
*/
std::unordered_set<int32_t> snapshotSkipPidSet_ GUARDED_BY(SCENE_GUARD); // ONLY Accessed on OS_sceneSession thread
@ -984,12 +984,12 @@ private:
std::mutex nextFlushCompletedMutex_;
RootSceneProcessBackEventFunc rootSceneProcessBackEventFunc_ = nullptr;
/*
/**
* Window Watermark
*/
std::unordered_map<int32_t, std::string> processWatermarkPidMap_; // ONLY Accessed on OS_sceneSession thread
/*
/**
* Dump
*/
std::shared_ptr<ScbDumpSubscriber> scbDumpSubscriber_;
@ -999,12 +999,12 @@ private:
const std::vector<std::string>& params, std::string& dumpInfo);
void DumpAllSessionFocusableInfo(int32_t persistentId);
/*
/**
* Screen Manager
*/
bool IsInDefaultScreen(const sptr<SceneSession>& sceneSession);
/*
/**
* Window Mode Type
*/
bool IsNeedSkipWindowModeTypeCheck(const sptr<SceneSession>& sceneSession, bool isSmallFold);

1
window_scene/session_manager/src/zidl/scene_session_manager_proxy.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#ifndef SUPPORT_SCREEN
#define SUPPORT_SCREEN
#endif

3
window_scene/test/dms_unittest/multi_screen_manager_test.cpp
View File

@ -259,7 +259,6 @@ HWTEST_F(MultiScreenManagerTest, PhysicalScreenMirrorSwitch04, Function | SmallT
EXPECT_EQ(ret, DMError::DM_OK);
}
/**
* @tc.name: PhysicalScreenMirrorSwitch05
* @tc.desc: defaultSession != nullptr
@ -905,7 +904,6 @@ HWTEST_F(MultiScreenManagerTest, DoFirstMirrorChange02, Function | SmallTest | L
ScreenSessionManager::GetInstance().DestroyVirtualScreen(screenId1);
}
/**
* @tc.name: DoFirstMirrorChange
* @tc.desc: DoFirstMirrorChangeExtend
@ -964,7 +962,6 @@ HWTEST_F(MultiScreenManagerTest, DoFirstMirrorChange04, Function | SmallTest | L
ScreenSessionManager::GetInstance().DestroyVirtualScreen(screenId1);
}
/**
* @tc.name: DoFirstExtendChange
* @tc.desc: param error

1
window_scene/test/dms_unittest/screen_property_test.cpp
View File

@ -12,6 +12,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
#include "screen_property.h"
#include <gtest/gtest.h>

Some files were not shown because too many files have changed in this diff Show More