halcyonproject · wulan17 · Apr 8, 2025 · Apr 8, 2025
diff --git a/config.mk b/config.mk
@@ -33,11 +33,13 @@ PRODUCT_PACKAGES += \
     FontArbutus \
     FontArvoLato \
     FontGoogleSans \
+    FontInter \
     FontKai \
     FontManrope \
     FontNotoSerifSource \
     FontOnePlusSans \
     FontPlusJakartaSans \
+    FontRosemary \
     FontRubik \
     FontVictor
 

diff --git a/etc/fonts_customization.xml b/etc/fonts_customization.xml
@@ -92,5 +92,34 @@
     <alias name="plus-jakarta-sans-medium" to="plus-jakarta-sans" weight="500" />
     <alias name="plus-jakarta-sans-bold" to="plus-jakarta-sans" weight="700" />
     <alias name="plus-jakarta-sans-black" to="plus-jakarta-sans" weight="900" />
-
+
+    <!-- Inter -->
+    <family customizationType="new-named-family" name="inter">
+       <font weight="100" style="normal">Inter-ExtraLight.ttf</font>
+       <font weight="100" style="italic">Inter-ExtraLightItalic.ttf</font>
+       <font weight="300" style="normal">Inter-Light.ttf</font>
+       <font weight="300" style="italic">Inter-LightItalic.ttf</font>
+       <font weight="400" style="normal">Inter-Regular.ttf</font>
+       <font weight="400" style="italic">Inter-Italic.ttf</font>
+       <font weight="500" style="normal">Inter-Medium.ttf</font>
+       <font weight="500" style="italic">Inter-MediumItalic.ttf</font>
+       <font weight="700" style="normal">Inter-Bold.ttf</font>
+       <font weight="700" style="italic">Inter-BoldItalic.ttf</font>
+       <font weight="900" style="normal">Inter-ExtraBold.ttf</font>
+       <font weight="900" style="italic">Inter-ExtraBoldItalic.ttf</font>
+    </family>
+    <alias name="inter-thin" to="inter" weight="100" />
+    <alias name="inter-light" to="inter" weight="300" />
+    <alias name="inter-regular" to="inter" weight="400" />
+    <alias name="inter-medium" to="inter" weight="500" />
+    <alias name="inter-bold" to="inter" weight="700" />
+    <alias name="inter-black" to="inter" weight="900" />
+
+    <!-- Rosemary -->
+    <family customizationType="new-named-family" name="rosemary">
+        <font weight="300" style="normal">Rosemary-Regular.ttf</font>
+    </family>
+    <alias name="rosemary-semi-bold" to="rosemary" weight="600" />
+    <alias name="rosemary-bold" to="rosemary" weight="700" />
+
 </fonts-modification>
diff --git a/fonts/Inter-Bold.ttf b/fonts/Inter-Bold.ttf
diff --git a/fonts/Inter-BoldItalic.ttf b/fonts/Inter-BoldItalic.ttf
diff --git a/fonts/Inter-ExtraBold.ttf b/fonts/Inter-ExtraBold.ttf
diff --git a/fonts/Inter-ExtraBoldItalic.ttf b/fonts/Inter-ExtraBoldItalic.ttf
diff --git a/fonts/Inter-ExtraLight.ttf b/fonts/Inter-ExtraLight.ttf
diff --git a/fonts/Inter-ExtraLightItalic.ttf b/fonts/Inter-ExtraLightItalic.ttf
diff --git a/fonts/Inter-Italic.ttf b/fonts/Inter-Italic.ttf
diff --git a/fonts/Inter-Light.ttf b/fonts/Inter-Light.ttf
diff --git a/fonts/Inter-LightItalic.ttf b/fonts/Inter-LightItalic.ttf
diff --git a/fonts/Inter-Medium.ttf b/fonts/Inter-Medium.ttf
diff --git a/fonts/Inter-MediumItalic.ttf b/fonts/Inter-MediumItalic.ttf
diff --git a/fonts/Inter-Regular.ttf b/fonts/Inter-Regular.ttf
diff --git a/fonts/Rosemary-Regular.ttf b/fonts/Rosemary-Regular.ttf
diff --git a/packages/fonts/FontInter/Android.mk b/packages/fonts/FontInter/Android.mk
@@ -0,0 +1,29 @@
+#
+#  Copyright 2019, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_RRO_THEME := FontInter
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := FontInter
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/packages/fonts/FontInter/AndroidManifest.xml b/packages/fonts/FontInter/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<!--
+/**
+ * Copyright (c) 2023 Halcyon Project
+ *           (c) 2019-2023 The conquerOS Projecct
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.theme.font.inter"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android"
+        android:category="android.theme.customization.font"
+        android:priority="1"/>
+
+    <application android:label="@string/font_inter_overlay" android:hasCode="false">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="inter,inter-regular,inter-medium" />
+    </application>
+</manifest>
diff --git a/packages/fonts/FontInter/res/values/config.xml b/packages/fonts/FontInter/res/values/config.xml
@@ -0,0 +1,34 @@
+<!--
+/**
+ * Copyright (c) 2023 Halcyon Project
+ *           (c) 2019-2023 The conquerOS Projecct
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">inter-regular</string>
+
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">inter-medium</string>
+
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">inter-regular</string>
+
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">inter-medium</string>
+
+</resources>
+
diff --git a/packages/fonts/FontInter/res/values/strings.xml b/packages/fonts/FontInter/res/values/strings.xml
@@ -0,0 +1,24 @@
+<!--
+/**
+ * Copyright (c) 2023 Halcyon Project
+ *           (c) 2019-2023 The conquerOS Projecct
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Overlay name -->
+    <string name="font_inter_overlay" translatable="false">Inter</string>
+
+</resources>
diff --git a/packages/fonts/FontRosemary/Android.mk b/packages/fonts/FontRosemary/Android.mk
@@ -0,0 +1,29 @@
+#
+#  Copyright 2019, The Android Open Source Project
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+
+LOCAL_PATH:= $(call my-dir)
+include $(CLEAR_VARS)
+
+LOCAL_RRO_THEME := FontRosemary
+
+LOCAL_PRODUCT_MODULE := true
+
+LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
+
+LOCAL_PACKAGE_NAME := FontRosemary
+LOCAL_SDK_VERSION := current
+
+include $(BUILD_RRO_PACKAGE)
diff --git a/packages/fonts/FontRosemary/AndroidManifest.xml b/packages/fonts/FontRosemary/AndroidManifest.xml
@@ -0,0 +1,32 @@
+<!--
+/**
+ * Copyright (c) 2023 Halcyon Project
+ *           (c) 2019-2023 The conquerOS Projecct
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.android.theme.font.rosemary"
+    android:versionCode="1"
+    android:versionName="1.0">
+    <overlay android:targetPackage="android"
+        android:category="android.theme.customization.font"
+        android:priority="1"/>
+
+    <application android:label="@string/font_rosemary_overlay" android:hasCode="false">
+        <meta-data
+            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"
+            android:value="rosemary,rosemary-semi-bold,rosemary-bold" />
+    </application>
+</manifest>
diff --git a/packages/fonts/FontRosemary/res/values/config.xml b/packages/fonts/FontRosemary/res/values/config.xml
@@ -0,0 +1,33 @@
+<!--
+/**
+ * Copyright (c) 2023 Halcyon Project
+ *           (c) 2019-2023 The conquerOS Projecct
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Name of a font family to use for body text. -->
+    <string name="config_bodyFontFamily" translatable="false">rosemary</string>
+
+    <!-- Name of a font family to use for medium body text. -->
+    <string name="config_bodyFontFamilyMedium" translatable="false">rosemary-medium</string>
+
+    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->
+    <string name="config_headlineFontFamily" translatable="false">rosemary-regular</string>
+
+    <!-- Name of the font family used for system surfaces where the font should use medium weight -->
+    <string name="config_headlineFontFamilyMedium" translatable="false">rosemary-medium</string>
+
+</resources>
diff --git a/packages/fonts/FontRosemary/res/values/strings.xml b/packages/fonts/FontRosemary/res/values/strings.xml
@@ -0,0 +1,24 @@
+<!--
+/**
+ * Copyright (c) 2023 Halcyon Project
+ *           (c) 2019-2023 The conquerOS Projecct
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *     http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+-->
+<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
+
+    <!-- Overlay name -->
+    <string name="font_rosemary_overlay" translatable="false">Rosemary</string>
+
+</resources>