Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jay Aliomer
2020-05-20 20:35:15 +00:00
committed by Android (Google) Code Review
parent 927a58fb6d e3b17f75b5
commit dbe16101a5
14 changed files with 1 additions and 337 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
data/fonts/fonts.xml
View File

@@ -36,39 +36,6 @@
<font weight="700" style="italic">Roboto-BoldItalic.ttf</font> <font weight="700" style="italic">Roboto-BoldItalic.ttf</font>
</family> </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. --> <!-- Note that aliases must come after the fonts they reference. -->
<alias name="sans-serif-thin" to="sans-serif" weight="100" /> <alias name="sans-serif-thin" to="sans-serif" weight="100" />
<alias name="sans-serif-light" to="sans-serif" weight="300" /> <alias name="sans-serif-light" to="sans-serif" weight="300" />

5
packages/overlays/Android.mk
View File

@@ -29,13 +29,10 @@ LOCAL_REQUIRED_MODULES := \
AccentColorSandOverlay \ AccentColorSandOverlay \
DisplayCutoutEmulationCornerOverlay \ DisplayCutoutEmulationCornerOverlay \
DisplayCutoutEmulationDoubleOverlay \ DisplayCutoutEmulationDoubleOverlay \
DisplayCutoutEmulationHoleOverlay \ DisplayCutoutEmulationHoleOverlay \
DisplayCutoutEmulationTallOverlay \ DisplayCutoutEmulationTallOverlay \
DisplayCutoutEmulationWaterfallOverlay \ DisplayCutoutEmulationWaterfallOverlay \
FontNotoSerifSourceOverlay \ FontNotoSerifSourceOverlay \
FontKaiOverlay \
FontVictorOverlay \
FontSamOverlay \
IconPackCircularAndroidOverlay \ IconPackCircularAndroidOverlay \
IconPackCircularLauncherOverlay \ IconPackCircularLauncherOverlay \
IconPackCircularSettingsOverlay \ IconPackCircularSettingsOverlay \

29
packages/overlays/FontKaiOverlay/Android.mk
View File

@@ -1,29 +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 := FontKai
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := FontKaiOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

29
packages/overlays/FontKaiOverlay/AndroidManifest.xml
View File

@@ -1,29 +0,0 @@
<!--
~ 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>

25
packages/overlays/FontKaiOverlay/res/values/config.xml
View File

@@ -1,25 +0,0 @@
<!--
~ 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>

19
packages/overlays/FontKaiOverlay/res/values/strings.xml
View File

@@ -1,19 +0,0 @@
<!--
~ 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">
<!-- Headline / Body font Noto Serif / Source Sans Pro overlay -->
<string name="font_overlay" translatable="false">Lustria</string>
</resources>

29
packages/overlays/FontSamOverlay/Android.mk
View File

@@ -1,29 +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 := FontSam
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := FontSamOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

29
packages/overlays/FontSamOverlay/AndroidManifest.xml
View File

@@ -1,29 +0,0 @@
<!--
~ 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.sam"
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="fraunces,fraunces-semi-bold,karla,karla-bold" />
</application>
</manifest>

22
packages/overlays/FontSamOverlay/res/values/config.xml
View File

@@ -1,22 +0,0 @@
<!--
~ 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">
<string name="config_bodyFontFamily" translatable="false">karla</string>
<string name="config_bodyFontFamilyMedium" translatable="false">karla-bold</string>
<string name="config_headlineFontFamily" translatable="false">fraunces</string>
<string name="config_headlineFontFamilyMedium" translatable="false">fraunces-semi-bold</string>
</resources>

19
packages/overlays/FontSamOverlay/res/values/strings.xml
View File

@@ -1,19 +0,0 @@
<!--
~ 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">
<!-- Headline / Body font Noto Serif / Source Sans Pro overlay -->
<string name="font_overlay" translatable="false">Sam</string>
</resources>

29
packages/overlays/FontVictorOverlay/Android.mk
View File

@@ -1,29 +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 := FontVictor
LOCAL_PRODUCT_MODULE := true
LOCAL_RESOURCE_DIR := $(LOCAL_PATH)/res
LOCAL_PACKAGE_NAME := FontVictorOverlay
LOCAL_SDK_VERSION := current
include $(BUILD_RRO_PACKAGE)

29
packages/overlays/FontVictorOverlay/AndroidManifest.xml
View File

@@ -1,29 +0,0 @@
<!--
~ 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.victor"
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="barlow,barlow-medium,big-shoulders-text-bold,big-shoulders-text-extra-bold" />
</application>
</manifest>

22
packages/overlays/FontVictorOverlay/res/values/config.xml
View File

@@ -1,22 +0,0 @@
<!--
~ 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">
<string name="config_bodyFontFamily" translatable="false">big-shoulders-text-bold</string>
<string name="config_bodyFontFamilyMedium" translatable="false">big-shoulders-text-extra-bold</string>
<string name="config_headlineFontFamily" translatable="false">barlow</string>
<string name="config_headlineFontFamilyMedium" translatable="false">barlow-medium</string>
</resources>

19
packages/overlays/FontVictorOverlay/res/values/strings.xml
View File

@@ -1,19 +0,0 @@
<!--
~ 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">
<!-- Headline / Body font Noto Serif / Source Sans Pro overlay -->
<string name="font_overlay" translatable="false">Victor</string>
</resources>