Skip to content

Commit 5e412f7

Browse files
kdrag0nersascape
kdrag0n
authored and
ersascape
committed
styx: fonts: Import from ProtonAOSP.
Signed-off-by: Gagan Malvi <[email protected]>
1 parent 76e4658 commit 5e412f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

65 files changed

+1978
-0
lines changed

‎config/common.mk

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,9 @@ $(call inherit-product, vendor/styx/config/versioning.mk)
2222
# Inherit from our kernel/header generator
2323
$(call inherit-product, vendor/styx/config/BoardConfigStyx.mk)
2424

25+
# Inherit from fonts
26+
$(call inherit-product, vendor/styx/fonts/fonts.mk)
27+
2528
# Inherit prebuilt packages
2629
$(call inherit-product, vendor/styx/prebuilts/targets.mk)
2730

‎fonts/fira-code/Android.bp

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
/**
2+
* Copyright (C) 2021 The Proton AOSP Project
3+
*
4+
* Licensed under the Apache License, Version 2.0 (the "License");
5+
* you may not use this file except in compliance with the License.
6+
* You may obtain a copy of the License at
7+
*
8+
* http://www.apache.org/licenses/LICENSE-2.0
9+
*
10+
* Unless required by applicable law or agreed to in writing, software
11+
* distributed under the License is distributed on an "AS IS" BASIS,
12+
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
13+
* See the License for the specific language governing permissions and
14+
* limitations under the License.
15+
*/
16+
17+
prebuilt_font {
18+
name: "CutiveMono.ttf",
19+
src: "FiraCode-Regular_CutiveMono.ttf",
20+
}
21+
22+
prebuilt_font {
23+
name: "DroidSansMono.ttf",
24+
src: "FiraCode-Regular_DroidSansMono.ttf",
25+
}

‎fonts/fira-code/FiraCode-Regular_CutiveMono.ttf

283 KB
Binary file not shown.

‎fonts/fira-code/FiraCode-Regular_DroidSansMono.ttf

283 KB
Binary file not shown.

‎fonts/fira-code/NOTICE

Lines changed: 93 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,93 @@
1+
Copyright (c) 2014, The Fira Code Project Authors (https://github.com/tonsky/FiraCode)
2+
3+
This Font Software is licensed under the SIL Open Font License, Version 1.1.
4+
This license is copied below, and is also available with a FAQ at:
5+
http://scripts.sil.org/OFL
6+
7+
8+
-----------------------------------------------------------
9+
SIL OPEN FONT LICENSE Version 1.1 - 26 February 2007
10+
-----------------------------------------------------------
11+
12+
PREAMBLE
13+
The goals of the Open Font License (OFL) are to stimulate worldwide
14+
development of collaborative font projects, to support the font creation
15+
efforts of academic and linguistic communities, and to provide a free and
16+
open framework in which fonts may be shared and improved in partnership
17+
with others.
18+
19+
The OFL allows the licensed fonts to be used, studied, modified and
20+
redistributed freely as long as they are not sold by themselves. The
21+
fonts, including any derivative works, can be bundled, embedded,
22+
redistributed and/or sold with any software provided that any reserved
23+
names are not used by derivative works. The fonts and derivatives,
24+
however, cannot be released under any other type of license. The
25+
requirement for fonts to remain under this license does not apply
26+
to any document created using the fonts or their derivatives.
27+
28+
DEFINITIONS
29+
"Font Software" refers to the set of files released by the Copyright
30+
Holder(s) under this license and clearly marked as such. This may
31+
include source files, build scripts and documentation.
32+
33+
"Reserved Font Name" refers to any names specified as such after the
34+
copyright statement(s).
35+
36+
"Original Version" refers to the collection of Font Software components as
37+
distributed by the Copyright Holder(s).
38+
39+
"Modified Version" refers to any derivative made by adding to, deleting,
40+
or substituting -- in part or in whole -- any of the components of the
41+
Original Version, by changing formats or by porting the Font Software to a
42+
new environment.
43+
44+
"Author" refers to any designer, engineer, programmer, technical
45+
writer or other person who contributed to the Font Software.
46+
47+
PERMISSION & CONDITIONS
48+
Permission is hereby granted, free of charge, to any person obtaining
49+
a copy of the Font Software, to use, study, copy, merge, embed, modify,
50+
redistribute, and sell modified and unmodified copies of the Font
51+
Software, subject to the following conditions:
52+
53+
1) Neither the Font Software nor any of its individual components,
54+
in Original or Modified Versions, may be sold by itself.
55+
56+
2) Original or Modified Versions of the Font Software may be bundled,
57+
redistributed and/or sold with any software, provided that each copy
58+
contains the above copyright notice and this license. These can be
59+
included either as stand-alone text files, human-readable headers or
60+
in the appropriate machine-readable metadata fields within text or
61+
binary files as long as those fields can be easily viewed by the user.
62+
63+
3) No Modified Version of the Font Software may use the Reserved Font
64+
Name(s) unless explicit written permission is granted by the corresponding
65+
Copyright Holder. This restriction only applies to the primary font name as
66+
presented to the users.
67+
68+
4) The name(s) of the Copyright Holder(s) or the Author(s) of the Font
69+
Software shall not be used to promote, endorse or advertise any
70+
Modified Version, except to acknowledge the contribution(s) of the
71+
Copyright Holder(s) and the Author(s) or with their explicit written
72+
permission.
73+
74+
5) The Font Software, modified or unmodified, in part or in whole,
75+
must be distributed entirely under this license, and must not be
76+
distributed under any other license. The requirement for fonts to
77+
remain under this license does not apply to any document created
78+
using the Font Software.
79+
80+
TERMINATION
81+
This license becomes null and void if any of the above conditions are
82+
not met.
83+
84+
DISCLAIMER
85+
THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
86+
EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF
87+
MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT
88+
OF COPYRIGHT, PATENT, TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL THE
89+
COPYRIGHT HOLDER BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
90+
INCLUDING ANY GENERAL, SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL
91+
DAMAGES, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
92+
FROM, OUT OF THE USE OR INABILITY TO USE THE FONT SOFTWARE OR FROM
93+
OTHER DEALINGS IN THE FONT SOFTWARE.

‎fonts/font_files.mk

Lines changed: 42 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,42 @@
1+
# Copyright (C) 2021 The Proton AOSP Project
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
LOCAL_PATH := vendor/styx/fonts
16+
17+
# We have to use PRODUCT_PACKAGES (together with BUILD_PREBUILT) instead of
18+
# PRODUCT_COPY_FILES to install the font files, so that the NOTICE file can
19+
# get installed too.
20+
21+
PRODUCT_PACKAGES += \
22+
CutiveMono.ttf \
23+
DroidSansMono.ttf \
24+
Roboto-Regular.ttf \
25+
Manrope-VF.ttf \
26+
NotoSans-Italic-VF.ttf \
27+
NotoSans-VF.ttf \
28+
Recursive-VF.ttf \
29+
RobotoFallback-VF.ttf \
30+
RobotoSystem-VF.ttf \
31+
RobotoStatic-Regular.ttf \
32+
SourceSans3-Italic-VF.otf \
33+
SourceSans3-VF.otf \
34+
NotoSerif-BoldItalic.ttf \
35+
NotoSerif-Bold.ttf \
36+
NotoSerif-Italic.ttf \
37+
NotoSerif-Regular.ttf \
38+
39+
# Register new fonts
40+
PRODUCT_COPY_FILES += \
41+
$(LOCAL_PATH)/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml \
42+

‎fonts/fonts.mk

Lines changed: 34 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,34 @@
1+
# Copyright (C) 2021 The Proton AOSP Project
2+
#
3+
# Licensed under the Apache License, Version 2.0 (the "License");
4+
# you may not use this file except in compliance with the License.
5+
# You may obtain a copy of the License at
6+
#
7+
# http://www.apache.org/licenses/LICENSE-2.0
8+
#
9+
# Unless required by applicable law or agreed to in writing, software
10+
# distributed under the License is distributed on an "AS IS" BASIS,
11+
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
12+
# See the License for the specific language governing permissions and
13+
# limitations under the License.
14+
15+
LOCAL_PATH := vendor/styx/fonts
16+
17+
# Copy font files
18+
include vendor/styx/fonts/font_files.mk
19+
20+
# Register custom fonts
21+
PRODUCT_COPY_FILES += \
22+
$(LOCAL_PATH)/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml \
23+
24+
# Overlays for UI font styles
25+
PRODUCT_PACKAGES += \
26+
FontHKGroteskOverlay \
27+
FontManropeOverlay \
28+
FontNotoSansOverlay \
29+
FontRecursiveCasualOverlay \
30+
FontRecursiveLinearOverlay \
31+
FontRobotoOverlay \
32+
FontSourceSansOverlay \
33+
FontSourceSerifOverlay \
34+
FontHarmonyOSSansOverlay \

0 commit comments

Comments
 (0)