diff --git a/UI/Dialog/entry/src/main/config.json b/UI/Dialog/entry/src/main/config.json index 70f253c258da2a3fa5d5d1afc36f49eba68310db..05260d581e64d4f100ad2cf6ffa3112408f8a265 100644 --- a/UI/Dialog/entry/src/main/config.json +++ b/UI/Dialog/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.dialog.MainAbility", "icon": "$media:icon", diff --git a/UI/Dialog/entry/src/main/resources/base/element/string.json b/UI/Dialog/entry/src/main/resources/base/element/string.json index 8d59154008f1283c8f67ff9b390f735d2735a931..83c5e850a3af7573b3da1039d7a2a8f559cccdf6 100644 --- a/UI/Dialog/entry/src/main/resources/base/element/string.json +++ b/UI/Dialog/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "Prompt" + "value": "Dialog" }, { "name": "mainability_description", diff --git a/ability/DistributedScheduler/entry/src/main/config.json b/ability/DistributedScheduler/entry/src/main/config.json index c74b007779af7f53cecbc7c88a60f9f7744d1f03..4a1c9da4c69959e911b321955c8845fe2873d8d5 100644 --- a/ability/DistributedScheduler/entry/src/main/config.json +++ b/ability/DistributedScheduler/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.distributedscheduler.MainAbility", "icon": "$media:icon", @@ -46,14 +45,13 @@ }, { "name": "ohos.sample.distributedscheduler.RemoteAbility", - "type": "service", - "visible": true + "type": "service" }, { "name": "ohos.sample.distributedscheduler.PageAbility", "icon": "$media:icon", "description": "$string:pageability_description", - "label": "PageAbility", + "label": "$string:pageability_lable", "type": "page" } ], diff --git a/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json b/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json index f06570d38916ae59fab14badb73bc435a0da2de8..4f502df6984d578751cf64f153a8d245f3be4eec 100644 --- a/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json +++ b/ability/DistributedScheduler/entry/src/main/resources/base/element/string.json @@ -2,11 +2,19 @@ "string": [ { "name": "app_name", - "value": "DistributedDevices" + "value": "DistributedScheduler" }, { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "pageability_lable", + "value": "PageAbility" + }, + { + "name": "pageability_description", + "value": "hap page ability" } ] } \ No newline at end of file diff --git a/ability/Idl/rpcclient/src/main/config.json b/ability/Idl/rpcclient/src/main/config.json index ef9a0a04514e579835a0b20ad80f245da25a5707..7fee74e070b8ea1a6ae62903c4037895e73a4192 100644 --- a/ability/Idl/rpcclient/src/main/config.json +++ b/ability/Idl/rpcclient/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.rpcclient.MainAbility", "icon": "$media:icon", diff --git a/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java b/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java index 1490d2f71deb8347346532901269b61cb52e92be..e1ee664bea089a71f8d49aed8855ca701d153576 100644 --- a/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java +++ b/ability/Idl/rpcclient/src/main/java/ohos/samples/rpcclient/slice/MainAbilitySlice.java @@ -130,7 +130,7 @@ public class MainAbilitySlice extends AbilitySlice { private void showTip(String msg) { toastDialog = new ToastDialog(getApplicationContext()); - toastDialog.setContentText(msg); + toastDialog.setText(msg); toastDialog.setAutoClosable(false); toastDialog.setDuration(TOAST_DURATION); toastDialog.show(); diff --git a/ability/Idl/rpcserver/src/main/config.json b/ability/Idl/rpcserver/src/main/config.json index b09d2600560b4b42d1dd053936d659975e734575..ac75c0d9327bbc722e53f1435784b80d78ee40c7 100644 --- a/ability/Idl/rpcserver/src/main/config.json +++ b/ability/Idl/rpcserver/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.rpcserver.MainAbility", "icon": "$media:icon", @@ -47,8 +46,7 @@ { "name": "ohos.samples.rpcserver.ServiceAbility", "type": "service", - "visible": true, - "module-name": "entry" + "visible": true } ] } diff --git a/ability/Pasteboard/copy/src/main/config.json b/ability/Pasteboard/copy/src/main/config.json index 506ed7371167bd8f682634a5283330101c2d9d3f..6e71a0ac5be58e0df24cb747dc36576b0d480bbf 100644 --- a/ability/Pasteboard/copy/src/main/config.json +++ b/ability/Pasteboard/copy/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.pasteboard.copy.MainAbility", "icon": "$media:icon", diff --git a/ability/Pasteboard/paste/src/main/config.json b/ability/Pasteboard/paste/src/main/config.json index ca98bfb18c8420db38852bcf6e5deccb28674d33..c711c7935799ace0710ed52cfe6420c1c8e85650 100644 --- a/ability/Pasteboard/paste/src/main/config.json +++ b/ability/Pasteboard/paste/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.pasteboard.paste.MainAbility", "icon": "$media:icon", 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 005a43876df06ac1f0a5f38a90bef8ae6d361ddb..ee65b535be08e3a671732aca172efeb95115542b 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/common/Resources/entry/src/main/config.json b/common/Resources/entry/src/main/config.json index bc261456f7a666b738662ce16ae6cbeb52717adf..563f1cee0eda624219ac75a169a4a634dc03de0f 100644 --- a/common/Resources/entry/src/main/config.json +++ b/common/Resources/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "permissions": [], - "visible": true, "formsEnabled": false, "name": "ohos.samples.resource.MainAbility", "icon": "$media:icon", @@ -43,27 +42,6 @@ "label": "$string:app_name", "type": "page", "launchType": "standard" - }, - { - "skills": [ - { - "entities": [ - "entity.system.home" - ], - "actions": [ - "action.system.home" - ] - } - ], - "orientation": "portrait", - "visible": true, - "formsEnabled": false, - "name": "ohos.samples.resource.MainAbility", - "icon": "$media:icon", - "description": "$string:mainability_description", - "label": "Resources", - "type": "page", - "launchType": "standard" } ] } diff --git a/common/Timer/entry/src/main/config.json b/common/Timer/entry/src/main/config.json index 4a8154b57405b76426bddfc3d5305e34f9f9f614..f2c8a210e8f369b53cce354f550dde9a23a0d5c5 100644 --- a/common/Timer/entry/src/main/config.json +++ b/common/Timer/entry/src/main/config.json @@ -36,7 +36,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.timer.MainAbility", "icon": "$media:icon", diff --git a/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java b/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java index 48971028bf2049f9fb1d03c135601bc001be9222..5912a426b5e15fd6524c2d0f6d322abc77257e8d 100644 --- a/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java +++ b/common/Timer/entry/src/main/java/ohos/timer/slice/MainAbilitySlice.java @@ -232,7 +232,7 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL } private void showToast(String message) { - new ToastDialog(this).setContentText(message).show(); + new ToastDialog(this).setText(message).show(); } @Override diff --git a/device/Location/entry/src/main/config.json b/device/Location/entry/src/main/config.json index 430005b166f7bd42f4359917d757a5b37b66db09..a4850fc8d5d08343814ffe2fcd12db9f624a3a9b 100644 --- a/device/Location/entry/src/main/config.json +++ b/device/Location/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.location.MainAbility", "icon": "$media:icon", diff --git a/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java b/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java index a4e9936603b7c0589f8f15806394da0f6eaa3f97..2fcc5ae557cce679083fda12e0892936c8ad0e5a 100644 --- a/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java +++ b/device/Location/entry/src/main/java/ohos/samples/location/slice/MainAbilitySlice.java @@ -184,7 +184,7 @@ public class MainAbilitySlice extends AbilitySlice { gaList.clear(); } else { HiLog.info(LABEL_LOG, "%{public}s", "EventNotifier or Location response is null"); - new ToastDialog(context).setTitleText("EventNotifier or Location response is null").show(); + new ToastDialog(context).setText("EventNotifier or Location response is null").show(); } } diff --git a/device/Location/entry/src/main/resources/base/element/string.json b/device/Location/entry/src/main/resources/base/element/string.json index 131702d90f28f1b36dffdf16069f37f45705ea77..2283a5fb230eb05d565501e5423d8c5b7321b65f 100644 --- a/device/Location/entry/src/main/resources/base/element/string.json +++ b/device/Location/entry/src/main/resources/base/element/string.json @@ -7,6 +7,10 @@ { "name": "mainability_description", "value": "hap sample empty page" + }, + { + "name": "reason_description", + "value": "sample need the location permission" } ] } \ No newline at end of file diff --git a/media/Camera/entry/src/main/config.json b/media/Camera/entry/src/main/config.json index 896130b6fbf99a65874e2d1ffd391c687bd681fe..3000375570aab5738f49a1c1f83f73ddd365d288 100644 --- a/media/Camera/entry/src/main/config.json +++ b/media/Camera/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.camera.MainAbility", "icon": "$media:icon", @@ -45,15 +44,13 @@ "launchType": "standard" }, { - "name": ".TakePhotoAbility", + "name": "ohos.samples.camera.TakePhotoAbility", "type": "page", - "visible": true, "launchType": "standard" }, { - "name": ".VideoRecordAbility", + "name": "ohos.samples.camera.VideoRecordAbility", "type": "page", - "visible": true, "launchType": "standard" } ], diff --git a/media/Camera/entry/src/main/resources/base/element/string.json b/media/Camera/entry/src/main/resources/base/element/string.json index d4275350e2801dde1542c7b08a2f817c5bcda433..1b00860953726bc122217643a3b8fd81ca40ace9 100644 --- a/media/Camera/entry/src/main/resources/base/element/string.json +++ b/media/Camera/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "Camera" }, { "name": "mainability_description", diff --git a/media/PixelMap/entry/src/main/config.json b/media/PixelMap/entry/src/main/config.json index fb9e6ba979ea9c99f36c81fdb9b42beaff9f6d02..88414247ec73f881d6ac47b816dd59b952b4ea1c 100644 --- a/media/PixelMap/entry/src/main/config.json +++ b/media/PixelMap/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.pixelmap.MainAbility", "icon": "$media:icon", diff --git a/media/PixelMap/entry/src/main/resources/base/element/string.json b/media/PixelMap/entry/src/main/resources/base/element/string.json index d4275350e2801dde1542c7b08a2f817c5bcda433..ee4a562d8dd199700971c562f460770c4c560c6f 100644 --- a/media/PixelMap/entry/src/main/resources/base/element/string.json +++ b/media/PixelMap/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "PixelMap" }, { "name": "mainability_description", diff --git a/network/Bluetooth/entry/src/main/config.json b/network/Bluetooth/entry/src/main/config.json index 0d41861a0e29f48afa81ddae840a0a717d1ad5ff..54bb190f46c044570862316632089c966626534e 100644 --- a/network/Bluetooth/entry/src/main/config.json +++ b/network/Bluetooth/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.bluetooth.MainAbility", "icon": "$media:icon", @@ -49,7 +48,7 @@ { "reason": "get right", "name": "ohos.permission.LOCATION", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], @@ -59,7 +58,7 @@ { "reason": "get right", "name": "ohos.permission.DISCOVER_BLUETOOTH", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], @@ -69,7 +68,7 @@ { "reason": "get right", "name": "ohos.permission.USE_BLUETOOTH", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], @@ -79,7 +78,7 @@ { "reason": "get right", "name": "ohos.permission.MANAGE_BLUETOOTH", - "used-scene": { + "usedScene": { "ability": [ "ohos.samples.bluetooth.MainAbility" ], diff --git a/network/Bluetooth/entry/src/main/resources/base/element/string.json b/network/Bluetooth/entry/src/main/resources/base/element/string.json index b6bca7ecebc36f7a1c2c3f8495a9508da1544189..7b2711e5f66b949a67c6de87f3a4602f754af929 100644 --- a/network/Bluetooth/entry/src/main/resources/base/element/string.json +++ b/network/Bluetooth/entry/src/main/resources/base/element/string.json @@ -16,6 +16,10 @@ "name": "mainability_description", "value": "hap sample empty page" }, + { + "name": "app_name", + "value": "Bluetooth" + }, { "name": "bluetooth", "value": "Bluetooth" diff --git a/network/NetworkManagement/entry/src/main/config.json b/network/NetworkManagement/entry/src/main/config.json index 16ffac1a1868ff64ebaad644a539e20afb041475..9e179ac8e7d4b52ce5f8bdc87856bd83f6629fec 100644 --- a/network/NetworkManagement/entry/src/main/config.json +++ b/network/NetworkManagement/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "portrait", - "visible": true, "formsEnabled": false, "name": "ohos.samples.networkmanagement.MainAbility", "icon": "$media:icon", diff --git a/network/NetworkManagement/entry/src/main/resources/base/element/string.json b/network/NetworkManagement/entry/src/main/resources/base/element/string.json index f9d50354b20520a838e6bdb77be199e94aa1d4a3..5f0cc16dbb78d9473becfd8704eaed097f7974b1 100644 --- a/network/NetworkManagement/entry/src/main/resources/base/element/string.json +++ b/network/NetworkManagement/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "IntentAgent" + "value": "NetworkManagement" }, { "name": "mainability_description", diff --git a/network/WLAN/entry/src/main/config.json b/network/WLAN/entry/src/main/config.json index bd04349f8187e76536568d1fcaf3d78646e2a03d..14a5ac05df2957e6ec194f11c4b5647637ebbdc8 100644 --- a/network/WLAN/entry/src/main/config.json +++ b/network/WLAN/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.wlan.MainAbility", "icon": "$media:icon", diff --git a/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java b/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java index 51072851d978e52cfb35151154787026db1885c7..f975d9cec9e98387c9a10536d34b48e555e649e6 100644 --- a/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java +++ b/network/WLAN/entry/src/main/java/ohos/samples/wlan/slice/WlanNotificationSlice.java @@ -98,7 +98,7 @@ public class WlanNotificationSlice extends AbilitySlice { return; } IntentParams params = commonEventData.getIntent().getParams(); - if (params == null) { + if (params == null || params.getParam(WifiEvents.PARAM_ACTIVE_STATE) == null) { return; } diff --git a/security/Permission/entry/src/main/config.json b/security/Permission/entry/src/main/config.json index 0f6fa32a312ef60ee604e797d4b42f54237337b4..2b2851c9215eed9b0aacfd59861a5de865b6ea2a 100644 --- a/security/Permission/entry/src/main/config.json +++ b/security/Permission/entry/src/main/config.json @@ -28,7 +28,6 @@ "icon": "$media:icon", "label": "$string:app_name", "orientation": "portrait", - "visible": true, "formsEnabled": false, "description": "$string:mainability_description", "type": "page", diff --git a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java index a4c266e3c3b476b73d80bc7a7fc0cb372218ffc9..b0c8c82b2b6ec6ccad43e0e1044056620a68b88e 100644 --- a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java +++ b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/MainAbility.java @@ -55,6 +55,6 @@ public class MainAbility extends Ability { } private void showTips(Context context, String message) { - new ToastDialog(context).setContentText(message).show(); + new ToastDialog(context).setText(message).show(); } } diff --git a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java index f0d83527fb52c32c293e8673d13ac03cbf42fe75..f6aea28487c54f60cbf9628e697b2477d2ca70ea 100644 --- a/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java +++ b/security/Permission/entry/src/main/java/ohos/samples/permissionapp/slice/MainAbilitySlice.java @@ -158,6 +158,6 @@ public class MainAbilitySlice extends AbilitySlice implements Component.ClickedL } private void showTips(Context context, String message) { - new ToastDialog(context).setContentText(message).show(); + new ToastDialog(context).setText(message).show(); } } diff --git a/thread/EventHandler/entry/src/main/config.json b/thread/EventHandler/entry/src/main/config.json index dd6922cc8e6f3fae77c833cb8a3e943323485bac..e656a595346ba790556f679a896b3488bca9c341 100644 --- a/thread/EventHandler/entry/src/main/config.json +++ b/thread/EventHandler/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.eventhandler.MainAbility", "icon": "$media:icon", diff --git a/thread/EventHandler/entry/src/main/resources/base/element/string.json b/thread/EventHandler/entry/src/main/resources/base/element/string.json index d4275350e2801dde1542c7b08a2f817c5bcda433..9945c5050e52e59b12fd0b49393af7383e773332 100644 --- a/thread/EventHandler/entry/src/main/resources/base/element/string.json +++ b/thread/EventHandler/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "EventHandler" }, { "name": "mainability_description", diff --git a/thread/TaskDispatcher/entry/src/main/config.json b/thread/TaskDispatcher/entry/src/main/config.json index 93cfd2a3a57750d45cfce5c5547e7e4384889c07..a48f51731a138ec66a4150788ef93f89827e5bcc 100644 --- a/thread/TaskDispatcher/entry/src/main/config.json +++ b/thread/TaskDispatcher/entry/src/main/config.json @@ -35,7 +35,6 @@ } ], "orientation": "unspecified", - "visible": true, "formsEnabled": false, "name": "ohos.samples.taskmanager.MainAbility", "icon": "$media:icon", diff --git a/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json b/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json index d4275350e2801dde1542c7b08a2f817c5bcda433..b70430f0f997f917d95493ff643a137f2c3ebfd7 100644 --- a/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json +++ b/thread/TaskDispatcher/entry/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "TaskManager" + "value": "TaskDispatcher" }, { "name": "mainability_description",