From 0bd4d82ef3cfdd6695de97b9fab9fc19e6535059 Mon Sep 17 00:00:00 2001 From: Owjie <13510983465@163.com> Date: Fri, 22 Aug 2025 14:42:49 +0800 Subject: [PATCH 1/3] =?UTF-8?q?ActsPipWindowTest=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=A5=97=E5=AD=98=E5=9C=A8=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?fail=EF=BC=8C=E6=99=BA=E6=85=A7=E5=B1=8F=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=94=BB=E4=B8=AD=E7=94=BB=EF=BC=8CXTS=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Owjie <13510983465@163.com> --- wm/src/picture_in_picture_controller_base.cpp | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/wm/src/picture_in_picture_controller_base.cpp b/wm/src/picture_in_picture_controller_base.cpp index 174364ebc5..42dd7194d9 100644 --- a/wm/src/picture_in_picture_controller_base.cpp +++ b/wm/src/picture_in_picture_controller_base.cpp @@ -589,6 +589,10 @@ void PictureInPictureControllerBase::GetPipPossible(bool& pipPossible) bool PictureInPictureControllerBase::GetPipEnabled() { + const std::string deviceType = system::GetParameter("const.product.devicetype", ""); + if (deviceType == "tv") { + return; + } const std::string multiWindowUIType = system::GetParameter("const.window.multiWindowUIType", ""); return multiWindowUIType == "HandsetSmartWindow" || multiWindowUIType == "FreeFormMultiWindow" || multiWindowUIType == "TabletSmartWindow"; -- Gitee From 82890448539197fa53ea68a4a0c0982cfca2a7e4 Mon Sep 17 00:00:00 2001 From: Owjie <13510983465@163.com> Date: Fri, 22 Aug 2025 15:44:03 +0800 Subject: [PATCH 2/3] =?UTF-8?q?ActsPipWindowTest=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=A5=97=E5=AD=98=E5=9C=A8=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?fail=EF=BC=8C=E6=99=BA=E6=85=A7=E5=B1=8F=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=94=BB=E4=B8=AD=E7=94=BB=EF=BC=8CXTS=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Owjie <13510983465@163.com> --- wm/src/picture_in_picture_controller_base.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/wm/src/picture_in_picture_controller_base.cpp b/wm/src/picture_in_picture_controller_base.cpp index 42dd7194d9..41d235f8be 100644 --- a/wm/src/picture_in_picture_controller_base.cpp +++ b/wm/src/picture_in_picture_controller_base.cpp @@ -582,6 +582,10 @@ WMError PictureInPictureControllerBase::UnregisterListener(std::vector>& void PictureInPictureControllerBase::GetPipPossible(bool& pipPossible) { + const std::string deviceType = system::GetParameter("const.product.devicetype", ""); + if (deviceType == "tv") { + return; + } const std::string multiWindowUIType = system::GetParameter("const.window.multiWindowUIType", ""); pipPossible = multiWindowUIType == "HandsetSmartWindow" || multiWindowUIType == "TabletSmartWindow"; return; @@ -589,10 +593,6 @@ void PictureInPictureControllerBase::GetPipPossible(bool& pipPossible) bool PictureInPictureControllerBase::GetPipEnabled() { - const std::string deviceType = system::GetParameter("const.product.devicetype", ""); - if (deviceType == "tv") { - return; - } const std::string multiWindowUIType = system::GetParameter("const.window.multiWindowUIType", ""); return multiWindowUIType == "HandsetSmartWindow" || multiWindowUIType == "FreeFormMultiWindow" || multiWindowUIType == "TabletSmartWindow"; -- Gitee From 2013ed9d611ae6ce486d7e662960ea82d775d89c Mon Sep 17 00:00:00 2001 From: Owjie <13510983465@163.com> Date: Fri, 22 Aug 2025 16:02:34 +0800 Subject: [PATCH 3/3] =?UTF-8?q?ActsPipWindowTest=E6=B5=8B=E8=AF=95?= =?UTF-8?q?=E5=A5=97=E5=AD=98=E5=9C=A8=E5=A4=B1=E8=B4=A5=E7=94=A8=E4=BE=8B?= =?UTF-8?q?fail=EF=BC=8C=E6=99=BA=E6=85=A7=E5=B1=8F=E4=B8=8D=E6=94=AF?= =?UTF-8?q?=E6=8C=81=E7=94=BB=E4=B8=AD=E7=94=BB=EF=BC=8CXTS=E5=A4=B1?= =?UTF-8?q?=E8=B4=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Owjie <13510983465@163.com> --- wm/src/picture_in_picture_controller_base.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/wm/src/picture_in_picture_controller_base.cpp b/wm/src/picture_in_picture_controller_base.cpp index 41d235f8be..c652c5b8c3 100644 --- a/wm/src/picture_in_picture_controller_base.cpp +++ b/wm/src/picture_in_picture_controller_base.cpp @@ -582,7 +582,7 @@ WMError PictureInPictureControllerBase::UnregisterListener(std::vector>& void PictureInPictureControllerBase::GetPipPossible(bool& pipPossible) { - const std::string deviceType = system::GetParameter("const.product.devicetype", ""); + const std::string deviceType = system::GetParameter("const.product.devicetype", ""); if (deviceType == "tv") { return; } -- Gitee