diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 50e372758de..2b36137d8f6 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -141,22 +141,6 @@
             column="5"/>
     </issue>
 
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="    &lt;color name=&quot;notification_history_background&quot;>#202124&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values-night/colors.xml"
-            line="29"
-            column="5"/>
-    </issue>
-
     <issue
         id="HardCodedColor"
         severity="Error"
@@ -2653,38 +2637,6 @@
             column="13"/>
     </issue>
 
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="            android:color=&quot;@color/accessibility_feature_background&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_font_size.xml"
-            line="22"
-            column="13"/>
-    </issue>
-
-    <issue
-        id="HardCodedColor"
-        severity="Error"
-        message="Avoid using hardcoded color"
-        category="Correctness"
-        priority="4"
-        summary="Using hardcoded color"
-        explanation="Hardcoded color values are bad because theme changes cannot be uniformly applied.Instead use the theme specific colors such as `?android:attr/textColorPrimary` in attributes.&#xA;This ensures that a theme change from a light to a dark theme can be uniformlyapplied across the app."
-        errorLine1="            android:color=&quot;@color/accessibility_feature_background&quot;/>"
-        errorLine2="            ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/drawable/ic_force_bold.xml"
-            line="22"
-            column="13"/>
-    </issue>
-
     <issue
         id="HardCodedColor"
         severity="Error"
diff --git a/res/color/lock_pattern_view_success_color.xml b/res/color/lock_pattern_view_success_color.xml
deleted file mode 100644
index 075e91958a4..00000000000
--- a/res/color/lock_pattern_view_success_color.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent" />
-</selector>
diff --git a/res/color/unlock_pattern_view_success_color.xml b/res/color/unlock_pattern_view_success_color.xml
deleted file mode 100644
index 075e91958a4..00000000000
--- a/res/color/unlock_pattern_view_success_color.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2015 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.
--->
-
-<selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:color="?android:attr/colorAccent" />
-</selector>
diff --git a/res/drawable/ic_arrow_down_24dp.xml b/res/drawable/ic_arrow_down_24dp.xml
deleted file mode 100644
index f2efb4cded8..00000000000
--- a/res/drawable/ic_arrow_down_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:tint="?android:attr/colorControlNormal"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,16.41l-6.71,-6.7l1.42,-1.42l5.29,5.3l5.29,-5.3l1.42,1.42z"/>
-</vector>
diff --git a/res/drawable/ic_battery_circle.xml b/res/drawable/ic_battery_circle.xml
deleted file mode 100644
index 5c736fdf4ed..00000000000
--- a/res/drawable/ic_battery_circle.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-     Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?android:attr/colorControlNormal">
-    <path android:fillColor="#FF000000"
-          android:pathData="M12 2C6.48 2 2 6.48 2 12s4.48 10 10 10 10-4.48 10-10S17.52 2 12 2z"/>
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_battery_low.xml b/res/drawable/ic_battery_low.xml
deleted file mode 100644
index 82f9546d28e..00000000000
--- a/res/drawable/ic_battery_low.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<!--
-  Copyright (C) 2021 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
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="?android:attr/colorAccent"
-      android:pathData="M12,19m-2,0a2,2 0,1 1,4 0a2,2 0,1 1,-4 0"/>
-  <path
-      android:fillColor="?android:attr/colorAccent"
-      android:pathData="M10,3h4v12h-4z"/>
-</vector>
diff --git a/res/drawable/ic_battery_status_maybe_24dp.xml b/res/drawable/ic_battery_status_maybe_24dp.xml
deleted file mode 100644
index dd9a57129af..00000000000
--- a/res/drawable/ic_battery_status_maybe_24dp.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<!--
-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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M13,17h-2v-2h2V17zM13,13h-2V8h2V13z"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M16.2,22.5H7.8c-1.3,0 -2.3,-1 -2.3,-2.3V5.8c0,-1.3 1,-2.3 2.3,-2.3h0.7v-2h7v2h0.7c1.3,0 2.3,1.1 2.3,2.3v14.3C18.5,21.5 17.5,22.5 16.2,22.5zM7.8,5.5c-0.2,0 -0.3,0.2 -0.3,0.3v14.3c0,0.2 0.2,0.3 0.3,0.3h8.3c0.2,0 0.3,-0.1 0.3,-0.3V5.8c0,-0.2 -0.1,-0.3 -0.3,-0.3h-2.7v-2h-3v2H7.8z"/>
-</vector>
diff --git a/res/drawable/ic_call_24dp.xml b/res/drawable/ic_call_24dp.xml
deleted file mode 100644
index 26bbde5f3ca..00000000000
--- a/res/drawable/ic_call_24dp.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorAccent">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M6.62,10.79c1.44,2.83 3.76,5.14 6.59,6.59l2.2,-2.2c0.27,-0.27 0.67,-0.36
-        1.02,-0.24 1.12,0.37 2.33,0.57 3.57,0.57 0.55,0 1,0.45 1,1V20c0,0.55 -0.45,1 -1,1 -9.39,0
-         -17,-7.61 -17,-17 0,-0.55 0.45,-1 1,-1h3.5c0.55,0 1,0.45 1,1 0,1.25 0.2,2.45 0.57,3.57
-         0.11,0.35 0.03,0.74 -0.25,1.02l-2.2,2.2z"/>
-</vector>
diff --git a/res/drawable/ic_check_box_anim.xml b/res/drawable/ic_check_box_anim.xml
deleted file mode 100644
index f6aed8ff64a..00000000000
--- a/res/drawable/ic_check_box_anim.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
-  -->
-
-<animated-selector xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/checked"
-        android:state_checked="true"
-        android:drawable="@drawable/ic_check_box_blue_24dp" />
-    <item
-        android:id="@+id/unchecked"
-        android:drawable="@drawable/ic_check_box_outline_24dp" />
-</animated-selector>
diff --git a/res/drawable/ic_check_box_blue_24dp.xml b/res/drawable/ic_check_box_blue_24dp.xml
deleted file mode 100644
index 43cae698398..00000000000
--- a/res/drawable/ic_check_box_blue_24dp.xml
+++ /dev/null
@@ -1,26 +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
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-        android:pathData="M19,3L5,3c-1.11,0 -2,0.9 -2,2v14c0,1.1 0.89,2 2,2h14c1.11,0 2,-0.9 2,-2L21,5c0,-1.1 -0.89,-2 -2,-2zM10,17l-5,-5 1.41,-1.41L10,14.17l7.59,-7.59L19,8l-9,9z"
-        android:fillColor="#4285F4"/>
-</vector>
-
diff --git a/res/drawable/ic_check_box_outline_24dp.xml b/res/drawable/ic_check_box_outline_24dp.xml
deleted file mode 100644
index f6f453af2a2..00000000000
--- a/res/drawable/ic_check_box_outline_24dp.xml
+++ /dev/null
@@ -1,26 +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
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-        android:pathData="M19,5v14H5V5h14m0,-2H5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V5c0,-1.1 -0.9,-2 -2,-2z"
-        android:fillColor="#757575"/>
-</vector>
-
diff --git a/res/drawable/ic_check_green_24dp.xml b/res/drawable/ic_check_green_24dp.xml
deleted file mode 100644
index c836a0237a7..00000000000
--- a/res/drawable/ic_check_green_24dp.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!-- Copyright (C) 2016 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.
--->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0">
-    <path
-        android:pathData="M9,16.17L4.83,12l-1.42,1.41L9,19 21,7l-1.41,-1.41z"
-        android:fillColor="#0F9D58"/>
-</vector>
diff --git a/res/drawable/ic_content_copy_grey600_24dp.xml b/res/drawable/ic_content_copy_grey600_24dp.xml
deleted file mode 100644
index ba17ab658e3..00000000000
--- a/res/drawable/ic_content_copy_grey600_24dp.xml
+++ /dev/null
@@ -1,10 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="@*android:color/material_grey_600"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M16,1L4,1c-1.1,0 -2,0.9 -2,2v14h2L4,3h12L16,1zM19,5L8,5c-1.1,0 -2,0.9 -2,2v14c0,1.1 0.9,2 2,2h11c1.1,0 2,-0.9 2,-2L21,7c0,-1.1 -0.9,-2 -2,-2zM19,21L8,21L8,7h11v14z"
-      android:fillColor="@android:color/white"/>
-</vector>
diff --git a/res/drawable/ic_eject_24dp.xml b/res/drawable/ic_eject_24dp.xml
deleted file mode 100644
index 8755ccb4d05..00000000000
--- a/res/drawable/ic_eject_24dp.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-Copyright (C) 2015 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M5 17h14v2H5zm7,-12L5.33 15h13.34z"/>
-</vector>
diff --git a/res/drawable/ic_face_enroll_introduction_detail.xml b/res/drawable/ic_face_enroll_introduction_detail.xml
deleted file mode 100644
index 386f8c7e1e7..00000000000
--- a/res/drawable/ic_face_enroll_introduction_detail.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ 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
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:tint="?android:attr/colorControlNormal"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:pathData="M0,0h24v24H0V0z" />
-    <path
-        android:pathData="M0,0h24v24H0V0z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M12,2L3.82,5.64v5.45c0,5.05,3.49,9.76,8.18,10.91c4.69-1.15,8.18-5.86,8.18-10.91V5.64L12,2z M18.18,11.09 c0,1.55-0.41,3.05-1.1,4.38C15.77,14.5,13.4,14,12,14s-3.77,0.5-5.08,1.47c-0.69-1.33-1.1-2.83-1.1-4.38V6.94L12,4.19l6.18,2.75 V11.09z" />
-    <path
-        android:fillColor="#000000"
-        android:pathData="M 12 7.5 C 13.6568542495 7.5 15 8.84314575051 15 10.5 C 15 12.1568542495 13.6568542495 13.5 12 13.5 C 10.3431457505 13.5 9 12.1568542495 9 10.5 C 9 8.84314575051 10.3431457505 7.5 12 7.5 Z" />
-</vector>
\ No newline at end of file
diff --git a/res/drawable/ic_face_enroll_introduction_people.xml b/res/drawable/ic_face_enroll_introduction_people.xml
deleted file mode 100644
index b452efe14fd..00000000000
--- a/res/drawable/ic_face_enroll_introduction_people.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-  ~ 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
-  -->
-
-<animated-vector xmlns:android="http://schemas.android.com/apk/res/android"
-                 xmlns:aapt="http://schemas.android.com/aapt">
-    <aapt:attr name="android:drawable">
-        <vector android:height="24dp" android:width="24dp" android:viewportHeight="24"
-                android:viewportWidth="24"
-                android:tint="?android:attr/colorControlNormal">
-            <group android:name="_R_G">
-                <group android:name="_R_G_L_0_G">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="#000000"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M15 8 C15,6.58 14.5,5.27 13.67,4.24 C14.09,4.1 14.53,4 15,4 C17.21,4 19,5.79 19,8 C19,10.21 17.21,12 15,12 C14.57,12 14.16,11.91 13.77,11.79 C13.74,11.78 13.71,11.77 13.67,11.76 C14.5,10.73 15,9.42 15,8c  M16.66 13.13 C18.03,14.06 19,15.32 19,17 C19,17 19,20 19,20 C19,20 23,20 23,20 C23,20 23,17 23,17 C23,14.82 19.42,13.53 16.66,13.13c  M9 6 C7.9,6 7,6.9 7,8 C7,9.1 7.9,10 9,10 C10.1,10 11,9.1 11,8 C11,6.9 10.1,6 9,6c  M9 15 C6.3,15 3.2,16.29 3,17.01 C3,17.01 3,18 3,18 C3,18 15,18 15,18 C15,18 15,17 15,17 C14.8,16.29 11.7,15 9,15c  M9 4 C11.21,4 13,5.79 13,8 C13,10.21 11.21,12 9,12 C6.79,12 5,10.21 5,8 C5,5.79 6.79,4 9,4c  M9 13 C11.67,13 17,14.34 17,17 C17,17 17,20 17,20 C17,20 1,20 1,20 C1,20 1,17 1,17 C1,14.34 6.33,13 9,13c "/>
-                </group>
-            </group>
-            <group android:name="time_group"/>
-        </vector>
-    </aapt:attr>
-    <target android:name="time_group">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="translateX" android:duration="2000"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-</animated-vector>
\ No newline at end of file
diff --git a/res/drawable/ic_feedback_24dp.xml b/res/drawable/ic_feedback_24dp.xml
deleted file mode 100644
index a65f4443d8f..00000000000
--- a/res/drawable/ic_feedback_24dp.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<!--
-  ~ 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
-  -->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24">
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M20,2H4C2.9,2 2.01,2.9 2.01,4L2,22l4,-4h14c1.1,0 2,-0.9 2,-2V4C22,2.9 21.1,2 20,2zM20,16H6H5.17l-0.59,0.59L4,17.17V4h16V16z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,12h2v2h-2z"/>
-    <path
-        android:fillColor="#FF000000"
-        android:pathData="M11,6h2v4h-2z"/>
-</vector>
diff --git a/res/drawable/ic_find_device_disabled.xml b/res/drawable/ic_find_device_disabled.xml
deleted file mode 100644
index 21e92c9c286..00000000000
--- a/res/drawable/ic_find_device_disabled.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFF44336"
-        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9zM11,13h2v2h-2V13zM13,6h-2v5h2V6z"/>
-</vector>
diff --git a/res/drawable/ic_find_device_enabled.xml b/res/drawable/ic_find_device_enabled.xml
deleted file mode 100644
index 614ac6d136a..00000000000
--- a/res/drawable/ic_find_device_enabled.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FF43A047"
-        android:pathData="M12,2C8.13,2 5,5.13 5,9c0,5.25 7,13 7,13s7,-7.75 7,-13C19,5.13 15.87,2 12,2zM7,9c0,-2.76 2.24,-5 5,-5s5,2.24 5,5c0,2.88 -2.88,7.19 -5,9.88C9.92,16.21 7,11.85 7,9zM14.5,9c0,1.38 -1.12,2.5 -2.5,2.5S9.5,10.38 9.5,9s1.12,-2.5 2.5,-2.5S14.5,7.62 14.5,9z"/>
-</vector>
diff --git a/res/drawable/ic_font_size.xml b/res/drawable/ic_font_size.xml
deleted file mode 100644
index 14217837873..00000000000
--- a/res/drawable/ic_font_size.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  Copyright 2021 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <com.android.settingslib.widget.AdaptiveIconShapeDrawable
-            android:width="@dimen/accessibility_icon_size"
-            android:height="@dimen/accessibility_icon_size"
-            android:color="@color/accessibility_feature_background"/>
-    </item>
-    <item android:gravity="center">
-        <vector
-            android:width="@dimen/accessibility_icon_foreground_size"
-            android:height="@dimen/accessibility_icon_foreground_size"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:fillColor="#ffffff"
-                android:pathData="M9,4v3h5v13h3L17,7h5L22,4L9,4zM2,12h3v8h3v-8h3L11,9L2,9v3z"/>
-        </vector>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_force_bold.xml b/res/drawable/ic_force_bold.xml
deleted file mode 100644
index 98b648aef84..00000000000
--- a/res/drawable/ic_force_bold.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<!--
-  Copyright 2021 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.
-  -->
-
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <com.android.settingslib.widget.AdaptiveIconShapeDrawable
-            android:width="@dimen/accessibility_icon_size"
-            android:height="@dimen/accessibility_icon_size"
-            android:color="@color/accessibility_feature_background"/>
-    </item>
-    <item android:gravity="center">
-        <vector
-            android:width="@dimen/accessibility_icon_foreground_size"
-            android:height="@dimen/accessibility_icon_foreground_size"
-            android:viewportWidth="24"
-            android:viewportHeight="24">
-            <path
-                android:fillColor="#ffffff"
-                android:pathData="M16.11,11.76C17.22,10.99 18,9.74 18,8.57 18,5.99 16,4 13.43,4L6,4v16h8.33c2.39,0 4.24,-1.94 4.24,-4.33 0,-1.74 -0.98,-3.22 -2.46,-3.91zM9,6.5h4c1.11,0 2,0.89 2,2s-0.89,2 -2,2L9,10.5v-4zM13.67,17.5L9,17.5v-4h4.67c1.11,0 2,0.89 2,2s-0.9,2 -2,2z"/>
-        </vector>
-    </item>
-</layer-list>
\ No newline at end of file
diff --git a/res/drawable/ic_hand_gesture.xml b/res/drawable/ic_hand_gesture.xml
deleted file mode 100644
index 34067ea8fae..00000000000
--- a/res/drawable/ic_hand_gesture.xml
+++ /dev/null
@@ -1,32 +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.
-  -->
-
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24"
-        android:viewportHeight="24"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M5.64,6.64l2.36,-1.14l-2.36,-1.14l-1.14,-2.36l-1.14,2.36l-2.36,1.14l2.36,1.14l1.14,2.36z"
-        android:fillColor="#000000"/>
-    <path
-        android:pathData="M20.3,15.7l-1.3,-2.7l-1.3,2.7l-2.7,1.3l2.7,1.3l1.3,2.7l1.3,-2.7l2.7,-1.3z"
-        android:fillColor="#000000"/>
-    <path
-        android:pathData="M12.33,20.5c-0.73,0 -1.41,-0.31 -1.89,-0.86l-4.39,-5.06l0.35,-0.35c0.09,-0.09 0.36,-0.24 0.63,-0.06c1.95,1.3 1.18,0.79 3.97,2.65c0,-3.92 0,-6.81 0,-10.8c0,-0.28 0.22,-0.5 0.5,-0.5S12,5.72 12,6c0,1.5 0,6 0,6h1.5c0,-2.92 0,-5.06 0,-8c0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5c0,0.08 0,1.13 0,8H16c0,0 0,-0.51 0,-7c0,-0.28 0.22,-0.5 0.5,-0.5S17,4.72 17,5v2c0,1.25 0,5 0,5h1.5c0,0 0,-3.75 0,-5c0,-0.28 0.22,-0.5 0.5,-0.5s0.5,0.22 0.5,0.5v3.5H21V7c0,-1.1 -0.9,-2 -2,-2c-0.17,0 -0.34,0.03 -0.5,0.07V5c0,-1.1 -0.9,-2 -2,-2c-0.25,0 -0.48,0.05 -0.7,0.13C15.47,2.47 14.79,2 14,2c-1.1,0 -2,0.9 -2,2v0.07C11.84,4.03 11.67,4 11.5,4c-1.1,0 -2,0.9 -2,2c0,2.92 0,5.02 0,8l-1.64,-1.09c-0.79,-0.53 -1.85,-0.42 -2.52,0.25L4,14.5l5.3,6.12C10.06,21.5 11.17,22 12.33,22h4.17l-0.75,-1.5H12.33z"
-        android:fillColor="#000000"/>
-</vector>
diff --git a/res/drawable/ic_label.xml b/res/drawable/ic_label.xml
deleted file mode 100644
index b1ed068abec..00000000000
--- a/res/drawable/ic_label.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-    Copyright (C) 2015 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="32.0dp"
-        android:height="32.0dp"
-        android:viewportWidth="48.0"
-        android:viewportHeight="48.0">
-    <path
-        android:fillColor="?android:attr/colorControlNormal"
-        android:pathData="M35.27,11.69C34.54,10.67 33.35,10.0 32.0,10.0l-22.0,0.02c-2.21,0.0 -4.0,1.77 -4.0,3.98l0.0,20.0c0.0,2.21 1.79,3.98 4.0,3.98L32.0,38.0c1.35,0.0 2.54,-0.67 3.27,-1.69L44.0,24.0l-8.73,-12.31z"/>
-</vector>
diff --git a/res/drawable/ic_lock_list_icon.xml b/res/drawable/ic_lock_list_icon.xml
deleted file mode 100644
index 9660f9c0e78..00000000000
--- a/res/drawable/ic_lock_list_icon.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2016 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24.0dp"
-    android:height="24.0dp"
-    android:viewportWidth="24.0"
-    android:viewportHeight="24.0"
-    android:tint="?attr/sudListItemIconColor">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18.0,8.0l-1.0,0.0L17.0,6.0c0.0,-2.76 -2.24,-5.0 -5.0,-5.0S7.0,3.24 7.0,6.0l0.0,2.0L6.0,8.0c-1.1,0.0 -2.0,0.9 -2.0,2.0l0.0,10.0c0.0,1.0 0.9,2.0 2.0,2.0l12.0,0.0c1.1,0.0 2.0,-0.9 2.0,-2.0L20.0,10.0c0.0,-1.1 -0.9,-2.0 -2.0,-2.0zm-6.0,9.0c-1.1,0.0 -2.0,-0.9 -2.0,-2.0s0.9,-2.0 2.0,-2.0 2.0,0.9 2.0,2.0 -0.9,2.0 -2.0,2.0zm3.1,-9.0L8.9,8.0L8.9,6.0c0.0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0.0 3.1,1.39 3.1,3.1l0.0,2.0z"/>
-</vector>
diff --git a/res/drawable/ic_open_wifi_autoconnect.xml b/res/drawable/ic_open_wifi_autoconnect.xml
deleted file mode 100644
index c752522fd90..00000000000
--- a/res/drawable/ic_open_wifi_autoconnect.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="24dp"
-        android:height="24dp"
-        android:viewportWidth="24.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:pathData="M12.7 10C11.9 7.7 9.7 6 7 6 3.7 6 1 8.7 1 12c0 3.3 2.7 6 6 6 2.6 0 4.8 -1.7 5.7 -4l4.3 0 0 4 4 0 0 -4 2 0 0 -4 -10.3 0zM7 16C4.8 16 3 14.2 3 12 3 9.8 4.8 8 7 8 8.1 8 9 8.4 9.6 9.1L8.5 10.2C8.3 9.9 7.8 9.5 7 9.5 5.6 9.5 4.6 10.6 4.6 12c0 1.4 1.1 2.5 2.4 2.5 1.6 0 2.1 -1.1 2.2 -1.7l-2.2 0 0 -1.4 3.8 0c0 0.2 0.1 0.4 0.1 0.6 -0.1 2.3 -1.7 4 -3.9 4z"
-        android:fillColor="#FFFFFFFF"/>
-</vector>
diff --git a/res/drawable/ic_ota_update_available.xml b/res/drawable/ic_ota_update_available.xml
deleted file mode 100644
index b03f9d741aa..00000000000
--- a/res/drawable/ic_ota_update_available.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFF44336"
-        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM16,12.5l-4,4l-4,-4l1.41,-1.41L11,12.67V8.5V8h2v0.5v4.17l1.59,-1.59L16,12.5z"/>
-</vector>
diff --git a/res/drawable/ic_ota_update_current.xml b/res/drawable/ic_ota_update_current.xml
deleted file mode 100644
index c38a0838d57..00000000000
--- a/res/drawable/ic_ota_update_current.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FF43A047"
-        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11.14,16l-3.84,-3.84l1.41,-1.42l2.43,2.42l4.16,-4.16l1.42,1.41L11.14,16z"/>
-</vector>
diff --git a/res/drawable/ic_ota_update_none.xml b/res/drawable/ic_ota_update_none.xml
deleted file mode 100644
index b49b4247646..00000000000
--- a/res/drawable/ic_ota_update_none.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFF44336"
-        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/>
-</vector>
diff --git a/res/drawable/ic_ota_update_stale.xml b/res/drawable/ic_ota_update_stale.xml
deleted file mode 100644
index b49b4247646..00000000000
--- a/res/drawable/ic_ota_update_stale.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<!--
-    Copyright (C) 2017 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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-    android:width="24dp"
-    android:height="24dp"
-    android:viewportWidth="24"
-    android:viewportHeight="24">
-
-    <path
-        android:fillColor="#FFF44336"
-        android:pathData="M17,1.01L7,1C5.9,1 5,1.9 5,3v18c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3C19,1.9 18.1,1.01 17,1.01zM17,21H7l0,-1h10V21zM17,18H7V6h10V18zM7,4V3h10v1H7zM11,15h2v2h-2V15zM13,8h-2v5h2V8z"/>
-</vector>
diff --git a/res/drawable/zen_calls_any.xml b/res/drawable/zen_calls_any.xml
deleted file mode 100644
index 546fd93395a..00000000000
--- a/res/drawable/zen_calls_any.xml
+++ /dev/null
@@ -1,54 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M124.836,33.3968C124.803,32.0165 123.657,30.924 122.277,30.9566C120.033,31.0096 116.483,30.2834 113.492,28.017C110.609,25.8319 108.065,22.0845 107.846,15.6608C107.799,14.2808 106.642,13.2003 105.262,13.2474C103.882,13.2944 102.802,14.4512 102.849,15.8311C103.117,23.7016 106.344,28.8735 110.472,32.0019C114.493,35.0492 119.194,36.0308 122.395,35.9552C123.776,35.9226 124.868,34.7772 124.836,33.3968Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M126.906,26.0953C126.873,24.7149 125.728,23.6224 124.347,23.655C123.089,23.6847 121.034,23.2678 119.313,21.9639C117.7,20.7412 116.201,18.6093 116.07,14.7745C116.023,13.3946 114.866,12.314 113.486,12.3611C112.106,12.4081 111.026,13.5649 111.073,14.9448C111.253,20.2263 113.435,23.7827 116.293,25.9488C119.044,28.0336 122.25,28.7059 124.465,28.6536C125.846,28.621 126.938,27.4756 126.906,26.0953Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M128.481,18.363C128.448,16.9826 127.303,15.8901 125.922,15.9227C125.7,15.928 125.212,15.8357 124.824,15.5417C124.543,15.3289 124.141,14.8922 124.103,13.7742C124.056,12.3943 122.899,11.3138 121.519,11.3608C120.14,11.4079 119.059,12.5647 119.106,13.9446C119.194,16.5092 120.278,18.3704 121.804,19.5266C123.222,20.6015 124.86,20.9492 126.041,20.9213C127.421,20.8887 128.513,19.7433 128.481,18.363Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M96.7117,94.8594C96.8874,94.8598 97.0613,94.8238 97.2226,94.7538C97.384,94.6838 97.5294,94.5812 97.65,94.4524C97.7705,94.3236 97.8636,94.1713 97.9235,94.0048C97.9835,93.8384 98.009,93.6613 97.9984,93.4845C97.3551,82.5242 89.2298,73.8597 79.2838,73.8597C77.0243,73.8478 74.7851,74.2887 72.696,75.1568C70.7339,75.9851 68.628,76.4117 66.5007,76.4117C64.3735,76.4117 62.2675,75.9851 60.3054,75.1568C58.2164,74.2887 55.9771,73.8478 53.7177,73.8597C43.7717,73.8597 35.64,82.5242 35.0031,93.4845C34.9925,93.6613 35.018,93.8384 35.0779,94.0048C35.1378,94.1713 35.2309,94.3236 35.3515,94.4524C35.472,94.5812 35.6175,94.6838 35.7788,94.7538C35.9402,94.8238 36.1141,94.8598 36.2897,94.8594L96.7117,94.8594Z"
-        android:fillColor="#9AA0A6"/>
-    <path
-        android:pathData="M65.0179,94.8594C65.1518,94.8598 65.2842,94.8238 65.4072,94.7538C65.5301,94.6838 65.6409,94.5812 65.7328,94.4524C65.8246,94.3236 65.8955,94.1713 65.9412,94.0048C65.9869,93.8384 66.0063,93.6613 65.9982,93.4845C65.5081,82.5242 59.3174,73.8597 51.7395,73.8597C50.018,73.8478 48.3119,74.2887 46.7202,75.1568C45.2253,75.9851 43.6207,76.4117 42.0,76.4117C40.3793,76.4117 38.7747,75.9851 37.2798,75.1568C35.6881,74.2887 33.982,73.8478 32.2605,73.8597C24.6826,73.8597 18.487,82.5242 18.0018,93.4845C17.9937,93.6613 18.0131,93.8384 18.0588,94.0048C18.1045,94.1713 18.1754,94.3236 18.2672,94.4524C18.3591,94.5812 18.4699,94.6838 18.5928,94.7538C18.7158,94.8238 18.8482,94.8598 18.9821,94.8594L65.0179,94.8594Z"
-        android:fillColor="#BDC1C6"/>
-    <path
-        android:pathData="M45.0007,66.8594C48.8667,66.8594 52.0007,63.5016 52.0007,59.3594C52.0007,55.2173 48.8667,51.8594 45.0007,51.8594C41.1347,51.8594 38.0007,55.2173 38.0007,59.3594C38.0007,63.5016 41.1347,66.8594 45.0007,66.8594Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M66.4193,73.6966C58.4561,73.6966 52.0007,67.2412 52.0007,59.278C52.0007,51.3149 58.4561,44.8594 66.4193,44.8594C74.3825,44.8594 80.8379,51.3149 80.8379,59.278C80.8379,67.2412 74.3825,73.6966 66.4193,73.6966Z"
-        android:fillColor="#9AA0A6"/>
-    <path
-        android:pathData="M42.4186,73.6966C34.4554,73.6966 28.0,67.2412 28.0,59.278C28.0,51.3149 34.4554,44.8594 42.4186,44.8594C50.3818,44.8594 56.8372,51.3149 56.8372,59.278C56.8372,67.2412 50.3818,73.6966 42.4186,73.6966Z"
-        android:fillColor="#BDC1C6"/>
-    <path
-        android:pathData="M105.96,57.595C110.653,57.7207 114.559,54.0185 114.685,49.3257L114.685,49.3257C114.811,44.633 111.108,40.7268 106.416,40.6011L106.416,40.6011C101.723,40.4753 97.8166,44.1776 97.6909,48.8703L97.6909,48.8703C97.5651,53.563 101.267,57.4692 105.96,57.595L105.96,57.595Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M88.5558,35.1209C93.2485,35.2466 97.1547,31.5444 97.2805,26.8516L97.2805,26.8516C97.4062,22.1589 93.704,18.2527 89.0112,18.127L89.0112,18.127C84.3185,18.0012 80.4123,21.7034 80.2866,26.3962L80.2866,26.3962C80.1608,31.0889 83.863,34.9951 88.5558,35.1209L88.5558,35.1209Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M89.3727,50.6961C94.7613,55.4583 101.345,57.3574 105.886,57.592L106.195,51.6C102.802,51.4247 97.572,49.935 93.3459,46.2002C89.2407,42.5723 85.8768,36.6527 86.2704,27.0988L80.2755,26.8518C79.8104,38.1413 83.863,45.8271 89.3727,50.6961Z"
-        android:fillColor="#4285F4"/>
-</vector>
diff --git a/res/drawable/zen_calls_contacts.xml b/res/drawable/zen_calls_contacts.xml
deleted file mode 100644
index a4c064a76e5..00000000000
--- a/res/drawable/zen_calls_contacts.xml
+++ /dev/null
@@ -1,81 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M92.711,94.8594C92.8867,94.8598 93.0605,94.8238 93.2219,94.7538C93.3833,94.6838 93.5287,94.5812 93.6492,94.4524C93.7698,94.3236 93.8629,94.1713 93.9228,94.0048C93.9827,93.8384 94.0082,93.6613 93.9977,93.4845C93.3543,82.5242 85.229,73.8597 75.2831,73.8597C73.0236,73.8478 70.7843,74.2887 68.6953,75.1568C66.7332,75.9851 64.6272,76.4117 62.5,76.4117C60.3728,76.4117 58.2668,75.9851 56.3047,75.1568C54.2157,74.2887 51.9764,73.8478 49.7169,73.8597C39.771,73.8597 31.6392,82.5242 31.0023,93.4845C30.9918,93.6613 31.0173,93.8384 31.0772,94.0048C31.1371,94.1713 31.2302,94.3236 31.3508,94.4524C31.4713,94.5812 31.6167,94.6838 31.7781,94.7538C31.9395,94.8238 32.1133,94.8598 32.289,94.8594L92.711,94.8594Z"
-        android:fillColor="#34A853"/>
-    <path
-        android:pathData="M63.0,44.8594C66.7401,44.9399 70.3003,46.5029 72.9173,49.2134C75.5344,51.9239 77.0,55.5662 77.0,59.3594C77.0,63.1527 75.5344,66.795 72.9173,69.5055C70.3003,72.216 66.7401,73.779 63.0,73.8594L63.0,44.8594Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M78.0,51.3412L75.6967,55.8594L74.0,50.8594L78.0,51.3412Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M63.0,73.8594C58.9927,73.779 55.1783,72.216 52.3743,69.5055C49.5703,66.795 48.0,63.1527 48.0,59.3594C48.0,55.5662 49.5703,51.9239 52.3743,49.2134C55.1783,46.5029 58.9927,44.9399 63.0,44.8594L63.0,73.8594Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M76.4697,52.3898L69.4697,45.3898L70.5303,44.3291L77.5303,51.3291L76.4697,52.3898Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M61.4932,59.3066L73.4932,48.3066L74.5068,49.4123L62.5068,60.4123L61.4932,59.3066Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M60.0001,59.8823C59.9971,59.4613 60.0827,59.0444 60.2514,58.6587C60.4201,58.2729 60.6682,57.927 60.9794,57.6433C61.2906,57.3596 61.6581,57.1445 62.0579,57.012C62.4577,56.8795 62.881,56.8325 63.3001,56.8742C64.055,56.9704 64.7478,57.3415 65.2459,57.9165C65.744,58.4914 66.0123,59.2298 65.9996,59.9902L65.9996,62.7286C66.0123,63.489 65.744,64.2274 65.2459,64.8024C64.7478,65.3774 64.055,65.7485 63.3001,65.8447C62.8844,65.886 62.4645,65.8402 62.0675,65.7101C61.6705,65.58 61.305,65.3685 60.9944,65.0892C60.6838,64.8099 60.435,64.4688 60.2637,64.0879C60.0925,63.707 60.0027,63.2946 60.0001,62.877L60.0001,59.8823Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M41.0,66.8594C44.866,66.8594 48.0,63.5016 48.0,59.3594C48.0,55.2173 44.866,51.8594 41.0,51.8594C37.134,51.8594 34.0,55.2173 34.0,59.3594C34.0,63.5016 37.134,66.8594 41.0,66.8594Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M19.3165,94.853C19.1171,94.8538 18.9202,94.8096 18.7406,94.7235C18.5611,94.6375 18.4037,94.512 18.2804,94.3566C18.1572,94.2012 18.0713,94.02 18.0293,93.8267C17.9874,93.6334 17.9905,93.4332 18.0383,93.2413C20.6603,82.6935 30.1452,74.3944 39.912,74.3944C49.823,74.3944 56.4041,82.9405 55.0276,93.7092C54.9905,94.0274 54.8361,94.3208 54.5942,94.5331C54.3522,94.7454 54.0397,94.8616 53.7166,94.8595L19.3165,94.853Z"
-        android:fillColor="#FBBC05"/>
-    <path
-        android:pathData="M41.7209,74.3944C33.7578,74.3944 27.3023,67.939 27.3023,59.9758C27.3023,52.0126 33.7578,45.5572 41.7209,45.5572C49.6841,45.5572 56.1395,52.0126 56.1395,59.9758C56.1395,67.939 49.6841,74.3944 41.7209,74.3944Z"
-        android:fillColor="#D59E91"/>
-    <path
-        android:pathData="M27.3023,59.5107C24.8352,59.5107 22.4691,60.5455 20.7246,62.3875C18.9801,64.2295 18.0,66.7278 18.0,69.3327L18.0,73.0553C18.0,73.4105 18.1336,73.7511 18.3714,74.0022C18.6093,74.2533 18.9319,74.3944 19.2682,74.3944L26.0341,74.3944C26.3705,74.3944 26.693,74.2533 26.9309,74.0022C27.1687,73.7511 27.3023,73.4105 27.3023,73.0553L27.3023,59.5107Z"
-        android:fillColor="#D9DBDF"/>
-    <path
-        android:pathData="M57.4766,55.1029L53.3488,53.9293L54.7525,59.5107L57.7779,56.2901C57.8692,56.2061 57.9365,56.0964 57.9719,55.9736C58.0072,55.8507 58.0093,55.7197 57.9778,55.5957C57.9463,55.4716 57.8826,55.3596 57.7939,55.2724C57.7053,55.1852 57.5953,55.1264 57.4766,55.1029L57.4766,55.1029Z"
-        android:fillColor="#D59E91"/>
-    <path
-        android:pathData="M41.2558,45.5572C41.2558,49.5046 39.7857,53.2903 37.1689,56.0816C34.5521,58.8728 31.003,60.4409 27.3023,60.4409C27.3023,56.4935 28.7724,52.7078 31.3892,49.9165C34.006,47.1253 37.5551,45.5572 41.2558,45.5572L41.2558,45.5572Z"
-        android:fillColor="#D9DBDF"/>
-    <path
-        android:pathData="M49.92,60.8349C51.1333,62.8 52.9194,64.2407 54.9884,64.8785L55.4303,63.4451C53.7411,62.9244 52.2376,61.7334 51.1963,60.0469L49.92,60.8349Z"
-        android:fillColor="#606368"/>
-    <path
-        android:pathData="M126.836,34.3968C126.803,33.0165 125.657,31.924 124.277,31.9566C122.033,32.0096 118.483,31.2834 115.492,29.017C112.609,26.8319 110.065,23.0845 109.846,16.6608C109.799,15.2808 108.642,14.2003 107.262,14.2474C105.882,14.2944 104.802,15.4512 104.849,16.8311C105.117,24.7016 108.344,29.8735 112.472,33.0019C116.493,36.0492 121.194,37.0308 124.395,36.9552C125.776,36.9226 126.868,35.7772 126.836,34.3968Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M128.906,27.0953C128.873,25.7149 127.728,24.6224 126.347,24.655C125.089,24.6847 123.034,24.2678 121.313,22.9639C119.7,21.7412 118.201,19.6093 118.07,15.7745C118.023,14.3946 116.866,13.314 115.486,13.3611C114.106,13.4081 113.026,14.5649 113.073,15.9448C113.253,21.2263 115.435,24.7827 118.293,26.9488C121.044,29.0336 124.25,29.7059 126.465,29.6536C127.846,29.621 128.938,28.4756 128.906,27.0953Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M130.481,19.363C130.448,17.9826 129.303,16.8901 127.923,16.9227C127.7,16.928 127.212,16.8357 126.824,16.5417C126.543,16.3289 126.141,15.8922 126.103,14.7742C126.056,13.3943 124.899,12.3138 123.519,12.3608C122.14,12.4079 121.059,13.5647 121.106,14.9446C121.194,17.5092 122.278,19.3704 123.804,20.5266C125.222,21.6015 126.86,21.9492 128.041,21.9213C129.421,21.8887 130.513,20.7433 130.481,19.363Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M107.96,58.595C112.653,58.7207 116.559,55.0185 116.685,50.3257L116.685,50.3257C116.811,45.633 113.108,41.7268 108.416,41.6011L108.416,41.6011C103.723,41.4753 99.8166,45.1776 99.6909,49.8703L99.6909,49.8703C99.5651,54.563 103.267,58.4692 107.96,58.595L107.96,58.595Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M90.5558,36.1209C95.2485,36.2466 99.1547,32.5444 99.2805,27.8516L99.2805,27.8516C99.4062,23.1589 95.704,19.2527 91.0112,19.127L91.0112,19.127C86.3185,19.0012 82.4123,22.7034 82.2866,27.3962L82.2866,27.3962C82.1608,32.0889 85.863,35.9951 90.5558,36.1209L90.5558,36.1209Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M91.3727,51.6961C96.7613,56.4583 103.345,58.3574 107.886,58.592L108.195,52.6C104.802,52.4247 99.572,50.935 95.3459,47.2002C91.2407,43.5723 87.8768,37.6527 88.2704,28.0988L82.2755,27.8518C81.8104,39.1413 85.863,46.8271 91.3727,51.6961Z"
-        android:fillColor="#4285F4"/>
-</vector>
diff --git a/res/drawable/zen_calls_none.xml b/res/drawable/zen_calls_none.xml
deleted file mode 100644
index e89da49d7b6..00000000000
--- a/res/drawable/zen_calls_none.xml
+++ /dev/null
@@ -1,39 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M105.975,51.3487C105.931,49.4783 104.379,47.9979 102.508,48.0421C99.4675,48.1139 94.6568,47.1298 90.6046,44.0588C86.6976,41.0979 83.2499,36.02 82.9531,27.3155C82.8894,25.4457 81.3219,23.9815 79.4521,24.0453C77.5822,24.109 76.1181,25.6765 76.1818,27.5463C76.5454,38.2112 80.9186,45.2194 86.5123,49.4586C91.9607,53.5877 98.3304,54.9179 102.668,54.8154C104.539,54.7712 106.019,53.2191 105.975,51.3487Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M108.78,41.4548C108.736,39.5844 107.184,38.1039 105.313,38.1481C103.609,38.1884 100.823,37.6235 98.4918,35.8566C96.3056,34.1997 94.2744,31.3109 94.0973,26.1146C94.0335,24.2447 92.466,22.7806 90.5962,22.8443C88.7263,22.9081 87.2622,24.4755 87.3259,26.3454C87.5699,33.502 90.5266,38.3212 94.3995,41.2563C98.1272,44.0814 102.472,44.9924 105.473,44.9215C107.344,44.8773 108.824,43.3252 108.78,41.4548Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M110.915,30.9772C110.87,29.1068 109.318,27.6263 107.448,27.6705C107.146,27.6777 106.485,27.5526 105.96,27.1542C105.579,26.8658 105.034,26.2741 104.983,24.7592C104.919,22.8893 103.352,21.4252 101.482,21.489C99.6118,21.5527 98.1477,23.1202 98.2114,24.99C98.3299,28.4653 99.8001,30.9873 101.867,32.5539C103.789,34.0105 106.009,34.4816 107.608,34.4439C109.478,34.3997 110.959,32.8476 110.915,30.9772Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M80.3979,84.1388C86.7568,84.3092 92.0498,79.2924 92.2203,72.9336L92.2203,72.9336C92.3907,66.5747 87.3739,61.2816 81.0151,61.1112L81.0151,61.1112C74.6562,60.9408 69.3631,65.9575 69.1927,72.3164L69.1927,72.3164C69.0223,78.6753 74.039,83.9683 80.3979,84.1388L80.3979,84.1388Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M56.8143,53.685C63.1732,53.8554 68.4662,48.8386 68.6366,42.4798L68.6366,42.4798C68.8071,36.1209 63.7903,30.8278 57.4314,30.6574L57.4314,30.6574C51.0726,30.487 45.7795,35.5037 45.6091,41.8626L45.6091,41.8626C45.4387,48.2215 50.4554,53.5145 56.8143,53.685L56.8143,53.685Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M57.9211,74.7903C65.223,81.2433 74.1437,83.8166 80.2969,84.1345L80.7165,76.0151C76.1182,75.7775 69.0316,73.759 63.305,68.6981C57.7423,63.7821 53.1841,55.7607 53.7174,42.8147L45.594,42.4801C44.9638,57.7778 50.4553,68.1924 57.9211,74.7903Z"
-        android:fillColor="#4285F4"/>
-</vector>
diff --git a/res/drawable/zen_calls_starred.xml b/res/drawable/zen_calls_starred.xml
deleted file mode 100644
index 25e9a6193eb..00000000000
--- a/res/drawable/zen_calls_starred.xml
+++ /dev/null
@@ -1,69 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M111.836,30.3968C111.803,29.0164 110.657,27.9239 109.277,27.9565C107.033,28.0095 103.483,27.2833 100.492,25.017C97.6091,22.8319 95.0647,19.0845 94.8457,12.6607C94.7987,11.2808 93.6419,10.2003 92.262,10.2473C90.8821,10.2944 89.8016,11.4511 89.8486,12.831C90.1169,20.7015 93.3443,25.8734 97.4723,29.0019C101.493,32.0491 106.194,33.0307 109.395,32.9551C110.776,32.9225 111.868,31.7771 111.836,30.3968Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M113.906,23.0952C113.873,21.7149 112.728,20.6223 111.347,20.6549C110.089,20.6847 108.033,20.2678 106.313,18.9638C104.7,17.7411 103.201,15.6092 103.07,11.7744C103.023,10.3945 101.866,9.31399 100.486,9.36103C99.1062,9.40807 98.0257,10.5648 98.0728,11.9448C98.2528,17.2262 100.435,20.7827 103.293,22.9487C106.044,25.0336 109.25,25.7059 111.465,25.6535C112.846,25.6209 113.938,24.4755 113.906,23.0952Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M115.481,15.363C115.448,13.9826 114.303,12.8901 112.923,12.9227C112.7,12.928 112.212,12.8357 111.824,12.5417C111.543,12.3289 111.141,11.8922 111.103,10.7742C111.056,9.3943 109.899,8.3138 108.519,8.36084C107.14,8.40788 106.059,9.56465 106.106,10.9446C106.194,13.5092 107.278,15.3704 108.804,16.5266C110.222,17.6015 111.86,17.9492 113.041,17.9213C114.421,17.8887 115.513,16.7433 115.481,15.363Z"
-        android:fillColor="#DADCE0"/>
-    <path
-        android:pathData="M81.711,91.8593C81.8867,91.8596 82.0605,91.8236 82.2219,91.7536C82.3833,91.6836 82.5287,91.5811 82.6492,91.4522C82.7698,91.3234 82.8629,91.1711 82.9228,91.0046C82.9827,90.8382 83.0082,90.6611 82.9977,90.4843C82.3543,79.524 74.229,70.8595 64.2831,70.8595C62.0236,70.8477 59.7843,71.2886 57.6953,72.1566C55.7332,72.9849 53.6272,73.4115 51.5,73.4115C49.3728,73.4115 47.2668,72.9849 45.3047,72.1566C43.2157,71.2886 40.9764,70.8477 38.7169,70.8595C28.771,70.8595 20.6392,79.524 20.0023,90.4843C19.9918,90.6611 20.0173,90.8382 20.0772,91.0046C20.1371,91.1711 20.2302,91.3234 20.3508,91.4522C20.4713,91.5811 20.6167,91.6836 20.7781,91.7536C20.9395,91.8236 21.1133,91.8596 21.289,91.8593L81.711,91.8593Z"
-        android:fillColor="#34A853"/>
-    <path
-        android:pathData="M52.0,41.8593C55.7401,41.9397 59.3003,43.5027 61.9173,46.2132C64.5344,48.9237 66.0,52.566 66.0,56.3593C66.0,60.1525 64.5344,63.7948 61.9173,66.5053C59.3003,69.2158 55.7401,70.7788 52.0,70.8593L52.0,41.8593Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M67.0,48.341L64.6967,52.8593L63.0,47.8593L67.0,48.341Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M52.0,70.8593C47.9927,70.7788 44.1783,69.2158 41.3743,66.5053C38.5703,63.7948 37.0,60.1525 37.0,56.3593C37.0,52.566 38.5703,48.9237 41.3743,46.2132C44.1783,43.5027 47.9927,41.9397 52.0,41.8593L52.0,70.8593Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M65.4697,49.3896L58.4697,42.3896L59.5303,41.3289L66.5303,48.3289L65.4697,49.3896Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M50.4932,56.3064L62.4932,45.3064L63.5068,46.4121L51.5068,57.4121L50.4932,56.3064Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M49.0001,56.8821C48.9971,56.4612 49.0827,56.0443 49.2514,55.6585C49.4201,55.2728 49.6682,54.9268 49.9794,54.6431C50.2906,54.3594 50.6581,54.1443 51.0579,54.0118C51.4577,53.8793 51.881,53.8323 52.3001,53.874C53.055,53.9702 53.7478,54.3413 54.2459,54.9163C54.744,55.4912 55.0123,56.2296 54.9996,56.9901L54.9996,59.7284C55.0123,60.4889 54.744,61.2273 54.2459,61.8022C53.7478,62.3772 53.055,62.7483 52.3001,62.8445C51.8844,62.8858 51.4645,62.84 51.0675,62.7099C50.6705,62.5798 50.305,62.3683 49.9944,62.089C49.6838,61.8097 49.435,61.4687 49.2637,61.0878C49.0925,60.7068 49.0027,60.2944 49.0001,59.8768L49.0001,56.8821Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M30.0,63.8593C33.866,63.8593 37.0,60.5014 37.0,56.3593C37.0,52.2171 33.866,48.8593 30.0,48.8593C26.134,48.8593 23.0,52.2171 23.0,56.3593C23.0,60.5014 26.134,63.8593 30.0,63.8593Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M63.3654,97.1463L62.0966,95.9913C57.5904,91.905 54.6154,89.21 54.6154,85.9025C54.6154,83.2075 56.7329,81.09 59.4279,81.09C60.9504,81.09 62.4116,81.7988 63.3654,82.9188C64.3191,81.7988 65.7804,81.09 67.3029,81.09C69.9979,81.09 72.1154,83.2075 72.1154,85.9025C72.1154,89.21 69.1404,91.905 64.6341,96.0L63.3654,97.1463Z"
-        android:fillColor="#FF0000"/>
-    <path
-        android:pathData="M59.4279,81.59C57.009,81.59 55.1154,83.4837 55.1154,85.9025C55.1154,87.392 55.7807,88.7826 57.0532,90.3383C58.3313,91.901 60.1693,93.5686 62.4325,95.6209L63.3666,96.4713L64.2978,95.63L64.2989,95.629L64.3056,95.623C66.5653,93.5694 68.4006,91.9017 69.6774,90.3395C70.95,88.7827 71.6154,87.392 71.6154,85.9025C71.6154,83.4837 69.7217,81.59 67.3029,81.59C65.9318,81.59 64.608,82.2307 63.746,83.2429L63.3654,83.69L62.9847,83.2429C62.1227,82.2307 60.799,81.59 59.4279,81.59ZM54.1154,85.9025C54.1154,82.9314 56.4567,80.59 59.4279,80.59C60.9099,80.59 62.3329,81.1989 63.3654,82.1906C64.3978,81.1989 65.8209,80.59 67.3029,80.59C70.274,80.59 72.6154,82.9314 72.6154,85.9025C72.6154,87.7205 71.7932,89.3311 70.4517,90.9724C69.1278,92.5921 67.247,94.3012 65.0299,96.316L64.9704,96.3701L64.9693,96.371L63.3641,97.8213L61.7607,96.3617L61.7237,96.3281C59.4967,94.3087 57.6076,92.5957 56.2791,90.9714C54.9375,89.3312 54.1154,87.7205 54.1154,85.9025Z"
-        android:fillColor="#FFFFFF"/>
-    <path
-        android:pathData="M92.9601,54.5949C97.6528,54.7207 101.559,51.0184 101.685,46.3257L101.685,46.3257C101.811,41.6329 98.1083,37.7268 93.4155,37.601L93.4155,37.601C88.7228,37.4752 84.8166,41.1775 84.6909,45.8702L84.6909,45.8702C84.5651,50.563 88.2673,54.4691 92.9601,54.5949L92.9601,54.5949Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M75.5558,32.1208C80.2485,32.2466 84.1547,28.5443 84.2805,23.8516L84.2805,23.8516C84.4062,19.1588 80.704,15.2527 76.0112,15.1269L76.0112,15.1269C71.3185,15.0011 67.4123,18.7034 67.2866,23.3961L67.2866,23.3961C67.1608,28.0889 70.863,31.995 75.5558,32.1208L75.5558,32.1208Z"
-        android:fillColor="#4285F4"/>
-    <path
-        android:pathData="M76.3727,47.6961C81.7613,52.4583 88.3447,54.3573 92.8856,54.592L93.1953,48.6C89.8018,48.4246 84.572,46.935 80.3459,43.2002C76.2407,39.5722 72.8768,33.6526 73.2704,24.0987L67.2755,23.8517C66.8104,35.1412 70.863,42.827 76.3727,47.6961Z"
-        android:fillColor="#4285F4"/>
-</vector>
diff --git a/res/drawable/zen_messages_any.xml b/res/drawable/zen_messages_any.xml
deleted file mode 100644
index edeaea2726c..00000000000
--- a/res/drawable/zen_messages_any.xml
+++ /dev/null
@@ -1,45 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M133.0,17.0L122.0,17.0L122.0,29.0L133.0,29.0L133.0,17.0Z"
-        android:fillColor="#E7E9EC"/>
-    <path
-        android:pathData="M121.916,35.0L98.0884,35.0C96.6326,34.9992 95.1908,35.296 93.8455,35.8735C92.5003,36.4511 91.2778,37.298 90.2481,38.366C89.2184,39.4339 88.4015,40.702 87.8442,42.0976C87.2869,43.4933 87.0,44.9893 87.0,46.5L87.0,58.0L121.629,58.0C127.859,58.0 133.11,52.7251 132.998,46.2802C132.943,43.2685 131.751,40.3996 129.678,38.2902C127.606,36.1808 124.819,34.9995 121.916,35.0L121.916,35.0Z"
-        android:fillColor="#437CF6"/>
-    <path
-        android:pathData="M64.0,18.5C64.0,12.701 68.701,8.0 74.5,8.0L122.5,8.0C128.299,8.0 133.0,12.701 133.0,18.5L133.0,18.5C133.0,24.299 128.299,29.0 122.5,29.0L74.5,29.0C68.701,29.0 64.0,24.299 64.0,18.5L64.0,18.5Z"
-        android:fillColor="#E7E9EC"/>
-    <path
-        android:pathData="M94.7117,98.0C94.8874,98.0003 95.0613,97.9644 95.2226,97.8944C95.384,97.8244 95.5294,97.7218 95.65,97.593C95.7705,97.4642 95.8636,97.3119 95.9235,97.1454C95.9835,96.9789 96.009,96.8019 95.9984,96.6251C95.3551,85.6647 87.2298,77.0002 77.2838,77.0002C75.0243,76.9884 72.7851,77.4293 70.696,78.2973C68.7339,79.1257 66.628,79.5523 64.5007,79.5523C62.3735,79.5523 60.2675,79.1257 58.3054,78.2973C56.2164,77.4293 53.9771,76.9884 51.7177,77.0002C41.7717,77.0002 33.64,85.6647 33.0031,96.6251C32.9925,96.8019 33.018,96.9789 33.0779,97.1454C33.1378,97.3119 33.2309,97.4642 33.3515,97.593C33.472,97.7218 33.6175,97.8244 33.7788,97.8944C33.9402,97.9644 34.1141,98.0003 34.2897,98.0L94.7117,98.0Z"
-        android:fillColor="#9AA0A6"/>
-    <path
-        android:pathData="M63.0179,98.0C63.1518,98.0003 63.2842,97.9644 63.4072,97.8944C63.5301,97.8244 63.6409,97.7218 63.7328,97.593C63.8246,97.4642 63.8955,97.3119 63.9412,97.1454C63.9869,96.9789 64.0063,96.8019 63.9982,96.6251C63.5081,85.6647 57.3174,77.0002 49.7395,77.0002C48.018,76.9884 46.3119,77.4293 44.7202,78.2973C43.2253,79.1257 41.6207,79.5523 40.0,79.5523C38.3793,79.5523 36.7747,79.1257 35.2798,78.2973C33.6881,77.4293 31.982,76.9884 30.2605,77.0002C22.6826,77.0002 16.487,85.6647 16.0018,96.6251C15.9937,96.8019 16.0131,96.9789 16.0588,97.1454C16.1045,97.3119 16.1754,97.4642 16.2672,97.593C16.3591,97.7218 16.4699,97.8244 16.5928,97.8944C16.7158,97.9644 16.8482,98.0003 16.9821,98.0L63.0179,98.0Z"
-        android:fillColor="#BDC1C6"/>
-    <path
-        android:pathData="M43.0007,70.0C46.8667,70.0 50.0007,66.6421 50.0007,62.5C50.0007,58.3579 46.8667,55.0 43.0007,55.0C39.1347,55.0 36.0007,58.3579 36.0007,62.5C36.0007,66.6421 39.1347,70.0 43.0007,70.0Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M64.4193,76.8372C56.4561,76.8372 50.0007,70.3818 50.0007,62.4186C50.0007,54.4554 56.4561,48.0 64.4193,48.0C72.3825,48.0 78.8379,54.4554 78.8379,62.4186C78.8379,70.3818 72.3825,76.8372 64.4193,76.8372Z"
-        android:fillColor="#9AA0A6"/>
-    <path
-        android:pathData="M40.4186,76.8372C32.4554,76.8372 26.0,70.3818 26.0,62.4186C26.0,54.4554 32.4554,48.0 40.4186,48.0C48.3818,48.0 54.8372,54.4554 54.8372,62.4186C54.8372,70.3818 48.3818,76.8372 40.4186,76.8372Z"
-        android:fillColor="#BDC1C6"/>
-</vector>
diff --git a/res/drawable/zen_messages_contacts.xml b/res/drawable/zen_messages_contacts.xml
deleted file mode 100644
index 8da80b94a0b..00000000000
--- a/res/drawable/zen_messages_contacts.xml
+++ /dev/null
@@ -1,72 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M131.0,17.0L120.0,17.0L120.0,29.0L131.0,29.0L131.0,17.0Z"
-        android:fillColor="#E7E9EC"/>
-    <path
-        android:pathData="M119.916,35.0L96.0884,35.0C94.6326,34.9992 93.1908,35.296 91.8455,35.8735C90.5003,36.4511 89.2778,37.298 88.2481,38.366C87.2184,39.4339 86.4015,40.702 85.8442,42.0976C85.2869,43.4933 85.0,44.9893 85.0,46.5L85.0,58.0L119.629,58.0C125.859,58.0 131.11,52.7251 130.998,46.2802C130.943,43.2685 129.751,40.3996 127.678,38.2902C125.606,36.1808 122.819,34.9995 119.916,35.0L119.916,35.0Z"
-        android:fillColor="#437CF6"/>
-    <path
-        android:pathData="M92.711,98.0C92.8867,98.0003 93.0605,97.9644 93.2219,97.8944C93.3833,97.8244 93.5287,97.7218 93.6492,97.593C93.7698,97.4642 93.8629,97.3119 93.9228,97.1454C93.9827,96.9789 94.0082,96.8019 93.9977,96.6251C93.3543,85.6647 85.229,77.0002 75.2831,77.0002C73.0236,76.9884 70.7843,77.4293 68.6953,78.2973C66.7332,79.1257 64.6272,79.5523 62.5,79.5523C60.3728,79.5523 58.2668,79.1257 56.3047,78.2973C54.2157,77.4293 51.9764,76.9884 49.7169,77.0002C39.771,77.0002 31.6392,85.6647 31.0023,96.6251C30.9918,96.8019 31.0173,96.9789 31.0772,97.1454C31.1371,97.3119 31.2302,97.4642 31.3508,97.593C31.4713,97.7218 31.6167,97.8244 31.7781,97.8944C31.9395,97.9644 32.1133,98.0003 32.289,98.0L92.711,98.0Z"
-        android:fillColor="#34A853"/>
-    <path
-        android:pathData="M63.0,48.0C66.7401,48.0804 70.3003,49.6434 72.9173,52.354C75.5344,55.0645 77.0,58.7068 77.0,62.5C77.0,66.2932 75.5344,69.9355 72.9173,72.646C70.3003,75.3566 66.7401,76.9196 63.0,77.0L63.0,48.0Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M78.0,54.4818L75.6967,59.0L74.0,54.0L78.0,54.4818Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M63.0,77.0C58.9927,76.9196 55.1783,75.3566 52.3743,72.646C49.5703,69.9355 48.0,66.2932 48.0,62.5C48.0,58.7068 49.5703,55.0645 52.3743,52.354C55.1783,49.6434 58.9927,48.0804 63.0,48.0L63.0,77.0Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M76.4697,55.5304L69.4697,48.5304L70.5303,47.4697L77.5303,54.4697L76.4697,55.5304Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M61.4932,62.4471L73.4932,51.4471L74.5068,52.5529L62.5068,63.5529L61.4932,62.4471Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M60.0001,63.0229C59.9971,62.6019 60.0827,62.185 60.2514,61.7993C60.4201,61.4135 60.6682,61.0675 60.9794,60.7838C61.2906,60.5001 61.6581,60.285 62.0579,60.1525C62.4577,60.02 62.881,59.9731 63.3001,60.0147C64.055,60.1109 64.7478,60.482 65.2459,61.057C65.744,61.632 66.0123,62.3704 65.9996,63.1308L65.9996,65.8692C66.0123,66.6296 65.744,67.368 65.2459,67.943C64.7478,68.518 64.055,68.8891 63.3001,68.9853C62.8844,69.0266 62.4645,68.9807 62.0675,68.8506C61.6705,68.7205 61.305,68.5091 60.9944,68.2297C60.6838,67.9504 60.435,67.6094 60.2637,67.2285C60.0925,66.8476 60.0027,66.4351 60.0001,66.0176L60.0001,63.0229Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M41.0,70.0C44.866,70.0 48.0,66.6421 48.0,62.5C48.0,58.3579 44.866,55.0 41.0,55.0C37.134,55.0 34.0,58.3579 34.0,62.5C34.0,66.6421 37.134,70.0 41.0,70.0Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M62.0,18.5C62.0,12.701 66.701,8.0 72.5,8.0L120.5,8.0C126.299,8.0 131.0,12.701 131.0,18.5L131.0,18.5C131.0,24.299 126.299,29.0 120.5,29.0L72.5,29.0C66.701,29.0 62.0,24.299 62.0,18.5L62.0,18.5Z"
-        android:fillColor="#E7E9EC"/>
-    <path
-        android:pathData="M19.3165,97.9935C19.1171,97.9943 18.9202,97.9501 18.7406,97.864C18.5611,97.778 18.4037,97.6525 18.2804,97.4971C18.1572,97.3417 18.0713,97.1605 18.0293,96.9672C17.9874,96.7739 17.9905,96.5737 18.0383,96.3818C20.6603,85.834 30.1452,77.5349 39.912,77.5349C49.823,77.5349 56.4041,86.081 55.0276,96.8497C54.9905,97.1679 54.8361,97.4613 54.5942,97.6736C54.3522,97.8859 54.0397,98.0021 53.7166,98.0L19.3165,97.9935Z"
-        android:fillColor="#FBBC05"/>
-    <path
-        android:pathData="M41.7209,77.535C33.7578,77.535 27.3023,71.0795 27.3023,63.1164C27.3023,55.1532 33.7578,48.6978 41.7209,48.6978C49.6841,48.6978 56.1395,55.1532 56.1395,63.1164C56.1395,71.0795 49.6841,77.535 41.7209,77.535Z"
-        android:fillColor="#D59E91"/>
-    <path
-        android:pathData="M27.3023,62.6512C24.8352,62.6512 22.4691,63.6861 20.7246,65.5281C18.9801,67.3701 18.0,69.8683 18.0,72.4733L18.0,76.1959C18.0,76.551 18.1336,76.8916 18.3714,77.1428C18.6093,77.3939 18.9319,77.535 19.2682,77.535L26.0341,77.535C26.3705,77.535 26.693,77.3939 26.9309,77.1428C27.1687,76.8916 27.3023,76.551 27.3023,76.1959L27.3023,62.6512Z"
-        android:fillColor="#D9DBDF"/>
-    <path
-        android:pathData="M57.4766,58.2434L53.3488,57.0698L54.7525,62.6512L57.7779,59.4307C57.8692,59.3467 57.9365,59.237 57.9719,59.1141C58.0072,58.9913 58.0093,58.8603 57.9778,58.7362C57.9463,58.6122 57.8826,58.5001 57.7939,58.4129C57.7053,58.3258 57.5953,58.267 57.4766,58.2434L57.4766,58.2434Z"
-        android:fillColor="#D59E91"/>
-    <path
-        android:pathData="M41.2558,48.6978C41.2558,52.6452 39.7857,56.4309 37.1689,59.2221C34.5521,62.0134 31.003,63.5815 27.3023,63.5815C27.3023,59.6341 28.7724,55.8483 31.3892,53.0571C34.006,50.2659 37.5551,48.6978 41.2558,48.6978L41.2558,48.6978Z"
-        android:fillColor="#D9DBDF"/>
-    <path
-        android:pathData="M49.92,63.9755C51.1333,65.9406 52.9194,67.3813 54.9884,68.0192L55.4303,66.5857C53.7411,66.065 52.2376,64.874 51.1963,63.1875L49.92,63.9755Z"
-        android:fillColor="#606368"/>
-</vector>
diff --git a/res/drawable/zen_messages_none.xml b/res/drawable/zen_messages_none.xml
deleted file mode 100644
index c72cc4f133c..00000000000
--- a/res/drawable/zen_messages_none.xml
+++ /dev/null
@@ -1,30 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M126.0,32.6086L111.812,32.6086L111.812,48.0869L126.0,48.0869L126.0,32.6086Z"
-        android:fillColor="#E7E9EC"/>
-    <path
-        android:pathData="M111.703,55.8261L80.9691,55.8261C79.0913,55.825 77.2316,56.2078 75.4964,56.9528C73.7612,57.6977 72.1845,58.7902 70.8563,60.1677C69.5281,61.5452 68.4744,63.1808 67.7556,64.981C67.0367,66.7812 66.6667,68.7107 66.6667,70.6594L66.6667,85.4927L111.334,85.4927C119.369,85.4927 126.142,78.6889 125.998,70.3759C125.926,66.4912 124.389,62.7907 121.716,60.0699C119.043,57.3492 115.448,55.8253 111.703,55.8261L111.703,55.8261Z"
-        android:fillColor="#437CF6"/>
-    <path
-        android:pathData="M37.0,34.5435C37.0,27.0636 43.0636,21.0 50.5435,21.0L112.457,21.0C119.936,21.0 126.0,27.0636 126.0,34.5435L126.0,34.5435C126.0,42.0233 119.936,48.087 112.457,48.087L50.5435,48.087C43.0636,48.087 37.0,42.0233 37.0,34.5435L37.0,34.5435Z"
-        android:fillColor="#E7E9EC"/>
-</vector>
diff --git a/res/drawable/zen_messages_starred.xml b/res/drawable/zen_messages_starred.xml
deleted file mode 100644
index 75feb80d711..00000000000
--- a/res/drawable/zen_messages_starred.xml
+++ /dev/null
@@ -1,60 +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.
--->
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-        android:width="149.0dp"
-        android:height="106.0dp"
-        android:viewportWidth="149.0"
-        android:viewportHeight="106.0">
-    <path
-        android:pathData="M124.0,15.0L113.0,15.0L113.0,27.0L124.0,27.0L124.0,15.0Z"
-        android:fillColor="#E7E9EC"/>
-    <path
-        android:pathData="M112.916,33.0L89.0884,33.0C87.6326,32.9992 86.1908,33.296 84.8455,33.8735C83.5003,34.4511 82.2778,35.298 81.2481,36.366C80.2184,37.4339 79.4015,38.702 78.8442,40.0976C78.2869,41.4933 78.0,42.9893 78.0,44.5L78.0,56.0L112.629,56.0C118.859,56.0 124.11,50.7251 123.998,44.2802C123.943,41.2685 122.751,38.3996 120.678,36.2902C118.606,34.1808 115.819,32.9995 112.916,33.0L112.916,33.0Z"
-        android:fillColor="#437CF6"/>
-    <path
-        android:pathData="M85.711,96.0C85.8867,96.0003 86.0605,95.9644 86.2219,95.8944C86.3833,95.8244 86.5287,95.7218 86.6492,95.593C86.7698,95.4642 86.8629,95.3119 86.9228,95.1454C86.9827,94.9789 87.0082,94.8019 86.9977,94.6251C86.3543,83.6647 78.229,75.0002 68.2831,75.0002C66.0236,74.9884 63.7843,75.4293 61.6953,76.2973C59.7332,77.1257 57.6272,77.5523 55.5,77.5523C53.3728,77.5523 51.2668,77.1257 49.3047,76.2973C47.2157,75.4293 44.9764,74.9884 42.7169,75.0002C32.771,75.0002 24.6392,83.6647 24.0023,94.6251C23.9918,94.8019 24.0173,94.9789 24.0772,95.1454C24.1371,95.3119 24.2302,95.4642 24.3508,95.593C24.4713,95.7218 24.6167,95.8244 24.7781,95.8944C24.9395,95.9644 25.1133,96.0003 25.289,96.0L85.711,96.0Z"
-        android:fillColor="#34A853"/>
-    <path
-        android:pathData="M56.0,46.0C59.7401,46.0804 63.3003,47.6434 65.9173,50.354C68.5344,53.0645 70.0,56.7068 70.0,60.5C70.0,64.2932 68.5344,67.9355 65.9173,70.646C63.3003,73.3566 59.7401,74.9196 56.0,75.0L56.0,46.0Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M71.0,52.4818L68.6967,57.0L67.0,52.0L71.0,52.4818Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M56.0,75.0C51.9927,74.9196 48.1783,73.3566 45.3743,70.646C42.5703,67.9355 41.0,64.2932 41.0,60.5C41.0,56.7068 42.5703,53.0645 45.3743,50.354C48.1783,47.6434 51.9927,46.0804 56.0,46.0L56.0,75.0Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M69.4697,53.5304L62.4697,46.5304L63.5303,45.4697L70.5303,52.4697L69.4697,53.5304Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M54.4932,60.4471L66.4932,49.4471L67.5068,50.5529L55.5068,61.5529L54.4932,60.4471Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M53.0001,61.0229C52.9971,60.6019 53.0827,60.185 53.2514,59.7993C53.4201,59.4135 53.6682,59.0675 53.9794,58.7838C54.2906,58.5001 54.6581,58.285 55.0579,58.1525C55.4577,58.02 55.881,57.9731 56.3001,58.0147C57.055,58.1109 57.7478,58.482 58.2459,59.057C58.744,59.632 59.0123,60.3704 58.9996,61.1308L58.9996,63.8692C59.0123,64.6296 58.744,65.368 58.2459,65.943C57.7478,66.518 57.055,66.8891 56.3001,66.9853C55.8844,67.0266 55.4645,66.9807 55.0675,66.8506C54.6705,66.7205 54.305,66.5091 53.9944,66.2297C53.6838,65.9504 53.435,65.6094 53.2637,65.2285C53.0925,64.8476 53.0027,64.4351 53.0001,64.0176L53.0001,61.0229Z"
-        android:fillColor="#AF735B"/>
-    <path
-        android:pathData="M34.0,68.0C37.866,68.0 41.0,64.6421 41.0,60.5C41.0,56.3579 37.866,53.0 34.0,53.0C30.134,53.0 27.0,56.3579 27.0,60.5C27.0,64.6421 30.134,68.0 34.0,68.0Z"
-        android:fillColor="#2A2952"/>
-    <path
-        android:pathData="M55.0,16.5C55.0,10.701 59.701,6.0 65.5,6.0L113.5,6.0C119.299,6.0 124.0,10.701 124.0,16.5L124.0,16.5C124.0,22.299 119.299,27.0 113.5,27.0L65.5,27.0C59.701,27.0 55.0,22.299 55.0,16.5L55.0,16.5Z"
-        android:fillColor="#E7E9EC"/>
-    <path
-        android:pathData="M66.3654,100.287L65.0966,99.132C60.5904,95.0457 57.6154,92.3507 57.6154,89.0432C57.6154,86.3482 59.7329,84.2307 62.4279,84.2307C63.9504,84.2307 65.4116,84.9395 66.3654,86.0595C67.3191,84.9395 68.7804,84.2307 70.3029,84.2307C72.9979,84.2307 75.1154,86.3482 75.1154,89.0432C75.1154,92.3507 72.1404,95.0457 67.6341,99.1407L66.3654,100.287Z"
-        android:fillColor="#FF0000"/>
-    <path
-        android:pathData="M62.4279,84.7307C60.009,84.7307 58.1154,86.6244 58.1154,89.0432C58.1154,90.5327 58.7807,91.9233 60.0532,93.479C61.3313,95.0417 63.1693,96.7093 65.4325,98.7616L66.3666,99.612L67.2978,98.7707L67.2989,98.7697L67.3056,98.7637C69.5653,96.7101 71.4006,95.0423 72.6774,93.4802C73.95,91.9234 74.6154,90.5327 74.6154,89.0432C74.6154,86.6244 72.7217,84.7307 70.3029,84.7307C68.9318,84.7307 67.608,85.3714 66.746,86.3836L66.3654,86.8307L65.9847,86.3836C65.1227,85.3714 63.799,84.7307 62.4279,84.7307ZM57.1154,89.0432C57.1154,86.0721 59.4567,83.7307 62.4279,83.7307C63.9099,83.7307 65.3329,84.3396 66.3654,85.3313C67.3978,84.3396 68.8209,83.7307 70.3029,83.7307C73.274,83.7307 75.6154,86.0721 75.6154,89.0432C75.6154,90.8612 74.7932,92.4718 73.4517,94.1131C72.1278,95.7328 70.247,97.4419 68.0299,99.4566L67.9704,99.5107L67.9693,99.5117L66.3641,100.962L64.7607,99.5024L64.7237,99.4688C62.4967,97.4494 60.6076,95.7364 59.2791,94.1121C57.9375,92.4719 57.1154,90.8612 57.1154,89.0432Z"
-        android:fillColor="#FFFFFF"/>
-</vector>
diff --git a/res/layout/intent_sender.xml b/res/layout/intent_sender.xml
deleted file mode 100644
index bf8fd6496ce..00000000000
--- a/res/layout/intent_sender.xml
+++ /dev/null
@@ -1,111 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-/* //device/apps/Preferences/assets/res/any/layout/intent_sender.xml
-**
-** Copyright 2006, 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.
-*/
--->
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
-    android:paddingStart="6dip"
-    android:paddingEnd="6dip"
-    android:paddingBottom="3dip"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <LinearLayout
-        android:orientation="vertical"
-        android:layout_width="match_parent"
-        android:layout_height="match_parent">
-
-        <TextView
-                android:textStyle="bold"
-                android:maxLines="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/intent_sender_action_label" />
-
-        <EditText android:id="@+id/intent"
-                android:singleLine="true"
-                android:layout_marginTop="2dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:scrollHorizontally="true"
-                android:capitalize="none"
-                android:autoText="false" />
-
-        <TextView
-                android:textStyle="bold"
-                android:maxLines="1"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/intent_sender_data_label" />
-
-        <EditText android:id="@+id/data"
-                android:singleLine="true"
-                android:layout_marginTop="2dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:scrollHorizontally="true"
-                android:capitalize="none"
-                android:autoText="false" />
-
-        <TextView
-                android:textStyle="bold"
-                android:maxLines="1"
-                android:layout_marginTop="4dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/intent_sender_account_label" />
-
-        <EditText android:id="@+id/account"
-                android:singleLine="true"
-                android:layout_marginTop="2dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:scrollHorizontally="true"
-                android:capitalize="none"
-                android:autoText="false" />
-
-        <TextView
-                android:textStyle="bold"
-                android:maxLines="1"
-                android:layout_marginTop="4dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/intent_sender_resource_label" />
-
-        <EditText android:id="@+id/resource"
-                android:singleLine="true"
-                android:layout_marginTop="2dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:scrollHorizontally="true"
-                android:capitalize="none"
-                android:autoText="false" />
-
-        <Button android:id="@+id/sendbroadcast"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/intent_sender_sendbroadcast_text" />
-
-        <Button android:id="@+id/startactivity"
-                android:layout_marginTop="8dip"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="@string/intent_sender_startactivity_text" />
-    </LinearLayout>
-</ScrollView>
-
diff --git a/res/layout/locale_picker.xml b/res/layout/locale_picker.xml
deleted file mode 100644
index 7fef2ff1636..00000000000
--- a/res/layout/locale_picker.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2008 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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:orientation="vertical"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent">
-
-    <fragment
-        android:id="@+id/locale_picker_fragment"
-        android:name="com.android.settings.LocalePickerFragment"
-        android:layout_width="match_parent"
-        android:layout_height="0dip"
-        android:layout_weight="1" />
-</LinearLayout>
diff --git a/res/layout/zen_mode_senders_image.xml b/res/layout/zen_mode_senders_image.xml
deleted file mode 100644
index 6456b34ac9e..00000000000
--- a/res/layout/zen_mode_senders_image.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/zen_mode_settings_senders_image"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/zen_senders_image_margin_vertical"
-        android:layout_marginBottom="@dimen/zen_senders_image_margin_vertical"/>
-</FrameLayout>
diff --git a/res/menu/misc_files_menu.xml b/res/menu/misc_files_menu.xml
deleted file mode 100644
index 1170ade841a..00000000000
--- a/res/menu/misc_files_menu.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2011 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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item android:id="@+id/action_delete"
-          android:title="@string/delete"
-          android:icon="@drawable/ic_delete"/>
-    <item android:id="@+id/action_select_all"
-          android:title="@string/select_all"
-          android:showAsAction="ifRoom" />
-</menu>
-
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index 8dab7981bdb..901c43778ff 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -23,7 +23,6 @@
     <color name="contextual_card_background">@*android:color/material_grey_900</color>
     <color name="search_bar_background">?androidprv:attr/colorSurfaceVariant</color>
     <color name="notification_importance_button_unselected">#5F6368</color>
-    <color name="notification_history_background">#202124</color>
 
     <!-- Palette list preference colors. -->
     <color name="palette_list_gradient_background">@android:color/black</color>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 80c8821dd26..53acc14f4af 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -143,35 +143,6 @@
         <item>Temporarily avoiding poor connection</item>
     </string-array>
 
-    <!-- Match this with the order of NetworkInfo.DetailedState. --> <skip />
-    <!-- Wi-Fi settings. The status messages when the network is known. -->
-    <string-array name="wifi_status_with_ssid">
-        <!-- Status message of Wi-Fi when it is idle. -->
-        <item></item>
-        <!-- Status message of Wi-Fi when it is scanning. -->
-        <item>Scanning\u2026</item>
-        <!-- Status message of Wi-Fi when it is connecting to a network. -->
-        <item>Connecting to <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
-        <!-- Status message of Wi-Fi when it is authenticating with a network. -->
-        <item>Authenticating with <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
-        <!-- Status message of Wi-Fi when it is obtaining IP address from a network. -->
-        <item>Obtaining IP address from <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
-        <!-- Status message of Wi-Fi when it is connected to a network. -->
-        <item>Connected to <xliff:g id="network_name">%1$s</xliff:g></item>
-        <!-- Status message of Wi-Fi when it is suspended. -->
-        <item>Suspended</item>
-        <!-- Status message of Wi-Fi when it is disconnecting from a network. -->
-        <item>Disconnecting from <xliff:g id="network_name">%1$s</xliff:g>\u2026</item>
-        <!-- Status message of Wi-Fi when it is disconnected. -->
-        <item>Disconnected</item>
-        <!-- Status message of Wi-Fi when it is a failure. -->
-        <item>Unsuccessful</item>
-        <!-- Status message of Wi-Fi when it is blocked. -->
-        <item>Blocked</item>
-        <!-- Status message of Wi-Fi when connectiong is being verified. -->
-        <item>Temporarily avoiding poor connection</item>
-    </string-array>
-
     <!-- Security types for wireless tether -->
     <string-array name="wifi_tether_security">
         <!-- Do not translate. -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 26f08af184a..eacfa2371ee 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -51,7 +51,6 @@
     <dimen name="conversation_icon_size">32dp</dimen>
 
     <dimen name="zen_mode_settings_button_margin_vertical">24dp</dimen>
-    <dimen name="zen_senders_image_margin_vertical">16dp</dimen>
     <dimen name="zen_conversations_image_margin_vertical">24dp</dimen>
     <dimen name="zen_conversations_icon_offset">32dp</dimen>
     <dimen name="zen_conversations_icon_size">50dp</dimen>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index ad471cbf570..f005901e7c9 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -4764,34 +4764,12 @@
     <!-- Do not translate. In the Testing screen. The item title of the activity that shows a bunch of SIM-related operations.  -->
     <string name="testing_sim_toolkit">SIM toolkit</string>
 
-    <!-- Input methods Settings -->
-    <string name="input_methods_settings_title">Text input</string>
-    <!-- Setting name for Input Method chooser -->
-    <string name="input_method">Input method</string>
-    <!-- Title for the option to press to choose the current keyboard, also known as input method [CHAR LIMIT=35] -->
-    <string name="current_input_method">Current Keyboard</string>
-    <!-- Title for setting the visibility of input method selector [CHAR LIMIT=35] -->
-    <string name="input_method_selector">Input method selector</string>
-    <!-- Title for configuring input method settings [CHAR LIMIT=35] -->
-    <string name="configure_input_method">Set up input methods</string>
-    <!-- Title for settings of each IME [CHAR LIMIT=25] -->
-    <string name="input_method_settings">Settings</string>
-    <!-- Spoken description for IME settings image button [CHAR LIMIT=NONE] -->
-    <string name="input_method_settings_button">Settings</string>
-    <!-- Input Methods Settings localized format string for generating the appropriate "Foo settings" menu label for the Input Method named "Foo" [CHAR LIMIT=35] -->
-    <string name="input_methods_settings_label_format"><xliff:g id="ime_name">%1$s</xliff:g> settings</string>
-    <!-- Title for the settings of selecting active input methods of an IME [CHAR LIMIT=35] -->
-    <string name="input_methods_and_subtype_enabler_title">Choose active input methods</string>
-    <!-- Summary for on-screen keyboard settings -->
-    <string name="onscreen_keyboard_settings_summary">Onscreen keyboard settings</string>
     <!-- Summary for default keyboard settings -->
     <string name="keyboard_settings_summary">On-screen keyboard, Speech, Tools</string>
     <!-- Summary for keyboard settings attaching physical_keyboard  -->
     <string name="keyboard_settings_with_physical_keyboard_summary">On-screen keyboard, Physical keyboard, Speech, Tools</string>
     <!-- Title for built-in keyboard settings -->
     <string name="builtin_keyboard_settings_title">Physical keyboard</string>
-    <!-- Summary for built-in keyboard settings -->
-    <string name="builtin_keyboard_settings_summary">Physical keyboard settings</string>
 
     <!-- Title for the screen that lets the user choose a gadget to add to the home screen
          (or other screens that can host gadgets).  Note to translators: we're still determining
@@ -9325,15 +9303,6 @@
     <string name="zen_mode_from_contacts">Contacts</string>
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls or messages option value: From starred contacts only -->
     <string name="zen_mode_from_starred">Starred contacts</string>
-    <!-- [CHAR LIMIT=40] Zen mode settings: Messages option values: From some people (but not all or none), may be contacts or conversations -->
-    <string name="zen_mode_from_some">Some people or conversations</string>
-
-    <!-- Do not disturb settings, calls summary [CHAR LIMIT=100]-->
-    <string name="zen_calls_summary_starred_repeat">From starred contacts and repeat callers</string>
-    <!-- Do not disturb settings, calls summary [CHAR LIMIT=100]-->
-    <string name="zen_calls_summary_contacts_repeat">From contacts and repeat callers</string>
-    <!-- Do not disturb settings, calls summary [CHAR LIMIT=100]-->
-    <string name="zen_calls_summary_repeat_only">From repeat callers only</string>
 
     <!-- [CHAR LIMIT=40] Zen mode settings: Calls option value: No calls allowed -->
     <string name="zen_mode_none_calls">None</string>
diff --git a/res/xml/inapp_notification_settings.xml b/res/xml/inapp_notification_settings.xml
deleted file mode 100644
index 7547f3c1444..00000000000
--- a/res/xml/inapp_notification_settings.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2016 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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto">
-
-    <Preference
-        android:key="app_link"
-        android:title="@string/app_settings_link"
-        android:order="500"
-        settings:allowDividerAbove="true"/>
-
-</PreferenceScreen>
diff --git a/res/xml/input_methods_prefs.xml b/res/xml/input_methods_prefs.xml
deleted file mode 100644
index 9a4f527b65b..00000000000
--- a/res/xml/input_methods_prefs.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-/*
- * Copyright 2008, 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.
- */
--->
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/input_methods_settings_title">
-
-</PreferenceScreen>
diff --git a/src/com/android/settings/notification/zen/ZenModeSendersImagePreferenceController.java b/src/com/android/settings/notification/zen/ZenModeSendersImagePreferenceController.java
deleted file mode 100644
index 6a0cf7acc71..00000000000
--- a/src/com/android/settings/notification/zen/ZenModeSendersImagePreferenceController.java
+++ /dev/null
@@ -1,111 +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.
- */
-
-package com.android.settings.notification.zen;
-
-import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_ANY;
-import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_CONTACTS;
-import static android.app.NotificationManager.Policy.PRIORITY_SENDERS_STARRED;
-
-import android.content.Context;
-import android.widget.ImageView;
-
-import androidx.preference.Preference;
-import androidx.preference.PreferenceScreen;
-
-import com.android.settings.R;
-import com.android.settingslib.core.lifecycle.Lifecycle;
-import com.android.settingslib.widget.LayoutPreference;
-
-/**
- * Common preference controller functionality shared by
- * ZenModeCallsSettings and ZenModeMessagesSettings.
- *
- * Changes the image resource based on the selected senders allowed to bypass DND option for
- * calls or messages.
- */
-public class ZenModeSendersImagePreferenceController
-        extends AbstractZenModePreferenceController {
-
-    private final boolean mIsMessages; // if this is false, then this preference is for calls
-
-    private ImageView mImageView;
-
-    public ZenModeSendersImagePreferenceController(Context context, String key,
-            Lifecycle lifecycle, boolean isMessages) {
-        super(context, key, lifecycle);
-        mIsMessages = isMessages;
-    }
-
-    @Override
-    public void displayPreference(PreferenceScreen screen) {
-        super.displayPreference(screen);
-        LayoutPreference pref = (LayoutPreference) screen.findPreference(KEY);
-        mImageView = (ImageView) pref.findViewById(R.id.zen_mode_settings_senders_image);
-    }
-
-    @Override
-    public boolean isAvailable() {
-        return true;
-    }
-
-    @Override
-    public String getPreferenceKey() {
-        return KEY;
-    }
-
-    @Override
-    public void updateState(Preference preference) {
-        final int currSetting = getPrioritySenders();
-        int newImageRes;
-        CharSequence newContentDescription = "";
-        if (PRIORITY_SENDERS_ANY == currSetting) {
-            newImageRes = mIsMessages
-                    ? R.drawable.zen_messages_any
-                    : R.drawable.zen_calls_any;
-            newContentDescription = mContext.getString(R.string.zen_mode_from_anyone);
-        } else if (PRIORITY_SENDERS_CONTACTS == currSetting) {
-            newImageRes = mIsMessages
-                    ? R.drawable.zen_messages_contacts
-                    : R.drawable.zen_calls_contacts;
-            newContentDescription = mContext.getString(R.string.zen_mode_from_contacts);
-        } else if (PRIORITY_SENDERS_STARRED == currSetting) {
-            newImageRes = mIsMessages
-                    ? R.drawable.zen_messages_starred
-                    : R.drawable.zen_calls_starred;
-            newContentDescription = mContext.getString(R.string.zen_mode_from_starred);
-        } else {
-            newImageRes = mIsMessages
-                    ? R.drawable.zen_messages_none
-                    : R.drawable.zen_calls_none;
-            newContentDescription =
-                    mContext.getString(mIsMessages
-                            ? R.string.zen_mode_none_messages
-                            : R.string.zen_mode_none_calls);
-        }
-
-        mImageView.setImageResource(newImageRes);
-        mImageView.setContentDescription(newContentDescription);
-    }
-
-    private int getPrioritySenders() {
-        if (mIsMessages) {
-            return mBackend.getPriorityMessageSenders();
-        } else {
-            return mBackend.getPriorityCallSenders();
-        }
-    }
-}