103 Commits

Author SHA1 Message Date
l00574490 aa8968a6f2 support muti_display for drag
Signed-off-by: l00574490 <liuqi149@huawei.com>
Change-Id: I3e1288fb949c92a1d4b152c3468e72c30654f336
2022-04-24 15:40:05 +08:00
xiaojianfeng 8cb2babe22 add window rotation
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: If02a869aad72c5b3e54017d53f24d8e7452825f8
2022-04-11 21:50:09 +08:00
openharmony_ci dfc2ad0fbd !673 支持扩展屏/拼接屏场景下,DMS调用RSDisplayNode SetDisplayOffset流程
Merge pull request !673 from Grady/master
2022-04-01 11:30:42 +00:00
xingyanan 430a84643b 修改告警
Signed-off-by: xingyanan <xingyanan2@huawei.com>
Change-Id: If850d8ff3493d2cc02afffbfa364d2b868cfe6c9
Signed-off-by: xingyanan <xingyanan2@huawei.com>
2022-04-01 15:36:41 +08:00
Grady 28aa173dd3 finish the function call of SetDisplayOffset between DMS and RS
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: Ibffffcfe94d4e3bb4f70c9e201109ab61aa874a8
2022-03-31 17:09:02 +08:00
Klaus_q 5f39ede819 fix inner source issue
Signed-off-by: Klaus_q <wangqi175@huawei.com>
Change-Id: Ie54bf7c44fcd22267f295a3bab1a95c96b159f94
2022-03-22 20:30:17 +08:00
Grady 1d442271ae add DeathRecipient
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: I8298488805d148568050d8d4da3c5e7f85847147
2022-03-22 15:04:02 +08:00
Klaus_q 4258db1261 fix MakeExpand creating redundant display error
Signed-off-by: Klaus_q <wangqi175@huawei.com>
Change-Id: Ia3c1c4a11794ad35ab3bbd56de48333bacaab2a1
2022-03-14 21:30:35 +08:00
openharmony_ci d9983167df !541 remove friend class in DisplayManagerService
Merge pull request !541 from xiaojianfeng/master
2022-03-11 02:19:21 +00:00
xiaojianfeng 88a506db28 remove friend class in DisplayManagerService
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I46bc3012f83d6ad96070121656de82b0aa68b813
2022-03-10 21:41:55 +08:00
shiyueeee 5b88a14c63 Clean codestyle issue and delete redundant files
Signed-off-by: shiyueeee <nieshiyue@huawei.com>
Change-Id: I09c6a7ccaf03493355fc6692a81747731626d6e4
2022-03-10 20:45:13 +08:00
openharmony_ci 4b4d30c969 !538 删除windowmanager下多余的README.md文件
Merge pull request !538 from Grady/local-branch
2022-03-10 11:37:57 +00:00
Grady 690ad3886a delete README.md
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: I356e3c5950c4cc1a48fc34519cfbc8103aa80f94
2022-03-10 19:23:20 +08:00
xiaojianfeng 0db46c077a move SetScreenPowerForAll and GetScreenPower implement to dms
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I74cfb1998bf7d057fb374deb9144a9dc32036084
2022-03-10 18:39:13 +08:00
lu 7445451aaa Change virtualPixelRatio of AbstractDisplay
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I1f2090b7f036a9b08fbd535777e218016b0b95fb
2022-03-10 10:42:35 +08:00
openharmony_ci 662e52c5f7 !485 fix RegisterRsScreenConnectionChangeListener failed bug
Merge pull request !485 from xiaojianfeng/dev
2022-03-07 14:40:28 +00:00
xiaojianfeng 831835924a 优化dms代码
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Ic8f7da46cc74b39a115785e548cc102d8bf1c9a1
2022-03-07 21:31:55 +08:00
xiaojianfeng 679f349d0a fix RegisterRsScreenConnectionChangeListener failed bug
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Ifc6a4005f9c948a9c3b5a8f69ff687ebbf96e33c
2022-03-07 20:02:29 +08:00
openharmony_ci e0bdff2395 !466 增加冻屏接口
Merge pull request !466 from 赵路/master
2022-03-07 01:57:09 +00:00
lu 5997bc4fe8 Freeze display
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I4e08c785fa04929e0ed9263b0f76d812de15f4bb
2022-03-05 20:16:42 +08:00
xiaojianfeng 3d2715666f 优化dm和dms代码,优化测试用例,修复部分bug
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I882b9338d9818f5b3c2c3ad4227a9dffec19d779
2022-03-05 20:11:55 +08:00
openharmony_ci f7e6d18084 !390 Optimize DM and MDS code
Merge pull request !390 from xiaojianfeng/master
2022-03-03 12:23:34 +00:00
openharmony_ci e1ce6ea165 !445 review代码整改
Merge pull request !445 from YaoJian/bugfix_codereview
2022-03-03 12:10:38 +00:00
xiaojianfeng f6873bc772 fix bugs, optimize code in dm and dms
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Ic11ba2306fdbc24721a71e53d85aadbc8b2a3ab5
2022-03-03 19:33:26 +08:00
xiaojianfeng a89b95513a Optimize DM and MDS code
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Id758ffe611a09232df0d596216040564d076edd8
2022-03-03 18:14:16 +08:00
shiyueeee 8bc3f0831b Clean codestyle issue. Add and modify *refreshRate var/api to replace *freshRate
Signed-off-by: shiyueeee <nieshiyue@huawei.com>
Change-Id: I8acc9c8fac0e9f08551476d200f23ed8f52beb05
2022-03-03 17:00:30 +08:00
fanby01 ae8b7b0145 bugfix for codereview
Signed-off-by: fanby01 <yaojian7@huawei.com>
Change-Id: I169ac692cd518d3ed440910752a681706f4a2dd0
2022-03-03 16:20:56 +08:00
lu f1ce26e2e1 'SetScreenPowerForAll'接口从'DisplayManager'移入'ScreenMananger'
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I37680c8e725453612a9a166a01ae15ba79545215
2022-03-03 11:50:30 +08:00
chenqinxin 26edaa6212 开源代码告警修复
Signed-off-by: chenqinxin <chenqinxin1@huawei.com>
Change-Id: Ia26ee32cd6f24d096e0333ac930af0b91a18282e
2022-03-02 10:54:49 +08:00
xiaojianfeng ab2808559b fix makeExpand bug and add screen manager test
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I09b0e1e2b65d081e06483b0b5e806d531451b6e9
2022-03-01 22:09:42 +08:00
xiaojianfeng 14e2e3006a add screen manager test and CancelMakeMirrorOrExpand interface
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I5b9dba617ca64adf68da71a3d45c86a341c8f4c2
2022-03-01 20:46:34 +08:00
openharmony_ci 88931995e7 !407 增加Screen.GetName()和Screen.IsReal()
Merge pull request !407 from 赵路/master
2022-03-01 12:17:55 +00:00
lu c4131b160f Add 'Screen.GetName'
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: Ie2ae5404770f966a00ce3a7cf12a1cb7031bdbf1
2022-03-01 19:29:28 +08:00
xiaojianfeng 0b0230ea15 callback screen event and display event
Change-Id: I871dfb23e2afd67aa27847412bb52598fc0cb054
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
2022-03-01 17:06:07 +08:00
lu f6e26d2d4b Change 'RequestRotation' to 'SetOrientation'
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: Icfeab91d336279f41f93bf2f293c6d9364459da5
2022-02-28 10:31:11 +08:00
openharmony_ci bbfba21c7e !358 fix window snapshot nullptr bug
Merge pull request !358 from Klaus_q/master_wq
2022-02-25 23:53:40 +00:00
openharmony_ci e20f415a61 !377 修复创建虚拟屏幕、动态设置surface不能传nullptr的问题,补充并完善ST
Merge pull request !377 from Grady/master
2022-02-25 16:03:37 +00:00
Klaus_q 370a879146 fix DMS inner temp code
Signed-off-by: Klaus_q <wangqi175@huawei.com>
Change-Id: Ida8b9d4a28dd8748a492b5ca68decab77ed41c87
2022-02-25 11:11:15 +08:00
Grady 808e617c15 modify surface nullptr
Signed-off-by: Grady <yangguangwei4@huawei.com>
Change-Id: I9736a6e48cfde5cb35354a2dcdc9dece1f3212b5
2022-02-24 20:41:45 +08:00
xiaojianfeng 4056556432 修改DisplayManagerAdapter
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I4875da8361455bbdcabfa569f07a08723216619e
2022-02-24 16:00:57 +08:00
lu 8cbbec0865 Add 'DisplayMove' interface to Window
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: Ieaf19363ba09d3602a0239f10ed411d7134a7f45
2022-02-23 19:17:28 +08:00
xiahaiqin 13c802f60c modify deadlock between dms and wms
Signed-off-by: xiahaiqin <xiahaiqin1@huawei.com>
Change-Id: I638027f75d0181f6364a4406ef0ace4c573c0c4e
2022-02-23 15:10:48 +08:00
xiaojianfeng cef57bd91d modify the makemirror reture para type
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Ib5cd6d5a3927d200be1ec3f987d25e09238aa245
2022-02-22 17:51:17 +08:00
xiaojianfeng 0145973871 Revert "Revert "modify screenInfo, screengroupinfo, displayInfo, screen, screengroup, display""
This reverts commit 12460515d1.

Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I1184ab3cd41d899759b83b1f8b865275bfd2db0b
2022-02-22 15:35:29 +08:00
xiaojianfeng 12460515d1 Revert "modify screenInfo, screengroupinfo, displayInfo, screen, screengroup, display"
This reverts commit 3a70997450.

Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: Idcbdea473ba24223477dbdd19ea20ecd0217501a
2022-02-21 18:27:27 +08:00
xiaojianfeng 3a70997450 modify screenInfo, screengroupinfo, displayInfo, screen, screengroup, display
Signed-off-by: xiaojianfeng <xiaojianfeng3@huawei.com>
Change-Id: I16c23ce2bba78db54f35be08423c0d6675d1e643
2022-02-21 10:31:46 +08:00
lu b4c86170c8 update the size of the Display after rotate screen
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I918630d93678f4cdce904461e4a0f0efc846b2fd
2022-02-19 17:33:35 +08:00
openharmony_ci 795b2d3b82 !331 解决Expand场景下Display尺寸变化导致的死锁问题
Merge pull request !331 from youqijing/master
2022-02-18 10:15:33 +00:00
youqijing eb12955664 解决Expand场景下Display尺寸变化导致的死锁问题
Signed-off-by: youqijing <youqijing@huawei.com>
Change-Id: Iae2ae474a0c4ddb6083f62be470f81663e5b951a
2022-02-18 17:31:47 +08:00
lu 21b77cdd68 Fix deadlock when rotate a screen
Signed-off-by: lu <zhaolu2@huawei.com>
Change-Id: I3c2dc087c8bc593ac963797d7e3b967ce33a94a2
2022-02-18 15:10:20 +08:00