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

Commit 5e99482e authored by Jay Aliomer's avatar Jay Aliomer Committed by Automerger Merge Worker
Browse files

Merge "Remove new styles from AOSP" into rvc-d1-dev am: dbe16101 

Change-Id: I75fe26d6d6297b345f167052b84b08da25ead5ea
parents 2af75c5f dbe16101

data/fonts/fonts.xml

+0 −33
Original line number Diff line number Diff line
@@ -36,39 +36,6 @@ 
        <font weight="700" style="italic">Roboto-BoldItalic.ttf</font>

    </family>



    <!-- Pixel 2020 -->

    <family name="lustria">

        <font weight="400" style="normal">Lustria-Regular.ttf</font>

    </family>

    <alias name="lustria" to="lustria" weight="400"/>



    <family name="karla">

        <font weight="400" style="normal">Karla-Regular.ttf</font>

    </family>

    <alias name="karla" to="karla" weight="400"/>



    <family name="fraunces">

        <font weight="400" style="normal">Fraunces-Regular.ttf</font>

        <font weight="600" style="normal">Fraunces-SemiBold.ttf</font>

    </family>

    <alias name="fraunces" to="fraunces" weight="400"/>

    <alias name="fraunces-semi-bold" to="fraunces" weight="600"/>



    <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 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"/>

    <!-- End Pixel 2020 -->



    <!-- Note that aliases must come after the fonts they reference. -->

    <alias name="sans-serif-thin" to="sans-serif" weight="100" />

    <alias name="sans-serif-light" to="sans-serif" weight="300" />

packages/overlays/Android.mk

+1 −4
Original line number Diff line number Diff line
@@ -33,9 +33,6 @@ LOCAL_REQUIRED_MODULES := \ 
	DisplayCutoutEmulationTallOverlay \

	DisplayCutoutEmulationWaterfallOverlay \

	FontNotoSerifSourceOverlay \

	FontKaiOverlay \

	FontVictorOverlay \

	FontSamOverlay \

	IconPackCircularAndroidOverlay \

	IconPackCircularLauncherOverlay \

	IconPackCircularSettingsOverlay \

packages/overlays/FontKaiOverlay/Android.mk

deleted100644 → 0
+0 −29
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 := FontKai



LOCAL_PRODUCT_MODULE := true



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := FontKaiOverlay

LOCAL_SDK_VERSION := current



include $(BUILD_RRO_PACKAGE)

packages/overlays/FontKaiOverlay/AndroidManifest.xml

deleted100644 → 0
+0 −29
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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.kai"

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

        <meta-data

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

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

    </application>

</manifest>

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

deleted100644 → 0
+0 −25
Original line number Diff line number Diff line 
<!--

  ~ Copyright (C) 2020 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_headlineFontFamilyMedium" translatable="false">lustria</string>

    <string name="config_headlineFontFamily" translatable="false">@string/config_headlineFontFamilyMedium</string>

</resources>