From 7bea4acc142965f34ff0e2b82d8d12c2c19a1f9a Mon Sep 17 00:00:00 2001
From: fanchenxuan <fanchenxuan@huawei.com>
Date: Wed, 22 Jan 2025 19:12:41 +0800
Subject: [PATCH] =?UTF-8?q?=E3=80=90=E6=8C=91=E5=8D=955.0.1=E3=80=91?=
 =?UTF-8?q?=E5=A4=A7=E5=AD=97=E4=BD=93=E4=B8=8B=E8=97=8F=E8=AF=AD=E9=87=8D?=
 =?UTF-8?q?=E5=8F=A0=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: fanchenxuan <fanchenxuan@huawei.com>
---
 permissionmanager/src/main/ets/pages/dialogPlus.ets     | 2 +-
 permissionmanager/src/main/ets/pages/securityDialog.ets | 3 +--
 permissionmanager/src/main/module.json                  | 3 +++
 permissionmanager/src/main/module.json5                 | 3 +++
 4 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/permissionmanager/src/main/ets/pages/dialogPlus.ets b/permissionmanager/src/main/ets/pages/dialogPlus.ets
index 46569fa..997e65a 100644
--- a/permissionmanager/src/main/ets/pages/dialogPlus.ets
+++ b/permissionmanager/src/main/ets/pages/dialogPlus.ets
@@ -123,7 +123,7 @@ struct dialogPlusPage {
                     $r('sys.float.Title_S'),
                     $r('sys.float.Title_S'))
                   )
-                  .heightAdaptivePolicy(TextHeightAdaptivePolicy.MIN_FONT_SIZE_FIRST)
+                  .heightAdaptivePolicy(TextHeightAdaptivePolicy.MAX_LINES_FIRST)
                 }
                 .constraintSize({ minHeight: Constants.HEADLINE_HEIGHT })
                 .justifyContent(FlexAlign.Center)
diff --git a/permissionmanager/src/main/ets/pages/securityDialog.ets b/permissionmanager/src/main/ets/pages/securityDialog.ets
index 892e130..5a797eb 100644
--- a/permissionmanager/src/main/ets/pages/securityDialog.ets
+++ b/permissionmanager/src/main/ets/pages/securityDialog.ets
@@ -161,7 +161,7 @@ struct SecurityDialog {
                   $r('sys.float.Title_S'),
                   $r('sys.float.Title_S'))
                 )
-                .heightAdaptivePolicy(TextHeightAdaptivePolicy.MIN_FONT_SIZE_FIRST)
+                .heightAdaptivePolicy(TextHeightAdaptivePolicy.MAX_LINES_FIRST)
             }
             .constraintSize({ minHeight: Constants.HEADLINE_HEIGHT })
             .justifyContent(FlexAlign.Center)
@@ -174,7 +174,6 @@ struct SecurityDialog {
               .textAlign(TextAlign.Start)
               .fontColor($r('sys.color.font_primary'))
               .fontSize($r('sys.float.Body_L'))
-              .lineHeight(Constants.TEXT_SMALL_LINE_HEIGHT)
               .maxFontScale(Constants.DIALOG_TEXT_MAX_SCALE)
           }
         }
diff --git a/permissionmanager/src/main/module.json b/permissionmanager/src/main/module.json
index c89e9e7..d1ab7b6 100644
--- a/permissionmanager/src/main/module.json
+++ b/permissionmanager/src/main/module.json
@@ -19,6 +19,9 @@
             {
               "name": "ArkTSPartialUpdate",
               "value": "true"
+            },
+            {
+              "name": "ohos.graphics2d.text.adapter_text_height"
             }
           ],
         "abilities": [
diff --git a/permissionmanager/src/main/module.json5 b/permissionmanager/src/main/module.json5
index 6c52a16..ab8e15a 100644
--- a/permissionmanager/src/main/module.json5
+++ b/permissionmanager/src/main/module.json5
@@ -31,6 +31,9 @@
             {
               "name": "ArkTSPartialUpdate",
               "value": "true"
+            },
+            {
+              "name": "ohos.graphics2d.text.adapter_text_height"
             }
           ],
         "abilities": [
-- 
Gitee