From b3fa089d1ba58562c6edca157b8b42266df13285 Mon Sep 17 00:00:00 2001 From: ws Date: Thu, 24 Mar 2022 20:40:45 +0800 Subject: [PATCH] fixed a52632e from https://gitee.com/ws987/resources/pulls/49 wangsen69@huawei.com Signed-off-by: ws --- LICENSE | 179 +++++++++++++++++++++++++++++++++++ LICENSE.txt => LICENSE_Fonts | 0 OAT.xml | 4 +- README.md | 25 +++-- README_zh.md | 23 +++-- 5 files changed, 204 insertions(+), 27 deletions(-) create mode 100644 LICENSE rename LICENSE.txt => LICENSE_Fonts (100%) diff --git a/LICENSE b/LICENSE new file mode 100644 index 00000000..7f96b250 --- /dev/null +++ b/LICENSE @@ -0,0 +1,179 @@ +System resource package is licensed under Apache License Version 2.0. +-------------------------------------------------------------------------------- + + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS \ No newline at end of file diff --git a/LICENSE.txt b/LICENSE_Fonts similarity index 100% rename from LICENSE.txt rename to LICENSE_Fonts diff --git a/OAT.xml b/OAT.xml index 0be3a256..3c096666 100644 --- a/OAT.xml +++ b/OAT.xml @@ -50,10 +50,10 @@ - + - LICENSE.txt + LICENSE_Fonts diff --git a/README.md b/README.md index 7bd234d5..734b9cb1 100644 --- a/README.md +++ b/README.md @@ -1,18 +1,12 @@ -# Resources +# Resources -- [Introduction](#section11660541593) - - [System Fonts](#section84541659154715) +## Introduction -- [Directory Structure](#section161941989596) -- [Repositories Involved](#section1371113476307) +The Resources module defines global resources at the system level. -## Introduction +### System Fonts -The resources module defines global resources at the system level. - -### System Fonts - -By default, the resources module provides only one font family, namely, HarmonyOS Sans. +By default, the Resources module provides only one font family, namely, HarmonyOS Sans. HarmonyOS Sans is a family of variable fonts developed by Huawei for all-scenario experience. It is available for commercial use for free. For details, see the license agreement. @@ -20,14 +14,19 @@ The font family currently provides six font weights: Thin, Light, Regular, Mediu It supports a total of 105 languages from the Chinese, Latin, Cyril, Greek, and Arabic language systems at present. More languages will be supported in the future. -## Directory Structure +### System Resource Package + +The system resource package accommodates resources that are widely used by applications, such as the layered parameters, permission names and descriptions, etc. In addition, permission definitions are provided in the **config.json** file. + +## Directory Structure ``` /utils/resources ├── fonts # System fonts +├── systemres # System resource package ``` -## Repositories Involved +## Repositories Involved [Globalization subsystem](https://gitee.com/openharmony/docs/blob/master/en/readme/globalization.md) diff --git a/README_zh.md b/README_zh.md index 956a4312..0aac92d1 100644 --- a/README_zh.md +++ b/README_zh.md @@ -1,16 +1,10 @@ -# 系统资源组件 +# 系统资源组件 -- [简介](#section11660541593) - - [系统字体](#section84541659154715) +## 简介 -- [目录](#section161941989596) -- [相关仓](#section1371113476307) +系统资源组件定义了系统层级的全局资源。 -## 简介 - -系统资源组件定义了系统层级的全局资源，已支持的资源如下： - -### 系统字体 +### 系统字体 默认提供一套字体：HarmonyOS Sans。 @@ -20,14 +14,19 @@ HarmonyOS Sans目前开放6个字重，Thin、Light、Regular、Medium、Bold、 目前，HarmonyOS Sans支持中文、拉丁文、西里尔文、希腊文、阿拉伯语系下的105种语言，后续还将支持更多的语言。 -## 目录 +### 系统资源包 + +提供了各应用广泛使用的资源（如：分层参数、权限名称和描述等），同时，config.json中提供了权限的定义。 + +## 目录 ``` /utils/resources ├── fonts # 系统字体目录 +├── systemres # 系统资源包目录 ``` -## 相关仓 +## 相关仓 [全球化子系统](https://gitee.com/openharmony/docs/blob/master/zh-cn/readme/%E5%85%A8%E7%90%83%E5%8C%96%E5%AD%90%E7%B3%BB%E7%BB%9F.md) -- Gitee