From a6d3bdfbe1c624bd29d2c1ed6ceaa1ad98c629ea Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=A4=BC=E4=BA=AD?= Date: Fri, 19 Aug 2022 03:30:59 +0000 Subject: [PATCH 1/9] Signed-off-by: zhouliting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 周礼亭 --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 2c5f482..ff2e0ff 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -205,6 +205,7 @@ typedef enum SystemCapabilityNum { ABILITY_FORM, COMMUNICATION_WIFI_AP_CORE, COMMUNICATION_WIFI_AP_EXTENSION, + WEB_WEBVIEW_CORE, ARKUI_ARKUI_LITE, ARKUI_ARKUI_FULL, ARKUI_ARKUI_LIBUV, @@ -364,6 +365,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.UserIAM.UserAuth.FaceAuth", USERIAM_USERAUTH_FACEAUTH}, {"SystemCapability.UserIAM.UserAuth.FingerprintAuth", USERIAM_USERAUTH_FINGERPRINTAUTH}, {"SystemCapability.UserIAM.UserAuth.PinAuth", USERIAM_USERAUTH_PINAUTH}, + {"SystemCapability.Web.Webview.Core", WEB_WEBVIEW_CORE}, {"SystemCapability.ArkUI.UiAppearance", ARKUI_UIAPPEARANCE}, {"SystemCapability.Security.CertificateManager", SECURITY_CERTIFICATE_MANAGER}, {"SystemCapability.Graphic.Graphic2D.Vulkan", GRAPHIC_GRAPHIC2D_VULKAN}, From adb922e5ed638e260167a15992eb965d27e6dce3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=A4=BC=E4=BA=AD?= Date: Fri, 19 Aug 2022 07:05:13 +0000 Subject: [PATCH 2/9] Signed-off-by: zhouliting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 周礼亭 --- include/syscap_define.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index ff2e0ff..929402a 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -205,7 +205,6 @@ typedef enum SystemCapabilityNum { ABILITY_FORM, COMMUNICATION_WIFI_AP_CORE, COMMUNICATION_WIFI_AP_EXTENSION, - WEB_WEBVIEW_CORE, ARKUI_ARKUI_LITE, ARKUI_ARKUI_FULL, ARKUI_ARKUI_LIBUV, @@ -213,7 +212,8 @@ typedef enum SystemCapabilityNum { MISCSERVICES_INPUTMETHOD_FRAMEWORK, UTILS_LANG, // Add here - SYSCAP_NUM_MAX = 960 + SYSCAP_NUM_MAX = 960, + WEB_WEBVIEW_CORE, } SyscapNum; @@ -365,7 +365,6 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.UserIAM.UserAuth.FaceAuth", USERIAM_USERAUTH_FACEAUTH}, {"SystemCapability.UserIAM.UserAuth.FingerprintAuth", USERIAM_USERAUTH_FINGERPRINTAUTH}, {"SystemCapability.UserIAM.UserAuth.PinAuth", USERIAM_USERAUTH_PINAUTH}, - {"SystemCapability.Web.Webview.Core", WEB_WEBVIEW_CORE}, {"SystemCapability.ArkUI.UiAppearance", ARKUI_UIAPPEARANCE}, {"SystemCapability.Security.CertificateManager", SECURITY_CERTIFICATE_MANAGER}, {"SystemCapability.Graphic.Graphic2D.Vulkan", GRAPHIC_GRAPHIC2D_VULKAN}, @@ -401,6 +400,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.ArkUI.ArkUI.Napi", ARKUI_ARKUI_NAPI}, {"SystemCapability.MiscServices.InputMethodFramework", MISCSERVICES_INPUTMETHOD_FRAMEWORK}, {"SystemCapability.Utils.Lang", UTILS_LANG}, + {"SystemCapability.Web.Webview.Core", WEB_WEBVIEW_CORE}, }; #endif // _SYSCAP_DEFINE_H From 920224a807662a40f784538818e0f889d6995e34 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=A4=BC=E4=BA=AD?= Date: Fri, 19 Aug 2022 07:06:19 +0000 Subject: [PATCH 3/9] Signed-off-by: zhouliting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 周礼亭 --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 929402a..50cb63c 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -213,7 +213,7 @@ typedef enum SystemCapabilityNum { UTILS_LANG, // Add here SYSCAP_NUM_MAX = 960, - WEB_WEBVIEW_CORE, + WEB_WEBVIEW_CORE } SyscapNum; From 4ec186e1fb844db820ead0583a4f15d3e61d14d3 Mon Sep 17 00:00:00 2001 From: shiyueeee Date: Fri, 19 Aug 2022 12:31:33 +0800 Subject: [PATCH 4/9] Add SystemCapability.Graphic.Graphic2D.ColorManager.Core definition Signed-off-by: shiyueeee Change-Id: Ib10db94f5de23a7073dbd6c912d19d19655edc83 --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 2c5f482..7e3acce 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -211,6 +211,7 @@ typedef enum SystemCapabilityNum { ARKUI_ARKUI_NAPI, MISCSERVICES_INPUTMETHOD_FRAMEWORK, UTILS_LANG, + GRAPHIC_GRAPHIC2D_COLOR_MANAGER_CORE, // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -399,6 +400,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.ArkUI.ArkUI.Napi", ARKUI_ARKUI_NAPI}, {"SystemCapability.MiscServices.InputMethodFramework", MISCSERVICES_INPUTMETHOD_FRAMEWORK}, {"SystemCapability.Utils.Lang", UTILS_LANG}, + {"SystemCapability.Graphic.Graphic2D.ColorManager.Core", GRAPHIC_GRAPHIC2D_COLOR_MANAGER_CORE}, }; #endif // _SYSCAP_DEFINE_H From 71b3065113d0ab04ecd0b5d98217ba53fc44e243 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=A4=BC=E4=BA=AD?= Date: Fri, 19 Aug 2022 07:42:29 +0000 Subject: [PATCH 5/9] Signed-off-by: zhouliting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 周礼亭 --- include/syscap_define.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 50cb63c..6ea318b 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -212,8 +212,8 @@ typedef enum SystemCapabilityNum { MISCSERVICES_INPUTMETHOD_FRAMEWORK, UTILS_LANG, // Add here - SYSCAP_NUM_MAX = 960, - WEB_WEBVIEW_CORE + WEB_WEBVIEW_CORE, + SYSCAP_NUM_MAX = 960 } SyscapNum; From 1be56c1fc6036fa93b9a180b86d056c2a51e6ea4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=91=A8=E7=A4=BC=E4=BA=AD?= Date: Fri, 19 Aug 2022 08:46:22 +0000 Subject: [PATCH 6/9] Signed-off-by: zhouliting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: 周礼亭 --- include/syscap_define.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 6ea318b..4ad6cec 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -211,8 +211,8 @@ typedef enum SystemCapabilityNum { ARKUI_ARKUI_NAPI, MISCSERVICES_INPUTMETHOD_FRAMEWORK, UTILS_LANG, - // Add here WEB_WEBVIEW_CORE, + // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; From 0a35c937e568ecb6c3c4a326fff072e7b4b63767 Mon Sep 17 00:00:00 2001 From: leafly2021 Date: Fri, 19 Aug 2022 12:41:36 +0800 Subject: [PATCH 7/9] add windowmanager syscap Signed-off-by: leafly2021 Change-Id: I46c177c2cfe89c730a748e2574f6379eef106fbd --- include/syscap_define.h | 2 ++ 1 file changed, 2 insertions(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 7e3acce..a05a161 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -212,6 +212,7 @@ typedef enum SystemCapabilityNum { MISCSERVICES_INPUTMETHOD_FRAMEWORK, UTILS_LANG, GRAPHIC_GRAPHIC2D_COLOR_MANAGER_CORE, + WINDOWMANAGER_WINDOWMANAGER_CORE, // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -401,6 +402,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.MiscServices.InputMethodFramework", MISCSERVICES_INPUTMETHOD_FRAMEWORK}, {"SystemCapability.Utils.Lang", UTILS_LANG}, {"SystemCapability.Graphic.Graphic2D.ColorManager.Core", GRAPHIC_GRAPHIC2D_COLOR_MANAGER_CORE}, + {"SystemCapability.WindowManager.WindowManager.Core", WINDOWMANAGER_WINDOWMANAGER_CORE}, }; #endif // _SYSCAP_DEFINE_H From 0d0fc80f38e10b146c3675e020fda8e82d66809a Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Mon, 22 Aug 2022 11:26:38 +0800 Subject: [PATCH 8/9] udpate multimodalinput syscap info Signed-off-by: mayunteng_1 Change-Id: I4332b275521ef918c48dd2092374c55d734e6005 --- include/syscap_define.h | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/include/syscap_define.h b/include/syscap_define.h index 225e089..3a34996 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -128,7 +128,7 @@ typedef enum SystemCapabilityNum { MULTIMEDIA_MEDIA_VIDEOPLAYER, MULTIMEDIA_MEDIA_VIDEORECORDER, MULTIMEDIA_AV_SESSION, - MULTIMODALINPUT_INPUT, + MULTIMODALINPUT_INPUT, // abandoned NOTIFICATION_COMMONEVENT, NOTIFICATION_EMITTER, NOTIFICATION_NOTIFICATION, @@ -214,6 +214,12 @@ typedef enum SystemCapabilityNum { WEB_WEBVIEW_CORE, GRAPHIC_GRAPHIC2D_COLOR_MANAGER_CORE, WINDOWMANAGER_WINDOWMANAGER_CORE, + MULTIMODALINPUT_INPUT_INPUTCONSUMER, + MULTIMODALINPUT_INPUT_INPUTDEVICE, + MULTIMODALINPUT_INPUT_CORE, + MULTIMODALINPUT_INPUT_INPUTSIMULATOR, + MULTIMODALINPUT_INPUT_INPUTMONITOR, + MULTIMODALINPUT_INPUT_POINTER, // Add here SYSCAP_NUM_MAX = 960 } SyscapNum; @@ -319,7 +325,6 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Multimedia.Media.VideoPlayer", MULTIMEDIA_MEDIA_VIDEOPLAYER}, {"SystemCapability.Multimedia.Media.VideoRecorder", MULTIMEDIA_MEDIA_VIDEORECORDER}, {"SystemCapability.Multimedia.AVSession", MULTIMEDIA_AV_SESSION}, - {"SystemCapability.multimodalinput.input", MULTIMODALINPUT_INPUT}, {"SystemCapability.Notification.CommonEvent", NOTIFICATION_COMMONEVENT}, {"SystemCapability.Notification.Emitter", NOTIFICATION_EMITTER}, {"SystemCapability.Notification.Notification", NOTIFICATION_NOTIFICATION}, @@ -405,6 +410,12 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Web.Webview.Core", WEB_WEBVIEW_CORE}, {"SystemCapability.Graphic.Graphic2D.ColorManager.Core", GRAPHIC_GRAPHIC2D_COLOR_MANAGER_CORE}, {"SystemCapability.WindowManager.WindowManager.Core", WINDOWMANAGER_WINDOWMANAGER_CORE}, + {"SystemCapability.MultimodalInput.Input.InputConsumer", MULTIMODALINPUT_INPUT_INPUTCONSUMER}, + {"SystemCapability.MultimodalInput.Input.InputDevice", MULTIMODALINPUT_INPUT_INPUTDEVICE}, + {"SystemCapability.MultimodalInput.Input.Core", MULTIMODALINPUT_INPUT_CORE}, + {"SystemCapability.MultimodalInput.Input.InputSimulator", MULTIMODALINPUT_INPUT_INPUTSIMULATOR}, + {"SystemCapability.MultimodalInput.Input.InputMonitor", MULTIMODALINPUT_INPUT_INPUTMONITOR}, + {"SystemCapability.MultimodalInput.Input.Pointer", MULTIMODALINPUT_INPUT_POINTER}, }; #endif // _SYSCAP_DEFINE_H From f85e01e7b8141dd19d21ff9acd49af1ae7c764d7 Mon Sep 17 00:00:00 2001 From: mayunteng_1 Date: Mon, 22 Aug 2022 11:28:30 +0800 Subject: [PATCH 9/9] udpate multimodalinput syscap info Signed-off-by: mayunteng_1 Change-Id: I71c2790da815ced9127fea720d0bbdc4cd482e0d --- include/syscap_define.h | 1 + 1 file changed, 1 insertion(+) diff --git a/include/syscap_define.h b/include/syscap_define.h index 3a34996..fa61ad2 100644 --- a/include/syscap_define.h +++ b/include/syscap_define.h @@ -325,6 +325,7 @@ const static SyscapWithNum g_arraySyscap[] = { {"SystemCapability.Multimedia.Media.VideoPlayer", MULTIMEDIA_MEDIA_VIDEOPLAYER}, {"SystemCapability.Multimedia.Media.VideoRecorder", MULTIMEDIA_MEDIA_VIDEORECORDER}, {"SystemCapability.Multimedia.AVSession", MULTIMEDIA_AV_SESSION}, + {"SystemCapability.multimodalinput.input", MULTIMODALINPUT_INPUT}, {"SystemCapability.Notification.CommonEvent", NOTIFICATION_COMMONEVENT}, {"SystemCapability.Notification.Emitter", NOTIFICATION_EMITTER}, {"SystemCapability.Notification.Notification", NOTIFICATION_NOTIFICATION},