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

Change-Id: I75fe26d6d6297b345f167052b84b08da25ead5ea

14 files changed, 1 insertions, 337 deletions

diff --git a/data/fonts/fonts.xml b/data/fonts/fonts.xml
index 9c0f7906029e..4c214b529b39 100644
--- a/data/fonts/fonts.xml
+++ b/data/fonts/fonts.xml
@@ -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" />
diff --git a/packages/overlays/Android.mk b/packages/overlays/Android.mk
index e00239196871..7e269a0333ce 100644
--- a/packages/overlays/Android.mk
+++ b/packages/overlays/Android.mk
@@ -29,13 +29,10 @@ LOCAL_REQUIRED_MODULES := \
 	AccentColorSandOverlay \
 	DisplayCutoutEmulationCornerOverlay \
 	DisplayCutoutEmulationDoubleOverlay \
-        DisplayCutoutEmulationHoleOverlay \
+    DisplayCutoutEmulationHoleOverlay \
 	DisplayCutoutEmulationTallOverlay \
 	DisplayCutoutEmulationWaterfallOverlay \
 	FontNotoSerifSourceOverlay \
-	FontKaiOverlay \
-	FontVictorOverlay \
-	FontSamOverlay \
 	IconPackCircularAndroidOverlay \
 	IconPackCircularLauncherOverlay \
 	IconPackCircularSettingsOverlay \
diff --git a/packages/overlays/FontKaiOverlay/Android.mk b/packages/overlays/FontKaiOverlay/Android.mk
deleted file mode 100644
index a828a4bb9d4c..000000000000
--- a/packages/overlays/FontKaiOverlay/Android.mk
+++ /dev/null
@@ -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)
diff --git a/packages/overlays/FontKaiOverlay/AndroidManifest.xml b/packages/overlays/FontKaiOverlay/AndroidManifest.xml
deleted file mode 100644
index 9631da70bb4c..000000000000
--- a/packages/overlays/FontKaiOverlay/AndroidManifest.xml
+++ /dev/null
@@ -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>
diff --git a/packages/overlays/FontKaiOverlay/res/values/config.xml b/packages/overlays/FontKaiOverlay/res/values/config.xml
deleted file mode 100644
index 122b97ac3598..000000000000
--- a/packages/overlays/FontKaiOverlay/res/values/config.xml
+++ /dev/null
@@ -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>
-
diff --git a/packages/overlays/FontKaiOverlay/res/values/strings.xml b/packages/overlays/FontKaiOverlay/res/values/strings.xml
deleted file mode 100644
index 5a829c36e5e7..000000000000
--- a/packages/overlays/FontKaiOverlay/res/values/strings.xml
+++ /dev/null
@@ -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>
diff --git a/packages/overlays/FontSamOverlay/Android.mk b/packages/overlays/FontSamOverlay/Android.mk
deleted file mode 100644
index e85af1500f38..000000000000
--- a/packages/overlays/FontSamOverlay/Android.mk
+++ /dev/null
@@ -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)
diff --git a/packages/overlays/FontSamOverlay/AndroidManifest.xml b/packages/overlays/FontSamOverlay/AndroidManifest.xml
deleted file mode 100644
index 0f132f1e0cd0..000000000000
--- a/packages/overlays/FontSamOverlay/AndroidManifest.xml
+++ /dev/null
@@ -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>
diff --git a/packages/overlays/FontSamOverlay/res/values/config.xml b/packages/overlays/FontSamOverlay/res/values/config.xml
deleted file mode 100644
index 2bff6fe857cd..000000000000
--- a/packages/overlays/FontSamOverlay/res/values/config.xml
+++ /dev/null
@@ -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>
-
diff --git a/packages/overlays/FontSamOverlay/res/values/strings.xml b/packages/overlays/FontSamOverlay/res/values/strings.xml
deleted file mode 100644
index 18a3c109b42c..000000000000
--- a/packages/overlays/FontSamOverlay/res/values/strings.xml
+++ /dev/null
@@ -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>
diff --git a/packages/overlays/FontVictorOverlay/Android.mk b/packages/overlays/FontVictorOverlay/Android.mk
deleted file mode 100644
index d4d526df4fd5..000000000000
--- a/packages/overlays/FontVictorOverlay/Android.mk
+++ /dev/null
@@ -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)
diff --git a/packages/overlays/FontVictorOverlay/AndroidManifest.xml b/packages/overlays/FontVictorOverlay/AndroidManifest.xml
deleted file mode 100644
index 87942b4b3bda..000000000000
--- a/packages/overlays/FontVictorOverlay/AndroidManifest.xml
+++ /dev/null
@@ -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>
diff --git a/packages/overlays/FontVictorOverlay/res/values/config.xml b/packages/overlays/FontVictorOverlay/res/values/config.xml
deleted file mode 100644
index 2715e0f0e75b..000000000000
--- a/packages/overlays/FontVictorOverlay/res/values/config.xml
+++ /dev/null
@@ -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>
-
diff --git a/packages/overlays/FontVictorOverlay/res/values/strings.xml b/packages/overlays/FontVictorOverlay/res/values/strings.xml
deleted file mode 100644
index 30d8a8b0e6b3..000000000000
--- a/packages/overlays/FontVictorOverlay/res/values/strings.xml
+++ /dev/null
@@ -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>