Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c1cebf5d authored by TreeHugger Robot's avatar TreeHugger Robot Committed by Android (Google) Code Review
Browse files

Merge "Add FontNotoSerifSourceOverlay to AOSP."

parents 9b53de57 447075ba

data/fonts/fonts.xml

+1 −0
Original line number Diff line number Diff line
@@ -65,6 +65,7 @@ 
        <font weight="400" style="italic">NotoSerif-Italic.ttf</font>

        <font weight="700" style="italic">NotoSerif-BoldItalic.ttf</font>

    </family>

    <alias name="serif-bold" to="serif" weight="700" />

    <alias name="times" to="serif" />

    <alias name="times new roman" to="serif" />

    <alias name="palatino" to="serif" />

packages/overlays/FontNotoSerifSourceOverlay/Android.mk

0 → 100644
+31 −0
Original line number Diff line number Diff line 
#

#  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 := FontNotoSerifSource

LOCAL_CERTIFICATE := platform

LOCAL_PRODUCT_MODULE := true



LOCAL_SRC_FILES := $(call all-subdir-java-files)



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := FontNotoSerifSourceOverlay

LOCAL_SDK_VERSION := current



include $(BUILD_RRO_PACKAGE)

packages/overlays/FontNotoSerifSourceOverlay/AndroidManifest.xml

0 → 100644
+31 −0
Original line number Diff line number Diff line 
<!--

/**

 * Copyright (c) 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.

 */

-->

<manifest xmlns:android="http://schemas.android.com/apk/res/android"

    package="com.android.theme.font.notoserifsource"

    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_notoserif_source_overlay" android:hasCode="false">

        <meta-data

            android:name="android.theme.customization.REQUIRED_SYSTEM_FONTS"

            android:value="serif,serif-bold,source-sans-pro,source-sans-pro-medium" />

    </application>

</manifest>

packages/overlays/FontNotoSerifSourceOverlay/res/values/config.xml

0 → 100644
+28 −0
Original line number Diff line number Diff line 
<!--

/**

 * Copyright (c) 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.

 */

-->

<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">source-sans-pro</string>

    <!-- Name of a font family to use for medium body text. -->

    <string name="config_bodyFontFamilyMedium" translatable="false">source-sans-pro-semi-bold</string>

    <!-- Name of a font family to use for headlines. If empty, falls back to platform default -->

    <string name="config_headlineFontFamily" translatable="false">serif</string>

    <!-- Name of the font family used for system surfaces where the font should use medium weight -->

    <string name="config_headlineFontFamilyMedium" translatable="false">serif-bold</string>

</resources>

packages/overlays/FontNotoSerifSourceOverlay/res/values/strings.xml

0 → 100644
+21 −0
Original line number Diff line number Diff line 
<!--

/**

 * Copyright (c) 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.

 */

-->

<resources xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">

    <!-- Headline / Body font Noto Serif / Source Sans Pro overlay -->

    <string name="font_notoserif_source_overlay" translatable="false">Noto Serif / Source Sans Pro</string>

</resources>