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

Commit 52a24ee3 authored by Amin Shaikh's avatar Amin Shaikh
Browse files

Add three display/body font overlays. 

Note that these overlays can be checked in before b/122043381 since the
system fallback font is used if not installed on the device. The theme
picker should verify whether the REQUIRED_SYSTEM_FONTS listed in the
overlay meta-data are present before exposing these as font options.

Bug: 118756857
Test: manually toggling these overlays
Change-Id: I8ac544436eac5f7d16803c7b1c2580499adbe0c8
parent 18e35038

packages/overlays/FontArbutusSourceOverlay/Android.mk

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

#  Copyright 2018, 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 := FontArbutusSource

LOCAL_CERTIFICATE := platform

LOCAL_PRODUCT_MODULE := true



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



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := FontArbutusSourceOverlay

LOCAL_SDK_VERSION := current



include $(BUILD_RRO_PACKAGE)

packages/overlays/FontArbutusSourceOverlay/AndroidManifest.xml

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

/**

 * Copyright (c) 2018, 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.arbutussource"

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

        <meta-data

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

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

    </application>

</manifest>

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

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

/**

 * Copyright (c) 2018, 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-medium</string>

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

    <string name="config_headlineFontFamily" translatable="false">arbutus-slab</string>

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

    <string name="config_headlineFontFamilyMedium" translatable="false">arbutus-slab</string>

</resources>

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

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

/**

 * Copyright (c) 2018, 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 Arbutus Slab / Source Sans Pro overlay -->

    <string name="font_arbutus_source_overlay" translatable="false">Arbutus Slab / Source Sans Pro</string>

</resources>

packages/overlays/FontArvoLatoOverlay/Android.mk

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

#  Copyright 2018, 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 := FontArvoLato

LOCAL_CERTIFICATE := platform

LOCAL_PRODUCT_MODULE := true



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



LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res



LOCAL_PACKAGE_NAME := FontArvoLatoOverlay

LOCAL_SDK_VERSION := current



include $(BUILD_RRO_PACKAGE)