diff --git a/config/common.mk b/config/common.mk index 020f41e2..6fe0cf89 100644 --- a/config/common.mk +++ b/config/common.mk @@ -43,6 +43,11 @@ PRODUCT_COPY_FILES += \ # Filesystem TARGET_FS_CONFIG_GEN += vendor/pa/config/config.fs +# Fonts +PRODUCT_COPY_FILES += \ + $(call find-copy-subdir-files,*,vendor/pa/prebuilt/fonts/,$(TARGET_COPY_OUT_PRODUCT)/fonts) \ + vendor/pa/prebuilt/etc/fonts_customization.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml + # GMS ifneq ($(TARGET_DISABLES_GMS), true) diff --git a/overlay/Fonts/FontInterOverlay/Android.bp b/overlay/Fonts/FontInterOverlay/Android.bp new file mode 100644 index 00000000..ca08af0c --- /dev/null +++ b/overlay/Fonts/FontInterOverlay/Android.bp @@ -0,0 +1,20 @@ +// Copyright (C) 2021 Paranoid Android +// +// 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. + +runtime_resource_overlay { + name: "FontInterOverlay", + product_specific: true, + sdk_version: "current", + theme: "FontInter", +} diff --git a/overlay/Fonts/FontInterOverlay/AndroidManifest.xml b/overlay/Fonts/FontInterOverlay/AndroidManifest.xml new file mode 100644 index 00000000..8640229c --- /dev/null +++ b/overlay/Fonts/FontInterOverlay/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/overlay/Fonts/FontInterOverlay/res/values/config.xml b/overlay/Fonts/FontInterOverlay/res/values/config.xml new file mode 100644 index 00000000..5ff6c6f4 --- /dev/null +++ b/overlay/Fonts/FontInterOverlay/res/values/config.xml @@ -0,0 +1,31 @@ + + + + + + inter + + + inter-medium + + + inter + + + inter-medium + + diff --git a/overlay/Fonts/FontInterOverlay/res/values/strings.xml b/overlay/Fonts/FontInterOverlay/res/values/strings.xml new file mode 100644 index 00000000..165716a5 --- /dev/null +++ b/overlay/Fonts/FontInterOverlay/res/values/strings.xml @@ -0,0 +1,22 @@ + + + + + + Inter + + diff --git a/overlay/Fonts/FontManropeOverlay/Android.bp b/overlay/Fonts/FontManropeOverlay/Android.bp new file mode 100644 index 00000000..9ea4b8a8 --- /dev/null +++ b/overlay/Fonts/FontManropeOverlay/Android.bp @@ -0,0 +1,20 @@ +// Copyright (C) 2021 Paranoid Android +// +// 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. + +runtime_resource_overlay { + name: "FontManropeOverlay", + product_specific: true, + sdk_version: "current", + theme: "FontManrope", +} diff --git a/overlay/Fonts/FontManropeOverlay/AndroidManifest.xml b/overlay/Fonts/FontManropeOverlay/AndroidManifest.xml new file mode 100644 index 00000000..69e1eaf4 --- /dev/null +++ b/overlay/Fonts/FontManropeOverlay/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/overlay/Fonts/FontManropeOverlay/res/values/config.xml b/overlay/Fonts/FontManropeOverlay/res/values/config.xml new file mode 100644 index 00000000..ffdd12ec --- /dev/null +++ b/overlay/Fonts/FontManropeOverlay/res/values/config.xml @@ -0,0 +1,31 @@ + + + + + + manrope + + + manrope-medium + + + manrope + + + manrope-medium + + diff --git a/overlay/Fonts/FontManropeOverlay/res/values/strings.xml b/overlay/Fonts/FontManropeOverlay/res/values/strings.xml new file mode 100644 index 00000000..bb7764c7 --- /dev/null +++ b/overlay/Fonts/FontManropeOverlay/res/values/strings.xml @@ -0,0 +1,22 @@ + + + + + + Manrope + + diff --git a/overlay/Fonts/FontUrbanistOverlay/Android.bp b/overlay/Fonts/FontUrbanistOverlay/Android.bp new file mode 100644 index 00000000..df376040 --- /dev/null +++ b/overlay/Fonts/FontUrbanistOverlay/Android.bp @@ -0,0 +1,20 @@ +// Copyright (C) 2021 Paranoid Android +// +// 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. + +runtime_resource_overlay { + name: "FontUrbanistOverlay", + product_specific: true, + sdk_version: "current", + theme: "FontUrbanist", +} diff --git a/overlay/Fonts/FontUrbanistOverlay/AndroidManifest.xml b/overlay/Fonts/FontUrbanistOverlay/AndroidManifest.xml new file mode 100644 index 00000000..136491fb --- /dev/null +++ b/overlay/Fonts/FontUrbanistOverlay/AndroidManifest.xml @@ -0,0 +1,30 @@ + + + + + + + + + + diff --git a/overlay/Fonts/FontUrbanistOverlay/res/values/config.xml b/overlay/Fonts/FontUrbanistOverlay/res/values/config.xml new file mode 100644 index 00000000..0d2e4bc0 --- /dev/null +++ b/overlay/Fonts/FontUrbanistOverlay/res/values/config.xml @@ -0,0 +1,31 @@ + + + + + + urbanist + + + urbanist-medium + + + urbanist + + + urbanist-medium + + diff --git a/overlay/Fonts/FontUrbanistOverlay/res/values/strings.xml b/overlay/Fonts/FontUrbanistOverlay/res/values/strings.xml new file mode 100644 index 00000000..8110aa86 --- /dev/null +++ b/overlay/Fonts/FontUrbanistOverlay/res/values/strings.xml @@ -0,0 +1,22 @@ + + + + + + Urbanist + + diff --git a/overlay/overlays.mk b/overlay/overlays.mk index 749a5321..5a336878 100644 --- a/overlay/overlays.mk +++ b/overlay/overlays.mk @@ -36,6 +36,9 @@ PRODUCT_PACKAGES += \ AOSPATelephonyOverlay \ AOSPAThemePickerOverlay \ FontGoogleSansOverlay \ + FontInterOverlay \ + FontManropeOverlay \ + FontUrbanistOverlay \ ParanoidDozeOverlay \ ParanoidHubOverlay \ ParanoidLauncherOverlay diff --git a/prebuilt/etc/fonts_customization.xml b/prebuilt/etc/fonts_customization.xml new file mode 100644 index 00000000..1ca3f9d5 --- /dev/null +++ b/prebuilt/etc/fonts_customization.xml @@ -0,0 +1,150 @@ + + + GoogleSans-Regular.ttf + GoogleSans-Italic.ttf + GoogleSans-Medium.ttf + GoogleSans-MediumItalic.ttf + GoogleSans-Bold.ttf + GoogleSans-BoldItalic.ttf + + + + + ArbutusSlab-Regular.ttf + + + + Lato-Regular.ttf + Lato-Italic.ttf + Lato-Bold.ttf + Lato-BoldItalic.ttf + + + + + Rubik-Regular.ttf + Rubik-Italic.ttf + Rubik-Medium.ttf + Rubik-MediumItalic.ttf + Rubik-Bold.ttf + Rubik-BoldItalic.ttf + + + + + ZillaSlab-Medium.ttf + ZillaSlab-MediumItalic.ttf + ZillaSlab-SemiBold.ttf + ZillaSlab-SemiBoldItalic.ttf + + + + --> + Lustria-Regular.ttf + + + + + Karla-Regular.ttf + + + + + Fraunces-Regular.ttf + Fraunces-SemiBold.ttf + + + + + + BigShouldersText-Bold.ttf + BigShouldersText-ExtraBold.ttf + + + + + + Barlow-Bold.ttf + Barlow-Medium.ttf + + + + + + Manrope-VF.ttf + + + Manrope-VF.ttf + + + Manrope-VF.ttf + + + Manrope-VF.ttf + + + + + + + Urbanist-VF.ttf + + + Urbanist-VF.ttf + + + Urbanist-VF.ttf + + + Urbanist-VF.ttf + + + + + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + Inter-VF.ttf + + + + + diff --git a/prebuilt/fonts/Inter-VF.ttf b/prebuilt/fonts/Inter-VF.ttf new file mode 100644 index 00000000..1cb674b7 Binary files /dev/null and b/prebuilt/fonts/Inter-VF.ttf differ diff --git a/prebuilt/fonts/Manrope-VF.ttf b/prebuilt/fonts/Manrope-VF.ttf new file mode 100644 index 00000000..3610d721 Binary files /dev/null and b/prebuilt/fonts/Manrope-VF.ttf differ diff --git a/prebuilt/fonts/Urbanist-VF.ttf b/prebuilt/fonts/Urbanist-VF.ttf new file mode 100644 index 00000000..cb76a442 Binary files /dev/null and b/prebuilt/fonts/Urbanist-VF.ttf differ