!690 Add wearable to DeviceType for app config

Merge pull request !690 from 冯强/master
This commit is contained in:
openharmony_ci 2024-08-03 06:30:20 +00:00 committed by Gitee
commit 5a816c706e
No known key found for this signature in database
GPG Key ID: 173E9B9CA92EEF8F
26 changed files with 177 additions and 167 deletions

View File

@ -17,11 +17,12 @@
"package": "com.ohos.dmstest",
"name": ".entry",
"mainAbility": ".MainAbility",
"srcPath":"",
"srcPath": "",
"deviceType": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"distro": {
"deliveryWithInstall": true,
@ -31,42 +32,42 @@
},
"abilities": [
{
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"orientation": "unspecified",
"formsEnabled": false,
"name": ".MainAbility",
"srcLanguage": "js",
"srcPath": "MainAbility",
"icon": "$media:icon",
"description": "$string:MainAbility_desc",
"label": "$string:MainAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"orientation": "unspecified",
"formsEnabled": false,
"name": ".MainAbility",
"srcLanguage": "js",
"srcPath": "MainAbility",
"icon": "$media:icon",
"description": "$string:MainAbility_desc",
"label": "$string:MainAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
},
{
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
}
],
],
"reqPermissions": [
{
"name": "ohos.permission.GET_BUNDLE_INFO",
@ -108,8 +109,8 @@
}
],
"testRunner": {
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
}
}
}

View File

@ -17,11 +17,12 @@
"package": "com.example.configuration",
"name": ".entry",
"mainAbility": ".MainAbility",
"srcPath":"",
"srcPath": "",
"deviceType": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"distro": {
"deliveryWithInstall": true,
@ -31,42 +32,42 @@
},
"abilities": [
{
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"orientation": "unspecified",
"formsEnabled": false,
"name": ".MainAbility",
"srcLanguage": "js",
"srcPath": "MainAbility",
"icon": "$media:icon",
"description": "$string:MainAbility_desc",
"label": "$string:MainAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
"skills": [
{
"entities": [
"entity.system.home"
],
"actions": [
"action.system.home"
]
}
],
"orientation": "unspecified",
"formsEnabled": false,
"name": ".MainAbility",
"srcLanguage": "js",
"srcPath": "MainAbility",
"icon": "$media:icon",
"description": "$string:MainAbility_desc",
"label": "$string:MainAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
},
{
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "singleton"
}
],
],
"reqPermissions": [
{
"name": "ohos.permission.GET_BUNDLE_INFO",
@ -108,8 +109,8 @@
}
],
"testRunner": {
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
}
}
}

View File

@ -33,7 +33,8 @@
"deviceType": [
"tablet",
"default",
"2in1"
"2in1",
"wearable"
],
"distro": {
"deliveryWithInstall": true,
@ -70,7 +71,6 @@
"name": ".ServiceAbility",
"icon": "$media:icon",
"srcLanguage": "js",
"description": "$string:serviceability_description",
"type": "service",
"visible": true,

View File

@ -6,9 +6,10 @@
"description": "$string:phone_entry_dsc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,

View File

@ -6,9 +6,10 @@
"description": "$string:entry_desc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -77,7 +78,7 @@
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -6,9 +6,10 @@
"description": "$string:phone_entry_dsc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -22,7 +23,7 @@
],
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.example.lifecycletest.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -41,7 +42,7 @@
}
]
}
],
],
"requestPermissions": [
{
"name": "ohos.permission.GET_BUNDLE_INFO"

View File

@ -6,9 +6,10 @@
"description": "$string:phone_entry_dsc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -16,7 +17,7 @@
"pages": "$profile:main_pages",
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.example.lifecycletest.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -56,7 +57,7 @@
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -33,7 +33,8 @@
"tablet",
"default",
"phone",
"2in1"
"2in1",
"wearable"
],
"distro": {
"deliveryWithInstall": true,

View File

@ -6,9 +6,10 @@
"description": "$string:entry_desc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -49,7 +50,7 @@
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -33,7 +33,8 @@
"tablet",
"default",
"phone",
"2in1"
"2in1",
"wearable"
],
"distro": {
"deliveryWithInstall": true,

View File

@ -6,9 +6,10 @@
"description": "$string:entry_desc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -49,7 +50,7 @@
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -25,7 +25,7 @@
],
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.acts.rpcrequest.test.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -44,7 +44,7 @@
}
]
}
],
],
"requestPermissions": [
{
"name": "ohos.permission.GET_BUNDLE_INFO"

View File

@ -6,9 +6,10 @@
"description": "$string:entry_desc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -49,7 +50,7 @@
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -25,7 +25,7 @@
],
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.acts.distributedobjectdisets.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -44,7 +44,7 @@
}
]
}
],
],
"requestPermissions": [
{
"name": "ohos.permission.GET_BUNDLE_INFO"

View File

@ -19,7 +19,7 @@
"uiSyntax": "ets",
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.acts.distributedobjectdisets.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -51,10 +51,9 @@
"visible": true
}
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -50,10 +50,9 @@
"visible": true
}
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"
@ -65,7 +64,7 @@
"name": "ohos.permission.ACCESS_SERVICE_DM"
},
{
"name":"ohos.permission.KEEP_BACKGROUND_RUNNING"
"name": "ohos.permission.KEEP_BACKGROUND_RUNNING"
}
]
}

View File

@ -25,7 +25,7 @@
],
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.acts.distributekvdisets.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -44,7 +44,7 @@
}
]
}
],
],
"requestPermissions": [
{
"name": "ohos.permission.GET_BUNDLE_INFO"

View File

@ -50,10 +50,9 @@
"visible": true
}
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"
@ -65,7 +64,7 @@
"name": "ohos.permission.ACCESS_SERVICE_DM"
},
{
"name":"ohos.permission.KEEP_BACKGROUND_RUNNING"
"name": "ohos.permission.KEEP_BACKGROUND_RUNNING"
}
]
}

View File

@ -25,7 +25,7 @@
],
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.acts.distributerdbdisets.MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -44,7 +44,7 @@
}
]
}
],
],
"requestPermissions": [
{
"name": "ohos.permission.GET_BUNDLE_INFO"

View File

@ -19,7 +19,7 @@
"pages": "$profile:main_pages",
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.acts.distributerdbdisets",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -51,7 +51,7 @@
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -19,7 +19,7 @@
"pages": "$profile:main_pages",
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "com.acts.distributerdbdisjs",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:phone_entry_main",
@ -51,7 +51,7 @@
],
"requestPermissions": [
{
"name":"ohos.permission.GET_BUNDLE_INFO"
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"

View File

@ -13,8 +13,7 @@
},
"deviceConfig": {},
"module": {
"reqPermissions": [
],
"reqPermissions": [],
"package": "com.ohos.distributedjstest",
"name": ".entry",
"mainAbility": ".MainAbility",

View File

@ -32,8 +32,8 @@
],
"package": "com.acts.fileio.test.server",
"name": ".entry",
"mainAbility":".MainAbility",
"srcPath":"",
"mainAbility": ".MainAbility",
"srcPath": "",
"deviceType": [
"phone",
"tablet",
@ -69,21 +69,21 @@
"description": "$string:mainability_description",
"label": "$string:app_name",
"type": "page",
"visible":true,
"visible": true,
"launchType": "standard"
},
{
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "standard"
"orientation": "unspecified",
"formsEnabled": false,
"name": ".TestAbility",
"srcLanguage": "js",
"srcPath": "TestAbility",
"icon": "$media:icon",
"description": "$string:TestAbility_desc",
"label": "$string:TestAbility_label",
"type": "page",
"visible": true,
"launchType": "standard"
}
],
"js": [
@ -109,8 +109,8 @@
}
],
"testRunner": {
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
"name": "OpenHarmonyTestRunner",
"srcPath": "TestRunner"
}
}
}

View File

@ -6,9 +6,10 @@
"description": "$string:entry_desc",
"mainElement": "MainAbility",
"deviceTypes": [
"default",
"tablet",
"2in1"
"default",
"tablet",
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -37,7 +38,7 @@
]
}
],
"extensionAbilities":[
"extensionAbilities": [
{
"name": "com.acts.fileio.test.server.ServiceAbility",
"srcEntrance": "./ets/serviceability/ServiceAbility.ts",
@ -57,7 +58,7 @@
{
"name": "ohos.permission.GET_BUNDLE_INFO"
},
{
{
"name": "ohos.permission.KEEP_BACKGROUND_RUNNING"
},
{

View File

@ -38,7 +38,8 @@
"tablet",
"default",
"phone",
"2in1"
"2in1",
"wearable"
],
"distro": {
"deliveryWithInstall": true,

View File

@ -9,7 +9,8 @@
"default",
"tablet",
"phone",
"2in1"
"2in1",
"wearable"
],
"deliveryWithInstall": true,
"installationFree": false,
@ -17,7 +18,7 @@
"pages": "$profile:main_pages",
"abilities": [
{
"continuable":true,
"continuable": true,
"name": "MainAbility",
"srcEntrance": "./ets/MainAbility/MainAbility.ts",
"description": "$string:EntryAbility_desc",
@ -37,15 +38,15 @@
]
}
],
"extensionAbilities": [
{
"name": "com.acts.avsessionserver.ServiceAbility",
"srcEntrance": "./ets/serviceability/ServiceAbility.ts",
"type": "service",
"visible": true,
"description": "service"
}
],
"extensionAbilities": [
{
"name": "com.acts.avsessionserver.ServiceAbility",
"srcEntrance": "./ets/serviceability/ServiceAbility.ts",
"type": "service",
"visible": true,
"description": "service"
}
],
"requestPermissions": [
{
"name": "ohos.permission.DISTRIBUTED_DATASYNC"