third_party
/
proprietary_vendor_google_pixel
mirror of https://gitlab.com/oddsolutions/android/proprietary_vendor_google_pixel
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

google_pixel: Properly implement Google Fonts

Browse Source 
Change-Id: Iac7512b012dd30757b898dc5c97ac63af978cdfa
lineage-19.1
Nolen Johnson 3 years ago
parent 66458ce7ad
commit af070556f3
9 changed files with 41 additions and 246 deletions
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Show Stats Download Patch File Download Diff File
  1. 2
      google-fonts/Android.mk
  2. 31
      google-fonts/FontGoogleSansOverlay/Android.mk
  3. 12
      google-fonts/fonts_customization.xml
  4. 212
      google-fonts/google-fonts.xml
  5. 25
      overlays/FontGoogleSansOverlay/Android.bp
  6. 1
      overlays/FontGoogleSansOverlay/AndroidManifest.xml
  7. 0
      overlays/FontGoogleSansOverlay/res/values/config.xml
  8. 0
      overlays/FontGoogleSansOverlay/res/values/strings.xml
  9. 4
      product.mk

2
google-fonts/Android.mk
Unescape View File

@ -1,4 +1,4 @@
LOCAL_PATH:= $(call my-dir) LOCAL_PATH := $(call my-dir)
GOOGLE_FONTS := \ GOOGLE_FONTS := \
GoogleSans-Bold.ttf \ GoogleSans-Bold.ttf \

31
google-fonts/FontGoogleSansOverlay/Android.mk
Unescape View File

@ -1,31 +0,0 @@
#
# 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 := FontGoogleSans
LOCAL_PRODUCT_MODULE := true
LOCAL_SRC_FILES := $(call all-subdir-java-files)
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := FontGoogleSansOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

12
google-fonts/fonts_customization.xml
Unescape View File

@ -0,0 +1,12 @@
<?xml version="1.0" encoding="utf-8"?>
<fonts-modification version="1">
<family customizationType="new-named-family" name="google-sans">
<font weight="400" style="normal">GoogleSans-Regular.ttf</font>
<font weight="400" style="italic">GoogleSans-Italic.ttf</font>
<font weight="500" style="normal">GoogleSans-Medium.ttf</font>
<font weight="500" style="italic">GoogleSans-MediumItalic.ttf</font>
<font weight="700" style="normal">GoogleSans-Bold.ttf</font>
<font weight="700" style="italic">GoogleSans-BoldItalic.ttf</font>
</family>
<alias name="google-sans-medium" to="google-sans" weight="500" />
</fonts-modification>

212
google-fonts/google-fonts.xml
Unescape View File

@ -1,212 +0,0 @@
<fonts-modification version="1">
<family customizationType="new-named-family" name="google-sans">
<font weight="400" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="400"/>
</font>
<font weight="500" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="500"/>
</font>
<font weight="600" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="600"/>
</font>
<font weight="700" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="700"/>
</font>
<font weight="400" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="400"/>
</font>
<font weight="500" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="500"/>
</font>
<font weight="600" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="600"/>
</font>
<font weight="700" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="700"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-medium">
<font weight="500" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="500"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-bold">
<font weight="700" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="18.0"/>
<axis tag="wght" stylevalue="700"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-text">
<font weight="400" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="400"/>
</font>
<font weight="500" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="500"/>
</font>
<font weight="600" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="600"/>
</font>
<font weight="700" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="700"/>
</font>
<font weight="400" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="400"/>
</font>
<font weight="500" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="500"/>
</font>
<font weight="600" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="600"/>
</font>
<font weight="700" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="700"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-text-medium">
<font weight="500" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="500"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-text-bold">
<font weight="700" style="normal">GoogleSans-Regular.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="700"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-text-italic">
<font weight="400" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="400"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-text-medium-italic">
<font weight="500" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="500"/>
</font>
</family>
<family customizationType="new-named-family" name="google-sans-text-bold-italic">
<font weight="700" style="italic">GoogleSans-Italic.ttf
<axis tag="GRAD" stylevalue="0"/>
<axis tag="opsz" stylevalue="17.0"/>
<axis tag="wght" stylevalue="700"/>
</font>
</family>
<family customizationType="new-named-family" name="arbutus-slab">
<font weight="400" style="normal">ArbutusSlab-Regular.ttf</font>
</family>
<family customizationType="new-named-family" name="lato">
<font weight="400" style="normal">Lato-Regular.ttf</font>
<font weight="400" style="italic">Lato-Italic.ttf</font>
<font weight="700" style="normal">Lato-Bold.ttf</font>
<font weight="700" style="italic">Lato-BoldItalic.ttf</font>
</family>
<alias name="lato-bold" to="lato" weight="700" />
<family customizationType="new-named-family" name="rubik">
<font weight="400" style="normal">Rubik-Regular.ttf</font>
<font weight="400" style="italic">Rubik-Italic.ttf</font>
<font weight="500" style="normal">Rubik-Medium.ttf</font>
<font weight="500" style="italic">Rubik-MediumItalic.ttf</font>
<font weight="700" style="normal">Rubik-Bold.ttf</font>
<font weight="700" style="italic">Rubik-BoldItalic.ttf</font>
</family>
<alias name="rubik-medium" to="rubik" weight="500" />
<family customizationType="new-named-family" name="zilla-slab-medium">
<font weight="500" style="normal">ZillaSlab-Medium.ttf</font>
<font weight="500" style="italic">ZillaSlab-MediumItalic.ttf</font>
<font weight="600" style="normal">ZillaSlab-SemiBold.ttf</font>
<font weight="600" style="italic">ZillaSlab-SemiBoldItalic.ttf</font>
</family>
<alias name="zilla-slab-semi-bold" to="zilla-slab-medium" weight="600" />
<family customizationType="new-named-family" name="lustria">-->
<font weight="400" style="normal">Lustria-Regular.ttf</font>
</family>
<alias name="lustria" to="lustria" weight="400"/>
<family customizationType="new-named-family" name="karla">
<font weight="400" style="normal">Karla-Regular.ttf</font>
</family>
<alias name="karla" to="karla" weight="400"/>
<family customizationType="new-named-family" name="fraunces">
<font
weight="400"
style="normal"
postScriptName="Fraunces144ptS100Black-OpticalSize9Weight347soften100wonk0"
>Fraunces-Regular.ttf</font>
<font
weight="600"
style="normal"
postScriptName="Fraunces144ptS100Black-OpticalSize9Weight640soften100wonk0"
>Fraunces-SemiBold.ttf</font>
</family>
<alias name="fraunces" to="fraunces" weight="400"/>
<alias name="fraunces-semi-bold" to="fraunces" weight="600"/>
<family customizationType="new-named-family" name="big-shoulders-text">
<font weight="700" style="normal">BigShouldersText-Bold.ttf</font>
<font weight="800" style="normal">BigShouldersText-ExtraBold.ttf</font>
</family>
<alias name="big-shoulders-text-bold" to="big-shoulders-text" weight="700"/>
<alias name="big-shoulders-text-extra-bold" to="big-shoulders-text" weight="800"/>
<family customizationType="new-named-family" name="barlow">
<font weight="700" style="normal">Barlow-Bold.ttf</font>
<font weight="500" style="normal">Barlow-Medium.ttf</font>
</family>
<alias name="barlow-bold" to="barlow" weight="700"/>
<alias name="barlow-medium" to="barlow" weight="500"/>
</fonts-modification>

25
overlays/FontGoogleSansOverlay/Android.bp
Unescape View File

@ -0,0 +1,25 @@
//
// Copyright (c) 2020,2022 The LineageOS 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.
//
package {
default_applicable_licenses: ["Android-Apache-2.0"],
}
runtime_resource_overlay {
name: "FontGoogleSansOverlay",
theme: "FontGoogleSans",
product_specific: true,
}

1
google-fonts/FontGoogleSansOverlay/AndroidManifest.xml → overlays/FontGoogleSansOverlay/AndroidManifest.xml
Unescape View File

@ -19,6 +19,7 @@
package="com.android.theme.font.googlesans" package="com.android.theme.font.googlesans"
android:versionCode="1" android:versionCode="1"
android:versionName="1.0"> android:versionName="1.0">
<overlay android:targetPackage="android" <overlay android:targetPackage="android"
android:category="android.theme.customization.font" android:category="android.theme.customization.font"
android:priority="1"/> android:priority="1"/>

0
google-fonts/FontGoogleSansOverlay/res/values/config.xml → overlays/FontGoogleSansOverlay/res/values/config.xml
Unescape View File

0
google-fonts/FontGoogleSansOverlay/res/values/strings.xml → overlays/FontGoogleSansOverlay/res/values/strings.xml
Unescape View File

4
product.mk
Unescape View File

@ -1,10 +1,10 @@
include vendor/google_pixel/codenames.mk include vendor/google_pixel/codenames.mk
## Google Fonts ## Google Fonts
#PRODUCT_COPY_FILES += \ ADDITIONAL_FONTS_FILE := vendor/google_pixel/google-fonts/fonts_customization.xml
# vendor/google_pixel/google-fonts/google-fonts.xml:$(TARGET_COPY_OUT_PRODUCT)/etc/fonts_customization.xml
PRODUCT_PACKAGES += \ PRODUCT_PACKAGES += \
FontGoogleSansOverlay \
GoogleFonts GoogleFonts
## Pixel Apps ## Pixel Apps

Write Preview
Loading…
Cancel
Save