diff --git a/AppScope/app.json b/AppScope/app.json index ae2906b83529ad3a2bbe48b5f8aa934c62959585..cb1e2bf9dfc46138544831ba1ad9322296210183 100644 --- a/AppScope/app.json +++ b/AppScope/app.json @@ -4,8 +4,8 @@ "app": { "bundleName": "com.ohos.permissionmanager", "vendor": "example", - "versionCode": 1000075, - "versionName": "1.7.5", + "versionCode": 1000076, + "versionName": "1.7.6", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 14, diff --git a/AppScope/app.json5 b/AppScope/app.json5 index 5c5d8f5c1d80594d635b6f03b3571069f4fce69f..fb84c462a43e807ffcf8d90dfc61474bb8de3d38 100644 --- a/AppScope/app.json5 +++ b/AppScope/app.json5 @@ -16,8 +16,8 @@ "app": { "bundleName": "com.ohos.permissionmanager", "vendor": "example", - "versionCode": 1000075, - "versionName": "1.7.5", + "versionCode": 1000076, + "versionName": "1.7.6", "icon": "$media:app_icon", "label": "$string:app_name", "minAPIVersion": 14, diff --git a/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts b/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts index d47b4d03db1383ef0862aace127c9d1cf5548b1b..1f0f9124a8a7ad3811313bbd0187b0b8ef50a148 100644 --- a/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts +++ b/permissionmanager/src/main/ets/SecurityExtAbility/SecurityExtAbility.ts @@ -96,7 +96,10 @@ export default class SecurityExtensionAbility extends extension { this.context.terminateSelf(); } }); - if (deviceInfo.deviceType !== 'wearable') { + try { + await win.setFollowParentWindowLayoutEnabled(true); + } catch(error) { + console.error(TAG + `setFollowParentWindowLayoutEnabled error: ${JSON.stringify(error)}`); await win.moveWindowTo(rect.left, rect.top); await win.resize(rect.width, rect.height); }; diff --git a/permissionmanager/src/main/ets/pages/securityDialog.ets b/permissionmanager/src/main/ets/pages/securityDialog.ets index 0255cec4a218ef831a6104325e335f32915f3a0b..61abd38fa7c5b51e2745e1d63735344ac3099f90 100644 --- a/permissionmanager/src/main/ets/pages/securityDialog.ets +++ b/permissionmanager/src/main/ets/pages/securityDialog.ets @@ -297,7 +297,6 @@ struct SecurityDialog { this.context.terminateSelf(); } }, - offset: { dx: 0, dy: 0 - this.want.parameters['ohos.dialog.offset'] + 'px' } }); @Builder