diff --git a/config.mk b/config.mk index b9a47bb1..4b480117 100644 --- 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 index eb27be76..16d6b89a 100644 --- a/etc/fonts_customization.xml +++ b/etc/fonts_customization.xml @@ -92,5 +92,34 @@ - + + + + Inter-ExtraLight.ttf + Inter-ExtraLightItalic.ttf + Inter-Light.ttf + Inter-LightItalic.ttf + Inter-Regular.ttf + Inter-Italic.ttf + Inter-Medium.ttf + Inter-MediumItalic.ttf + Inter-Bold.ttf + Inter-BoldItalic.ttf + Inter-ExtraBold.ttf + Inter-ExtraBoldItalic.ttf + + + + + + + + + + + Rosemary-Regular.ttf + + + + diff --git a/fonts/Inter-Bold.ttf b/fonts/Inter-Bold.ttf new file mode 100644 index 00000000..cd13f60c Binary files /dev/null and b/fonts/Inter-Bold.ttf differ diff --git a/fonts/Inter-BoldItalic.ttf b/fonts/Inter-BoldItalic.ttf new file mode 100644 index 00000000..0d19c1aa Binary files /dev/null and b/fonts/Inter-BoldItalic.ttf differ diff --git a/fonts/Inter-ExtraBold.ttf b/fonts/Inter-ExtraBold.ttf new file mode 100644 index 00000000..e71c601c Binary files /dev/null and b/fonts/Inter-ExtraBold.ttf differ diff --git a/fonts/Inter-ExtraBoldItalic.ttf b/fonts/Inter-ExtraBoldItalic.ttf new file mode 100644 index 00000000..df450629 Binary files /dev/null and b/fonts/Inter-ExtraBoldItalic.ttf differ diff --git a/fonts/Inter-ExtraLight.ttf b/fonts/Inter-ExtraLight.ttf new file mode 100644 index 00000000..f9c6cfc5 Binary files /dev/null and b/fonts/Inter-ExtraLight.ttf differ diff --git a/fonts/Inter-ExtraLightItalic.ttf b/fonts/Inter-ExtraLightItalic.ttf new file mode 100644 index 00000000..275f305e Binary files /dev/null and b/fonts/Inter-ExtraLightItalic.ttf differ diff --git a/fonts/Inter-Italic.ttf b/fonts/Inter-Italic.ttf new file mode 100644 index 00000000..14d3595b Binary files /dev/null and b/fonts/Inter-Italic.ttf differ diff --git a/fonts/Inter-Light.ttf b/fonts/Inter-Light.ttf new file mode 100644 index 00000000..acae3612 Binary files /dev/null and b/fonts/Inter-Light.ttf differ diff --git a/fonts/Inter-LightItalic.ttf b/fonts/Inter-LightItalic.ttf new file mode 100644 index 00000000..f69e18b0 Binary files /dev/null and b/fonts/Inter-LightItalic.ttf differ diff --git a/fonts/Inter-Medium.ttf b/fonts/Inter-Medium.ttf new file mode 100644 index 00000000..71d90172 Binary files /dev/null and b/fonts/Inter-Medium.ttf differ diff --git a/fonts/Inter-MediumItalic.ttf b/fonts/Inter-MediumItalic.ttf new file mode 100644 index 00000000..5c8c8b14 Binary files /dev/null and b/fonts/Inter-MediumItalic.ttf differ diff --git a/fonts/Inter-Regular.ttf b/fonts/Inter-Regular.ttf new file mode 100644 index 00000000..ce097c82 Binary files /dev/null and b/fonts/Inter-Regular.ttf differ diff --git a/fonts/Rosemary-Regular.ttf b/fonts/Rosemary-Regular.ttf new file mode 100644 index 00000000..4a5b911c Binary files /dev/null and b/fonts/Rosemary-Regular.ttf differ diff --git a/packages/fonts/FontInter/Android.mk b/packages/fonts/FontInter/Android.mk new file mode 100644 index 00000000..be379178 --- /dev/null +++ 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 new file mode 100644 index 00000000..899979be --- /dev/null +++ b/packages/fonts/FontInter/AndroidManifest.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/packages/fonts/FontInter/res/values/config.xml b/packages/fonts/FontInter/res/values/config.xml new file mode 100644 index 00000000..910a22c0 --- /dev/null +++ b/packages/fonts/FontInter/res/values/config.xml @@ -0,0 +1,34 @@ + + + + + inter-regular + + + inter-medium + + + inter-regular + + + inter-medium + + + diff --git a/packages/fonts/FontInter/res/values/strings.xml b/packages/fonts/FontInter/res/values/strings.xml new file mode 100644 index 00000000..46b1ba96 --- /dev/null +++ b/packages/fonts/FontInter/res/values/strings.xml @@ -0,0 +1,24 @@ + + + + + Inter + + diff --git a/packages/fonts/FontRosemary/Android.mk b/packages/fonts/FontRosemary/Android.mk new file mode 100644 index 00000000..73f757b2 --- /dev/null +++ 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 new file mode 100644 index 00000000..1145b2b3 --- /dev/null +++ b/packages/fonts/FontRosemary/AndroidManifest.xml @@ -0,0 +1,32 @@ + + + + + + + + diff --git a/packages/fonts/FontRosemary/res/values/config.xml b/packages/fonts/FontRosemary/res/values/config.xml new file mode 100644 index 00000000..e8aa3a25 --- /dev/null +++ b/packages/fonts/FontRosemary/res/values/config.xml @@ -0,0 +1,33 @@ + + + + + rosemary + + + rosemary-medium + + + rosemary-regular + + + rosemary-medium + + diff --git a/packages/fonts/FontRosemary/res/values/strings.xml b/packages/fonts/FontRosemary/res/values/strings.xml new file mode 100644 index 00000000..7c94cc6b --- /dev/null +++ b/packages/fonts/FontRosemary/res/values/strings.xml @@ -0,0 +1,24 @@ + + + + + Rosemary + +