diff --git a/AppScope/app.json5 b/AppScope/app.json5 index df6d54c96ab943d8d6592d0565f9b1b3470d911e..9e63c6ee5dadf5522dd07941a00e072545a01bca 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -1,6 +1,6 @@ { "app": { - "bundleName": "com.ohos.launcher", + "bundleName": "com.ohos.sceneboard", "vendor": "ohos", "versionCode": 1000000, "versionName": "1.0.0", diff --git a/AppScope/resources/base/element/string.json b/AppScope/resources/base/element/string.json index 4131987c418073509eba0072e0aaf04e04c20e3b..63d7a29c0beae9100c42c0535ec1fc2216b6564e 100644 --- a/AppScope/resources/base/element/string.json +++ b/AppScope/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "app_name", - "value": "Launcher" + "value": "SceneBoard" } ] } diff --git a/build-profile.json5 b/build-profile.json5 index f55d27468ceb7b6ea94d706c61aa2609c30c67eb..0de1d1d11cb02e1017ca42661b11c53d3633ee5b 100644 --- a/build-profile.json5 +++ b/build-profile.json5 @@ -10,7 +10,7 @@ }, "modules": [ { - "name": "launcher_common", + "name": "sceneboard_common", "srcPath": "./common", "targets": [ { @@ -118,7 +118,7 @@ ], }, { - "name": "phone-launcher", + "name": "phone-sceneboard", "srcPath": "./product/phone", "targets": [ { @@ -130,7 +130,7 @@ ], }, { - "name": "pad-launcher", + "name": "pad-sceneboard", "srcPath": "./product/pad", "targets": [ { diff --git a/common/src/main/ets/default/configs/SystemApplication.ts b/common/src/main/ets/default/configs/SystemApplication.ts index d2519002037426b0705301dca70275c14f076bde..7973301970dd5e4b223ceda98bd9cbc3de5155fa 100644 --- a/common/src/main/ets/default/configs/SystemApplication.ts +++ b/common/src/main/ets/default/configs/SystemApplication.ts @@ -14,7 +14,7 @@ */ const SystemApplication = { - SystemApplicationName: 'com.ohos.launcher,com.ohos.systemui,com.ohos.devicemanagerui,com.ohos.callui,com.example.kikakeyboard,com.ohos.contactdataability,com.ohos.telephonydataability,com.ohos.medialibrary.MediaLibraryDataA,com.ohos.medialibrary.MediaScannerAbilityA,com.ohos.adminprovisioning' + SystemApplicationName: 'com.ohos.sceneboard,com.ohos.launcher,com.ohos.systemui,com.ohos.devicemanagerui,com.ohos.callui,com.example.kikakeyboard,com.ohos.contactdataability,com.ohos.telephonydataability,com.ohos.medialibrary.MediaLibraryDataA,com.ohos.medialibrary.MediaScannerAbilityA,com.ohos.adminprovisioning' }; export default SystemApplication; \ No newline at end of file diff --git a/common/src/main/ets/default/constants/CommonConstants.ts b/common/src/main/ets/default/constants/CommonConstants.ts index 0a4b0464d65c4dd813cd88038dbfdf106cb0146a..c589f75f334e91cb293ad39b10c293f4e0c7c0b4 100644 --- a/common/src/main/ets/default/constants/CommonConstants.ts +++ b/common/src/main/ets/default/constants/CommonConstants.ts @@ -26,7 +26,7 @@ export class CommonConstants { /** * Bundle name of launcher */ - static LAUNCHER_BUNDLE = 'com.ohos.launcher'; + static LAUNCHER_BUNDLE = 'com.ohos.sceneboard'; /** * Module name of AppCenter. @@ -36,12 +36,12 @@ export class CommonConstants { /** * Ability name of AppCenter. */ - static APPCENTER_ABILITY = 'com.ohos.launcher.appcenter.MainAbility'; + static APPCENTER_ABILITY = 'com.ohos.sceneboard.appcenter.MainAbility'; /** * Ability name of launcher settings. */ - static SETTING_ABILITY = 'com.ohos.launcher.settings.MainAbility'; + static SETTING_ABILITY = 'com.ohos.sceneboard.settings.MainAbility'; /** * Module name of launcher settings. @@ -51,12 +51,12 @@ export class CommonConstants { /** * Ability name of launcher Recents. */ - static RECENT_ABILITY = 'com.ohos.launcher.recents.MainAbility'; + static RECENT_ABILITY = 'com.ohos.sceneboard.recents.MainAbility'; /** * Launcher Ability name. */ - static LAUNCHER_ABILITY = 'com.ohos.launcher.MainAbility'; + static LAUNCHER_ABILITY = 'com.ohos.sceneboard.MainAbility'; /** * Default invalid value. diff --git a/common/src/main/module.json5 b/common/src/main/module.json5 index 37b0184027525e7c78ea637293506288e55cc3bd..525b9ad4ac5394a6ebe1073f4095a117a8949e99 100644 --- a/common/src/main/module.json5 +++ b/common/src/main/module.json5 @@ -1,6 +1,6 @@ { "module": { - "name": "launcher_common", + "name": "sceneboard_common", "type": "har", "deviceTypes": [ "default", diff --git a/feature/settings/build-profile.json5 b/feature/settings/build-profile.json5 index 06fa1ec636a4ec8bf555134da24c29d33dcada0e..accb9e5b009bd5bf4e48216e2f5f4ed22ae6f41c 100644 --- a/feature/settings/build-profile.json5 +++ b/feature/settings/build-profile.json5 @@ -7,5 +7,5 @@ "name": "default", } ], - "entryModules": ["pad-launcher","phone-launcher"] + "entryModules": ["pad-sceneboard","phone-sceneboard"] } \ No newline at end of file diff --git a/feature/settings/src/main/module.json5 b/feature/settings/src/main/module.json5 index fbf4c62ac0af8aa557619888045a224da15f29b8..4485c39b0f9689cdcd1709c1989f66c99f4f7aff 100644 --- a/feature/settings/src/main/module.json5 +++ b/feature/settings/src/main/module.json5 @@ -4,7 +4,7 @@ "type": "feature", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", - "mainElement": "com.ohos.launcher.settings.MainAbility", + "mainElement": "com.ohos.sceneboard.settings.MainAbility", "deviceTypes": [ "default", "tablet" @@ -21,7 +21,7 @@ "uiSyntax": "ets", "abilities": [ { - "name": "com.ohos.launcher.settings.MainAbility", + "name": "com.ohos.sceneboard.settings.MainAbility", "srcEntrance": "./ets/MainAbility/MainAbility.ts", "startWindowIcon": "$media:startWindowIcon", "startWindowBackground": "$color:startWindowBackground", diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts index beac9b136b45b72feea81617bd2d4acae9e95960..83e7e3cd94aaa3f33a63fb1979e95d7defabb1d5 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/model/NotificationDistributionManager.ts @@ -41,7 +41,7 @@ export default class NotificationDistributionManager { initDeviceManager(): void { Log.showInfo(TAG, 'initDeviceManager'); - DeviceManager.createDeviceManager('com.ohos.launcher', (err, data) => { + DeviceManager.createDeviceManager('com.ohos.sceneboard', (err, data) => { Log.showInfo(TAG, `initDeviceManager createDeviceManager err:${JSON.stringify(err)} data:${JSON.stringify(data)}`); if (data) { this.deviceManager = data; diff --git a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets index a200e0e84c47fccc8c46cbbcc30949b89e09bc20..b554469a065607d8cfbb8ca865804852e699f02b 100644 --- a/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets +++ b/feature/systemui/noticeitem/src/main/ets/com/ohos/noticeItem/view/item/settingDialog.ets @@ -124,7 +124,7 @@ export default struct SettingDialog { openAbility() { Log.showInfo(TAG, ` openAbility:showNotificationManagement`); - EventManager.publish(obtainStartAbility('com.ohos.launcher', 'com.ohos.sceneboard.notificationmanagement.MainAbility', + EventManager.publish(obtainStartAbility('com.ohos.sceneboard', 'com.ohos.sceneboard.notificationmanagement.MainAbility', { 'migrateUri': 'pages/setEnable', 'migrateBundle': this.itemData.bundleName })) this.closeAbility() } diff --git a/feature/systemui/notificationmanagement/build-profile.json5 b/feature/systemui/notificationmanagement/build-profile.json5 index 5f5cd5aa5958c08bac7e1f107b97be5abffabe1a..451c3df7f96171b51f5a98cac916ff0f7bdf193f 100644 --- a/feature/systemui/notificationmanagement/build-profile.json5 +++ b/feature/systemui/notificationmanagement/build-profile.json5 @@ -5,5 +5,5 @@ "name": "default", } ], - "entryModules": ["pad-launcher","phone-launcher"] + "entryModules": ["pad-sceneboard","phone-sceneboard"] } \ No newline at end of file diff --git a/package.json b/package.json index 47de813692483f329e2d7c52da3aac2703db4fbf..0c7ecff517c9229d0019772feb59fbf4839a21db 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "devDependencies": {}, - "name": "launcher", + "name": "sceneboard", "ohos": { "org": "huawei", "directoryLevel": "project", diff --git a/product/pad/package.json b/product/pad/package.json index 36dbac1e48cf598dc0e392cb5a4a25bb04a434c3..7375e9d541ed3bee5a89e93c1113f2fb533bc3f0 100644 --- a/product/pad/package.json +++ b/product/pad/package.json @@ -1,6 +1,6 @@ { "devDependencies": {}, - "name": "launcher", + "name": "sceneboard", "ohos": { "org": "huawei", "directoryLevel": "module", diff --git a/product/pad/src/main/module.json5 b/product/pad/src/main/module.json5 index 1d8b1a171d79d0744387ed2ad357f90713245de3..8ca503880680787f3bb3315386062a0318b68ca0 100644 --- a/product/pad/src/main/module.json5 +++ b/product/pad/src/main/module.json5 @@ -1,10 +1,10 @@ { "module": { - "name": "pad-launcher", + "name": "pad-sceneboard", "type": "entry", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", - "mainElement": "com.ohos.launcher.MainAbility", + "mainElement": "com.ohos.sceneboard.MainAbility", "deviceTypes": [ "default", "tablet" @@ -36,7 +36,7 @@ } ], "visible": false, - "name": "com.ohos.launcher.MainAbility", + "name": "com.ohos.sceneboard.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/product/pad/src/main/resources/base/element/string.json b/product/pad/src/main/resources/base/element/string.json index 04bfac4eb3feb4a00c7517b7ff737ad5f9d492b3..c09d536a3acb07c6ee7fbdcd5f05e14a55859e3f 100644 --- a/product/pad/src/main/resources/base/element/string.json +++ b/product/pad/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/pad/src/main/resources/en_US/element/string.json b/product/pad/src/main/resources/en_US/element/string.json index 08ad78560bd0965159252a03c8ffb3c0b1d1a772..abbf6a9f263600a059e76589134e8a382f33b43c 100644 --- a/product/pad/src/main/resources/en_US/element/string.json +++ b/product/pad/src/main/resources/en_US/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/pad/src/main/resources/zh_CN/element/string.json b/product/pad/src/main/resources/zh_CN/element/string.json index 7d3690d00c03384343548f9b706cedd8e3cd5142..e15bc971b123d44e5756d2924a843a1970691b0e 100644 --- a/product/pad/src/main/resources/zh_CN/element/string.json +++ b/product/pad/src/main/resources/zh_CN/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/phone/package.json b/product/phone/package.json index a86f43aa067eb84c7708ab7d5b1296378966d22d..366cf2ce93ee01221ba6532a05722653b35834b3 100644 --- a/product/phone/package.json +++ b/product/phone/package.json @@ -1,6 +1,6 @@ { "devDependencies": {}, - "name": "launcher", + "name": "sceneboard", "ohos": { "org": "huawei", "directoryLevel": "module", diff --git a/product/phone/src/main/ets/MainAbility/MainAbility.ts b/product/phone/src/main/ets/MainAbility/MainAbility.ts index db5623d06eea13524536de6010d3e5cfac858230..7a1c9977a2d07a9321726da0842ac801fd35bd84 100644 --- a/product/phone/src/main/ets/MainAbility/MainAbility.ts +++ b/product/phone/src/main/ets/MainAbility/MainAbility.ts @@ -33,7 +33,7 @@ import ScreenLockManager from '@ohos/common/src/main/ets/default/manager/ScreenL import ServiceExtensionContext from 'application/ServiceExtensionContext'; import TimeManager from '@ohos/common/src/main/ets/default/manager/TimeManager'; -const TAG = 'LauncherMainAbility'; +const TAG = 'SceneBoardMainAbility'; export default class MainAbility extends ServiceExtensionAbility { onCreate(want: Want): void { diff --git a/product/phone/src/main/ets/SceneBoard/SCBScreen.ets b/product/phone/src/main/ets/SceneBoard/SCBScreen.ets index ef8ac91b10fbad71dbad49d34e2bfd24b5a59ab2..85c78061e0f6e28830e9abdb5fc685453c4cd5f1 100644 --- a/product/phone/src/main/ets/SceneBoard/SCBScreen.ets +++ b/product/phone/src/main/ets/SceneBoard/SCBScreen.ets @@ -32,7 +32,7 @@ import WindowPanelManager, { SystemUi_VolumePanel } from '@ohos/common/src/main/ets/default/manager/WindowPanelManager'; -const MODULE_NAME = "phone-launcher"; +const MODULE_NAME = "phone-sceneboard"; const TAG = 'SCBScreen'; @Component diff --git a/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets b/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets index 2cbb0516c9a9a6c93a2f774369ed9b2c6633248f..af0f8c797f20de03c49ea207286c201fd447566c 100644 --- a/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets +++ b/product/phone/src/main/ets/SceneBoard/dropdownpanel/notification.ets @@ -269,7 +269,7 @@ struct CenterTitle { settingClick() { Log.showDebug(TAG, ` settingClick `) // TODO 修改为合一服务的Ability - EventManager.publish(obtainStartAbility('com.ohos.launcher', 'com.ohos.sceneboard.notificationmanagement.MainAbility')) + EventManager.publish(obtainStartAbility('com.ohos.sceneboard', 'com.ohos.sceneboard.notificationmanagement.MainAbility')) } touchEvent(event: TouchEvent) { diff --git a/product/phone/src/main/module.json5 b/product/phone/src/main/module.json5 index 2b0272b94630f1092624c395754ee7eb950572c6..2539e7d5291cfff508f13d420efc5937aaf153cc 100644 --- a/product/phone/src/main/module.json5 +++ b/product/phone/src/main/module.json5 @@ -1,10 +1,10 @@ { "module": { - "name": "phone-launcher", + "name": "phone-sceneboard", "type": "entry", "srcEntrance": "./ets/Application/AbilityStage.ts", "description": "$string:mainability_description", - "mainElement": "com.ohos.launcher.MainAbility", + "mainElement": "com.ohos.sceneboard.MainAbility", "deviceTypes": [ "default", "tablet" @@ -36,7 +36,7 @@ } ], "visible": true, - "name": "com.ohos.launcher.MainAbility", + "name": "com.ohos.sceneboard.MainAbility", "icon": "$media:icon", "description": "$string:mainability_description", "label": "$string:entry_MainAbility", diff --git a/product/phone/src/main/resources/base/element/string.json b/product/phone/src/main/resources/base/element/string.json index 97bf4ff9ddc6d001a0308d33df5b6189d2d59e75..7aac3ae621c4ef5e2b4792dd40c3fad9a375a937 100644 --- a/product/phone/src/main/resources/base/element/string.json +++ b/product/phone/src/main/resources/base/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/phone/src/main/resources/en_US/element/string.json b/product/phone/src/main/resources/en_US/element/string.json index f23e17e13c916ea34282f8d84c19f5714e5dcfd2..64d415861fb3461faf97780fadb127e3bc0b45e2 100644 --- a/product/phone/src/main/resources/en_US/element/string.json +++ b/product/phone/src/main/resources/en_US/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/product/phone/src/main/resources/zh_CN/element/string.json b/product/phone/src/main/resources/zh_CN/element/string.json index 97f01352fb2836764c620c332c62949f25e5c232..caaaebe1ca38256851fc6640b3aa007ac5521426 100644 --- a/product/phone/src/main/resources/zh_CN/element/string.json +++ b/product/phone/src/main/resources/zh_CN/element/string.json @@ -2,7 +2,7 @@ "string": [ { "name": "entry_MainAbility", - "value": "Launcher" + "value": "SceneBoard" }, { "name": "mainability_description", diff --git a/signature/launcher.p7b b/signature/sceneboard.p7b similarity index 75% rename from signature/launcher.p7b rename to signature/sceneboard.p7b index eebe2f01476ce27c35b7861253daf005221e311a..d81e1dd5a7b2d90178a966b40a7577ba7b7d921f 100644 Binary files a/signature/launcher.p7b and b/signature/sceneboard.p7b differ