Changes to be committed:
	modified:   frameworks/font/ui_line_break.cpp

Merge pull request !732 from 施其昌/master

issuesno:https://gitee.com/openharmony/graphic_ui/issues/I5NVFQ
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nshiqichang <shiqichang@huawei.com>
Change-Id: I863dd70dbb5415017c85b67d8654fbce36353eca

Change-Id: Ibdc6b274f21c7e2a92bbed2118834fc1a34d4e09

Merge pull request !733 from Lizhiqi/zindex

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5AD8G
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlizhiqi <lizhiqi1@huawei.com>

Merge pull request !729 from 郝烁/master

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I58ZEX?from=project-issue
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlancer <haoshuo@huawei.com>

Merge pull request !734 from benb365/master

Signed-off-by: Nbenb365 <liuyongchang1@huawei.com>
Change-Id: I26c5e142972efa25489a07bc63076c9e7e390b8b

Merge pull request !730 from Zhouyj/master

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5NJ3N
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: Nzhouyj <zhouyuanjie1@huawei.com>

Merge pull request !719 from 施其昌/master

issuesno:https://gitee.com/openharmony/graphic_ui/issues/I5MPWR
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nshiqichang <shiqichang@huawei.com>
Change-Id: Id5c0c6a9ed9c403bd2ebebf3fc926d9a4529b5ea

Change-Id: I915a736917aa372f98c15dc2c10e049da740e228

Merge pull request !728 from Lizhiqi/master

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5M970
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlizhiqi <lizhiqi1@huawei.com>

Merge pull request !726 from Lizhiqi/edittext

Merge pull request !725 from Shelpwang/master

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5N55G
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlizhiqi <lizhiqi1@huawei.com>

Signed-off-by: NShelpwang <861550161@qq.com>

Merge pull request !723 from mlw296395/master

Signed-off-by: Nmlw296395 <wangmiaolin050@chinasoftinc.com>

Merge pull request !721 from 张兴泰/master

Description: Fix that there is only one page in the swiper, set it to loop, and there is a dead loop
IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5MUAJ
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: Nxing-tai-zhang <zhangxingtai@huawei.com>

Merge pull request !717 from 张兴泰/master

Description: Fix the crash of calling SetHandImage in UIAnalogClock control to set nonexistent pictures
IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5HM20
Feature or Bugfix: Bugfix
Binary Source:No
Signed-off-by: Nxing-tai-zhang <zhangxingtai@huawei.com>

Merge pull request !716 from Lizhiqi/edittext

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5LFW2
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlizhiqi <lizhiqi1@huawei.com>

Merge pull request !694 from Lizhiqi/edittext

IssueNo:
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlizhiqi <lizhiqi1@huawei.com>

Merge pull request !702 from chen/master

Merge pull request !715 from 施其昌/master

issuesno:https://gitee.com/openharmony/arkui_ace_engine_lite/issues/I5K69O
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nshiqichang <shiqichang@huawei.com>
Change-Id: I501a74e33bf605bcf879a8b8261af626a2099709

Change-Id: Ia0d30afa6deaddc1c1dc1fb90066040b98b40557

Merge pull request !714 from 施其昌/master

issuesno:https://gitee.com/openharmony/arkui_ace_engine_lite/issues/I5KL8E
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nshiqichang <shiqichang@huawei.com>
Change-Id: I4d496702c1506db964090a4057079026f724a0ad

Change-Id: I82fe841b5a2f87f6f42886a0f8244f5b7fc7e35b

Merge pull request !712 from 施其昌/master

Merge pull request !713 from 郝烁/master

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5K6AN
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlancer <haoshuo@huawei.com>

issuesno:https://gitee.com/openharmony/arkui_ace_engine_lite/issues/I5K69O
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nshiqichang <shiqichang@huawei.com>
Change-Id: If1f00fd0d78ca89194a964444710f955c0615c1d

Change-Id: I176e5827e7124e75e043abebf886b3aa53c1cc0d

Merge pull request !711 from 郝烁/master

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5JQL2
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nlancer <haoshuo@huawei.com>