Signed-off-by: Nluziyao <luziyao@chinasoftinc.com>

Merge pull request !747 from 刘永畅/master

2. Modify Flush() in BashGfxEngine.
Signed-off-by: Nliuyongchang <liuyongchang1@huawei.com>

Merge pull request !731 from xueni/unused

Merge pull request !752 from Lizhiqi/fulltyp

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

Merge pull request !745 from lijingli/void

Merge pull request !748 from Zhouyj/master

!749 Description:If the height of the child node is less than the height of the parent node, the progress bar is not drawn
Merge pull request !749 from 施其昌/master

Description:If the height of the child node is less than the height of the parent node, the progress bar is not drawn
issuesno:https://gitee.com/openharmony/graphic_ui/issues/I5Q30I
Feature or Bugfix: Feature
Binary Source:No
Signed-off-by: Nshiqichang <shiqichang@huawei.com>
Change-Id: I8cd2a968f8ebece6b9ed41d4b1f96c47adaf5859

Change-Id: I161b0ed52666bb9c2a57dcf24e2512b817504d6f

IssueNo: https://gitee.com/openharmony/graphic_ui/issues/I5Q0XL?from=project-issue
Feature or Bugfix: Bugfix
Binary Source:No
OBOBOBSigned-off-by: Nzhouyj <zhouyuanjie1@huawei.com>

Signed-off-by: Nliuyongchang <liuyongchang1@huawei.com>

Merge pull request !744 from suwenxiang/master

Merge pull request !735 from 施其昌/master

Signed-off-by: Nyaozhengyu <yaozhengyu@west365.cn>

IssueNo: https://gitee.com/openharmony/graphic_utils/issues/I5PPWC
Feature or Bugfix: Feature
Binary Source: No
Signed-off-by: Nsuwenxiang <suwenxiang@huawei.com>

Merge pull request !743 from openharmony_ci/revert-merge-710-master

Merge pull request !736 from suwenxiang/master

Merge pull request !710 from Lizhiqi/fulltyp

Merge pull request !740 from 罗博明/master

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

Merge pull request !741 from 郝烁/master

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

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

Merge pull request !739 from openharmony_ci/revert-merge-738-master

Merge pull request !738 from 罗博明/master

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

IssueNo: https://gitee.com/openharmony/third_party_harfbuzz/issues/I5O5UT
Feature or Bugfix: Feature
Binary Source: No
Signed-off-by: Nsuwenxiang <suwenxiang@huawei.com>

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

Change-Id: I70c4f7a1cf540187b94380182769be2701e31bbc

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

Signed-off-by: Nwangxueni <wangxueni@west365.cn>