From da3ba8a8a3a226687b18b0883828656e172c2616 Mon Sep 17 00:00:00 2001 From: guojin26 Date: Wed, 21 Jul 2021 15:20:48 +0800 Subject: [PATCH] modify the config.json Signed-off-by: guojin26 --- AI/AIFunctionSet/entry/src/main/config.json | 2 +- UI/Animation/entry/src/main/config.json | 4 ++-- ability/AbilityConnection/entry/src/main/config.json | 10 +++++----- .../abilityformprovider/src/main/config.json | 2 +- ability/AbilityForm/entry/src/main/config.json | 2 +- ability/AbilityIntent/entry/src/main/config.json | 4 ++-- .../AbilityInteraction/entry/src/main/config.json | 6 +++--- ability/CommonEvent/entry/src/main/config.json | 6 +++--- .../CustomNotification/entry/src/main/config.json | 6 +++--- ability/DataAbility/entry/src/main/config.json | 2 +- ability/Delegator/entry/src/main/config.json | 8 ++++---- ability/Delegator/entry/src/ohosTest/config.json | 4 ++-- .../entry/src/main/config.json | 2 +- .../entry/src/main/config.json | 6 +++--- .../DistributedScheduler/entry/src/main/config.json | 2 +- ability/ForegroundService/entry/src/main/config.json | 9 +++++---- ability/Fraction/entry/src/main/config.json | 6 +++--- ability/Idl/rpcclient/src/main/config.json | 4 ++-- ability/Idl/rpcserver/src/main/config.json | 6 +++--- ability/Intent/intent/src/main/config.json | 6 +++--- ability/Intent/secondapp/src/main/config.json | 6 +++--- ability/IntentAgent/entry/src/main/config.json | 8 ++++---- ability/Notification/entry/src/main/config.json | 6 +++--- ability/PageAbility/entry/src/main/config.json | 12 ++++++------ ability/Pasteboard/copy/src/main/config.json | 6 +++--- ability/Pasteboard/paste/src/main/config.json | 4 ++-- .../src/main/resources/base/element/string.json | 2 +- ability/ServiceAbility/entry/src/main/config.json | 2 +- common/Clock/entry/src/main/config.json | 2 +- common/Download/entry/src/main/config.json | 6 +++--- common/HelloWorld/entry/src/main/config.json | 4 ++-- common/JsHelloWorld/entry/src/main/config.json | 2 +- common/Resources/entry/src/main/config.json | 4 ++-- common/Timer/entry/src/main/config.json | 4 ++-- data/DistributedPictures/entry/src/main/config.json | 2 +- data/ORM/entry/src/main/config.json | 4 ++-- data/Preferences/entry/src/main/config.json | 4 ++-- device/BatteryInfo/entry/src/main/config.json | 2 +- device/Compass/entry/src/main/config.json | 2 +- device/Location/entry/src/main/config.json | 4 ++-- device/Setting/entry/src/main/config.json | 6 +++--- media/Audio/entry/src/main/config.json | 2 +- media/AudioPlayer/entry/src/main/config.json | 4 ++-- media/PixelMap/entry/src/main/config.json | 4 ++-- media/VideoPlayer/entry/src/main/config.json | 4 ++-- network/Bluetooth/entry/src/main/config.json | 4 ++-- .../DistributedAbility/client/src/main/config.json | 2 +- .../DistributedAbility/server/src/main/config.json | 2 +- .../DistributedDevices/entry/src/main/config.json | 6 +++--- network/NFC/entry/src/main/config.json | 2 +- network/NetworkManagement/entry/src/main/config.json | 4 ++-- network/WLAN/entry/src/main/config.json | 6 +++--- security/DataSecurity/entry/src/main/config.json | 2 +- security/FaceRecognition/entry/src/main/config.json | 2 +- security/Permission/entry/src/main/config.json | 4 ++-- 55 files changed, 119 insertions(+), 118 deletions(-) diff --git a/AI/AIFunctionSet/entry/src/main/config.json b/AI/AIFunctionSet/entry/src/main/config.json index a8f0fd3fe5..51c442ac24 100644 --- a/AI/AIFunctionSet/entry/src/main/config.json +++ b/AI/AIFunctionSet/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/UI/Animation/entry/src/main/config.json b/UI/Animation/entry/src/main/config.json index a27ef9b733..4e3d6be555 100644 --- a/UI/Animation/entry/src/main/config.json +++ b/UI/Animation/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.animation", - "name": ".Animation", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.animation.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/AbilityConnection/entry/src/main/config.json b/ability/AbilityConnection/entry/src/main/config.json index 4952d27883..2e5e009a23 100644 --- a/ability/AbilityConnection/entry/src/main/config.json +++ b/ability/AbilityConnection/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.backgrounddownload", - "name": ".BackgroundDownload", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.backgrounddownload.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -45,7 +45,7 @@ "launchType": "standard" }, { - "name": "ohos.samples.backgrounddownload.DownloadServiceAbility", + "name": ".DownloadServiceAbility", "type": "service", "visible": true, "backgroundModes": [ @@ -57,7 +57,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.backgrounddownload.AnotherAbility", + "name": ".AnotherAbility", "icon": "$media:icon", "description": "$string:anotherability_description", "type": "page", diff --git a/ability/AbilityForm/abilityformprovider/src/main/config.json b/ability/AbilityForm/abilityformprovider/src/main/config.json index 52597fb65a..979d71ae1c 100644 --- a/ability/AbilityForm/abilityformprovider/src/main/config.json +++ b/ability/AbilityForm/abilityformprovider/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/AbilityForm/entry/src/main/config.json b/ability/AbilityForm/entry/src/main/config.json index d7acbe2594..193534c581 100644 --- a/ability/AbilityForm/entry/src/main/config.json +++ b/ability/AbilityForm/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/AbilityIntent/entry/src/main/config.json b/ability/AbilityIntent/entry/src/main/config.json index cf31b772a2..347f4204ef 100644 --- a/ability/AbilityIntent/entry/src/main/config.json +++ b/ability/AbilityIntent/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.abilityinteractionex.FirstAbility", + "name": ".FirstAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/AbilityInteraction/entry/src/main/config.json b/ability/AbilityInteraction/entry/src/main/config.json index 5066655023..bc8ddab166 100644 --- a/ability/AbilityInteraction/entry/src/main/config.json +++ b/ability/AbilityInteraction/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default", + "phone", "tv" ], "distro": { @@ -38,7 +38,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.abilityinteraction.FirstAbility", + "name": ".FirstAbility", "icon": "$media:icon", "description": "$string:firstability_description", "label": "$string:app_name", @@ -50,7 +50,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.abilityinteraction.SecondAbility", + "name": ".SecondAbility", "type": "page", "launchType": "standard" } diff --git a/ability/CommonEvent/entry/src/main/config.json b/ability/CommonEvent/entry/src/main/config.json index 6a24fb21f8..3962797569 100644 --- a/ability/CommonEvent/entry/src/main/config.json +++ b/ability/CommonEvent/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.commonevent", - "name": ".CommonEvent", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.commonevent.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/CustomNotification/entry/src/main/config.json b/ability/CustomNotification/entry/src/main/config.json index c3b791209d..433b1bf229 100644 --- a/ability/CustomNotification/entry/src/main/config.json +++ b/ability/CustomNotification/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.autoreplynotificationsample", - "name": ".AutoReplyNotificationSample", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "visible": true, "formsEnabled": false, - "name": "ohos.samples.autoreplynotificationsample.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/DataAbility/entry/src/main/config.json b/ability/DataAbility/entry/src/main/config.json index ceb6fa673e..a75ccf0245 100644 --- a/ability/DataAbility/entry/src/main/config.json +++ b/ability/DataAbility/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/Delegator/entry/src/main/config.json b/ability/Delegator/entry/src/main/config.json index 70a4f9a50e..9650455ecd 100644 --- a/ability/Delegator/entry/src/main/config.json +++ b/ability/Delegator/entry/src/main/config.json @@ -11,7 +11,7 @@ "package": "ohos.samples.delegator", "name": ".MyApplication", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -32,7 +32,7 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.delegator.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -41,7 +41,7 @@ }, { "orientation": "unspecified", - "name": "ohos.samples.delegator.FirstAbility", + "name": ".FirstAbility", "icon": "$media:icon", "description": "$string:firstability_description", "label": "$string:app_name", @@ -50,7 +50,7 @@ }, { "orientation": "unspecified", - "name": "ohos.samples.delegator.SecondAbility", + "name": ".SecondAbility", "icon": "$media:icon", "description": "$string:secondability_description", "label": "$string:app_name", diff --git a/ability/Delegator/entry/src/ohosTest/config.json b/ability/Delegator/entry/src/ohosTest/config.json index 4a5372c678..3e8bbb8f9f 100644 --- a/ability/Delegator/entry/src/ohosTest/config.json +++ b/ability/Delegator/entry/src/ohosTest/config.json @@ -11,7 +11,7 @@ "package": "ohos.samples.delegator", "name": "testModule", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -21,7 +21,7 @@ }, "abilities": [ { - "name": "decc.testkit.runner.EntryAbility", + "name": ".EntryAbility", "description": "Test Entry Ability", "icon": "$media:icon", "label": "$string:app_name", diff --git a/ability/DistributedCommonEvent/entry/src/main/config.json b/ability/DistributedCommonEvent/entry/src/main/config.json index 5a09d2a15c..dbdb3d192f 100644 --- a/ability/DistributedCommonEvent/entry/src/main/config.json +++ b/ability/DistributedCommonEvent/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/ability/DistributedMusicPlayer/entry/src/main/config.json b/ability/DistributedMusicPlayer/entry/src/main/config.json index 4212b4632d..70244658a4 100644 --- a/ability/DistributedMusicPlayer/entry/src/main/config.json +++ b/ability/DistributedMusicPlayer/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.distributedmusicplayer", - "name": ".DistributedMusicPlayer", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "portrait", "formsEnabled": false, - "name": "ohos.samples.distributedmusicplayer.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/DistributedScheduler/entry/src/main/config.json b/ability/DistributedScheduler/entry/src/main/config.json index 21563faa85..1aa829795a 100644 --- a/ability/DistributedScheduler/entry/src/main/config.json +++ b/ability/DistributedScheduler/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default", + "phone", "tablet" ], "distro": { diff --git a/ability/ForegroundService/entry/src/main/config.json b/ability/ForegroundService/entry/src/main/config.json index 72b0352d21..76f079507b 100644 --- a/ability/ForegroundService/entry/src/main/config.json +++ b/ability/ForegroundService/entry/src/main/config.json @@ -11,12 +11,13 @@ "package": "ohos.samples.foregroundservice", "name": ".MyApplication", "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, "moduleName": "entry", - "moduleType": "entry" + "moduleType": "entry", + "installationFree": false }, "abilities": [ { @@ -31,7 +32,7 @@ } ], "orientation": "portrait", - "name": "ohos.samples.foregroundservice.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -39,7 +40,7 @@ "launchType": "standard" }, { - "name": "ohos.samples.foregroundservice.ServiceAbility", + "name": ".ServiceAbility", "icon": "$media:icon", "description": "$string:serviceability_description", "type": "service", diff --git a/ability/Fraction/entry/src/main/config.json b/ability/Fraction/entry/src/main/config.json index 6251a02748..f87a10be5d 100644 --- a/ability/Fraction/entry/src/main/config.json +++ b/ability/Fraction/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.fraction", - "name": ".MyApplication", + "name": ".MainAbility", "mainAbility": "ohos.samples.fraction.MainAbility", "deviceType": [ "phone" @@ -33,7 +33,7 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.fraction.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -42,7 +42,7 @@ }, { "icon": "$media:icon", - "name": "ohos.samples.fraction.NextAbility", + "name": ".NextAbility", "description": "", "type": "page" } diff --git a/ability/Idl/rpcclient/src/main/config.json b/ability/Idl/rpcclient/src/main/config.json index 357800e497..95bcd61e92 100644 --- a/ability/Idl/rpcclient/src/main/config.json +++ b/ability/Idl/rpcclient/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "portrait", "formsEnabled": false, - "name": "ohos.samples.rpcclient.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/Idl/rpcserver/src/main/config.json b/ability/Idl/rpcserver/src/main/config.json index f83a081296..3e9365c486 100644 --- a/ability/Idl/rpcserver/src/main/config.json +++ b/ability/Idl/rpcserver/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "portrait", "formsEnabled": false, - "name": "ohos.samples.rpcserver.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -44,7 +44,7 @@ "launchType": "standard" }, { - "name": "ohos.samples.rpcserver.ServiceAbility", + "name": ".ServiceAbility", "type": "service", "visible": true } diff --git a/ability/Intent/intent/src/main/config.json b/ability/Intent/intent/src/main/config.json index 5f52031d3b..91d628a437 100644 --- a/ability/Intent/intent/src/main/config.json +++ b/ability/Intent/intent/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.intent", - "name": ".Intent", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.intent.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/Intent/secondapp/src/main/config.json b/ability/Intent/secondapp/src/main/config.json index 62bf716749..74a5c58239 100644 --- a/ability/Intent/secondapp/src/main/config.json +++ b/ability/Intent/secondapp/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.secondapp", - "name": ".SecondApp", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -38,7 +38,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.secondapp.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/IntentAgent/entry/src/main/config.json b/ability/IntentAgent/entry/src/main/config.json index 6aabfbd509..a687b0cbde 100644 --- a/ability/IntentAgent/entry/src/main/config.json +++ b/ability/IntentAgent/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.intentagent", - "name": ".IntentAgent", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.intentagent.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -47,7 +47,7 @@ { "visible": true, "formsEnabled": false, - "name": "ohos.samples.intentagent.IntentAgentAbility", + "name": ".IntentAgentAbility", "type": "page", "launchType": "standard" } diff --git a/ability/Notification/entry/src/main/config.json b/ability/Notification/entry/src/main/config.json index d8cf47bc10..cd96a4c71e 100644 --- a/ability/Notification/entry/src/main/config.json +++ b/ability/Notification/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.notification", - "name": ".Notification", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.notification.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/PageAbility/entry/src/main/config.json b/ability/PageAbility/entry/src/main/config.json index 63f86966ee..8a94a053fd 100644 --- a/ability/PageAbility/entry/src/main/config.json +++ b/ability/PageAbility/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.pageability", - "name": ".PageAbility", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.pageability.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", @@ -47,7 +47,7 @@ { "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.pageability.FirstAbility", + "name": ".FirstAbility", "type": "page", "launchType": "standard" }, @@ -61,14 +61,14 @@ ], "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.pageability.SecondAbility", + "name": ".SecondAbility", "type": "page", "launchType": "standard" }, { "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.pageability.ContinuationAbility", + "name": ".ContinuationAbility", "type": "page", "launchType": "standard" } diff --git a/ability/Pasteboard/copy/src/main/config.json b/ability/Pasteboard/copy/src/main/config.json index 506ed73711..9fea534569 100644 --- a/ability/Pasteboard/copy/src/main/config.json +++ b/ability/Pasteboard/copy/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.pasteboard.copy", - "name": ".Pasteboard", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.pasteboard.copy.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/Pasteboard/paste/src/main/config.json b/ability/Pasteboard/paste/src/main/config.json index ca98bfb18c..90d26a03db 100644 --- a/ability/Pasteboard/paste/src/main/config.json +++ b/ability/Pasteboard/paste/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.pasteboard.paste", - "name": ".paste", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.pasteboard.paste.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/ability/Pasteboard/paste/src/main/resources/base/element/string.json b/ability/Pasteboard/paste/src/main/resources/base/element/string.json index 005a43876d..ee65b535be 100644 --- a/ability/Pasteboard/paste/src/main/resources/base/element/string.json +++ b/ability/Pasteboard/paste/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "testB" + "value": "paste" }, { "name": "mainability_description", diff --git a/ability/ServiceAbility/entry/src/main/config.json b/ability/ServiceAbility/entry/src/main/config.json index b63bac9c2e..eb33e6c531 100644 --- a/ability/ServiceAbility/entry/src/main/config.json +++ b/ability/ServiceAbility/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/common/Clock/entry/src/main/config.json b/common/Clock/entry/src/main/config.json index 205a5b2548..706b642916 100644 --- a/common/Clock/entry/src/main/config.json +++ b/common/Clock/entry/src/main/config.json @@ -32,7 +32,7 @@ ] } ], - "name": "ohos.samples.clock.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/common/Download/entry/src/main/config.json b/common/Download/entry/src/main/config.json index 9f27116865..0b38a7deed 100644 --- a/common/Download/entry/src/main/config.json +++ b/common/Download/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.downloadsample", - "name": ".DownloadSample", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.downloadsample.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/common/HelloWorld/entry/src/main/config.json b/common/HelloWorld/entry/src/main/config.json index e9c738c62f..399b42ef73 100644 --- a/common/HelloWorld/entry/src/main/config.json +++ b/common/HelloWorld/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.helloworld.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/common/JsHelloWorld/entry/src/main/config.json b/common/JsHelloWorld/entry/src/main/config.json index 27383f67b4..38f32fb69f 100644 --- a/common/JsHelloWorld/entry/src/main/config.json +++ b/common/JsHelloWorld/entry/src/main/config.json @@ -38,7 +38,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.jshelloworld.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/common/Resources/entry/src/main/config.json b/common/Resources/entry/src/main/config.json index 8dd10712bf..0d397fe965 100644 --- a/common/Resources/entry/src/main/config.json +++ b/common/Resources/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "permissions": [], "formsEnabled": false, - "name": "ohos.samples.resource.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/common/Timer/entry/src/main/config.json b/common/Timer/entry/src/main/config.json index 425626850a..eef077cce5 100644 --- a/common/Timer/entry/src/main/config.json +++ b/common/Timer/entry/src/main/config.json @@ -15,7 +15,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ ], "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.timer.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/data/DistributedPictures/entry/src/main/config.json b/data/DistributedPictures/entry/src/main/config.json index 96b31437a4..2ac3c4b6dd 100644 --- a/data/DistributedPictures/entry/src/main/config.json +++ b/data/DistributedPictures/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/data/ORM/entry/src/main/config.json b/data/ORM/entry/src/main/config.json index 14a7d62fd6..60dc58e0de 100644 --- a/data/ORM/entry/src/main/config.json +++ b/data/ORM/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.orm", - "name": ".MyApplication", + "name": ".MainAbility", "mainAbility": "ohos.samples.orm.MainAbility", "deviceType": [ "phone" @@ -33,7 +33,7 @@ } ], "orientation": "unspecified", - "name": "ohos.samples.orm.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/data/Preferences/entry/src/main/config.json b/data/Preferences/entry/src/main/config.json index b45b97c039..e38f3ce99e 100644 --- a/data/Preferences/entry/src/main/config.json +++ b/data/Preferences/entry/src/main/config.json @@ -9,7 +9,7 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.preferences", - "name": ".Preferences", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], @@ -36,7 +36,7 @@ ], "visible": true, "formsEnabled": false, - "name": "ohos.samples.preferences.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/device/BatteryInfo/entry/src/main/config.json b/device/BatteryInfo/entry/src/main/config.json index bf62e282ec..3b2edc10c4 100644 --- a/device/BatteryInfo/entry/src/main/config.json +++ b/device/BatteryInfo/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/device/Compass/entry/src/main/config.json b/device/Compass/entry/src/main/config.json index 9a471a598a..191026028f 100644 --- a/device/Compass/entry/src/main/config.json +++ b/device/Compass/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/device/Location/entry/src/main/config.json b/device/Location/entry/src/main/config.json index 3926aa2ace..2574d68847 100644 --- a/device/Location/entry/src/main/config.json +++ b/device/Location/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.location.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/device/Setting/entry/src/main/config.json b/device/Setting/entry/src/main/config.json index c840d3f508..b495fd4634 100644 --- a/device/Setting/entry/src/main/config.json +++ b/device/Setting/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.setting", - "name": ".Setting", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "unspecified", "visible": true, "formsEnabled": false, - "name": "ohos.samples.setting.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/media/Audio/entry/src/main/config.json b/media/Audio/entry/src/main/config.json index 096f8f4bb8..20ff99b0bc 100644 --- a/media/Audio/entry/src/main/config.json +++ b/media/Audio/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/media/AudioPlayer/entry/src/main/config.json b/media/AudioPlayer/entry/src/main/config.json index 486b625dae..e7c690cfa1 100644 --- a/media/AudioPlayer/entry/src/main/config.json +++ b/media/AudioPlayer/entry/src/main/config.json @@ -9,13 +9,13 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.audioplayer", - "name": ".AudioPlayer", + "name": ".AVPlayClient", "reqCapabilities": [ "video_support" ], "metaData": {}, "deviceType": [ - "default", + "phone", "tv" ], "distro": { diff --git a/media/PixelMap/entry/src/main/config.json b/media/PixelMap/entry/src/main/config.json index 88414247ec..15091c7662 100644 --- a/media/PixelMap/entry/src/main/config.json +++ b/media/PixelMap/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.pixelmap.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/media/VideoPlayer/entry/src/main/config.json b/media/VideoPlayer/entry/src/main/config.json index 322f92a2bd..659e209328 100644 --- a/media/VideoPlayer/entry/src/main/config.json +++ b/media/VideoPlayer/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.videoplayer.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/network/Bluetooth/entry/src/main/config.json b/network/Bluetooth/entry/src/main/config.json index 3e427851c5..41b2b20f85 100644 --- a/network/Bluetooth/entry/src/main/config.json +++ b/network/Bluetooth/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.bluetooth.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/network/DistributedAbility/client/src/main/config.json b/network/DistributedAbility/client/src/main/config.json index 1f9d41aad1..2da9caeac0 100644 --- a/network/DistributedAbility/client/src/main/config.json +++ b/network/DistributedAbility/client/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/network/DistributedAbility/server/src/main/config.json b/network/DistributedAbility/server/src/main/config.json index bd4837d801..4cfb8498a6 100644 --- a/network/DistributedAbility/server/src/main/config.json +++ b/network/DistributedAbility/server/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/network/DistributedDevices/entry/src/main/config.json b/network/DistributedDevices/entry/src/main/config.json index 7a382ee2db..b584dbf359 100644 --- a/network/DistributedDevices/entry/src/main/config.json +++ b/network/DistributedDevices/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.devices", - "name": ".Devices", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -37,7 +37,7 @@ "orientation": "portrait", "visible": true, "formsEnabled": false, - "name": "ohos.samples.devices.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/network/NFC/entry/src/main/config.json b/network/NFC/entry/src/main/config.json index af1be8ab17..7bc34ba3a9 100644 --- a/network/NFC/entry/src/main/config.json +++ b/network/NFC/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/network/NetworkManagement/entry/src/main/config.json b/network/NetworkManagement/entry/src/main/config.json index 9e179ac8e7..acf09cbedb 100644 --- a/network/NetworkManagement/entry/src/main/config.json +++ b/network/NetworkManagement/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "portrait", "formsEnabled": false, - "name": "ohos.samples.networkmanagement.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/network/WLAN/entry/src/main/config.json b/network/WLAN/entry/src/main/config.json index 14a5ac05df..e04cc264e4 100644 --- a/network/WLAN/entry/src/main/config.json +++ b/network/WLAN/entry/src/main/config.json @@ -9,12 +9,12 @@ "deviceConfig": {}, "module": { "package": "ohos.samples.wlan", - "name": ".WLAN", + "name": ".MainAbility", "reqCapabilities": [ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -36,7 +36,7 @@ ], "orientation": "unspecified", "formsEnabled": false, - "name": "ohos.samples.wlan.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:app_name", diff --git a/security/DataSecurity/entry/src/main/config.json b/security/DataSecurity/entry/src/main/config.json index e5f1bf7961..2ccc4b269f 100644 --- a/security/DataSecurity/entry/src/main/config.json +++ b/security/DataSecurity/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/security/FaceRecognition/entry/src/main/config.json b/security/FaceRecognition/entry/src/main/config.json index 945fb5632a..06bda2760d 100644 --- a/security/FaceRecognition/entry/src/main/config.json +++ b/security/FaceRecognition/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, diff --git a/security/Permission/entry/src/main/config.json b/security/Permission/entry/src/main/config.json index 2b2851c921..aed2c67bea 100644 --- a/security/Permission/entry/src/main/config.json +++ b/security/Permission/entry/src/main/config.json @@ -14,7 +14,7 @@ "video_support" ], "deviceType": [ - "default" + "phone" ], "distro": { "deliveryWithInstall": true, @@ -24,7 +24,7 @@ }, "abilities": [ { - "name": "ohos.samples.permissionapp.MainAbility", + "name": ".MainAbility", "icon": "$media:icon", "label": "$string:app_name", "orientation": "portrait", -- Gitee