diff --git a/color-check-baseline.xml b/color-check-baseline.xml
index 6f6d794c820..50e372758de 100644
--- a/color-check-baseline.xml
+++ b/color-check-baseline.xml
@@ -941,22 +941,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_block_color&quot;>#ffff0000&lt;/color>"
-        errorLine2="    ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~">
-        <location
-            file="res/values/colors.xml"
-            line="119"
-            column="5"/>
-    </issue>
-
     <issue
         id="HardCodedColor"
         severity="Error"
diff --git a/res/drawable/default_preference_background.xml b/res/drawable/default_preference_background.xml
deleted file mode 100644
index 7f7b5604e6b..00000000000
--- a/res/drawable/default_preference_background.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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.
--->
-
-<inset xmlns:android="http://schemas.android.com/apk/res/android"
-    android:inset="0dip">
-
-    <color android:color="?android:attr/colorBackground" />
-
-</inset>
diff --git a/res/drawable/ic_accessibility_illustration_colorblind.xml b/res/drawable/ic_accessibility_illustration_colorblind.xml
deleted file mode 100644
index e2e73aa494e..00000000000
--- a/res/drawable/ic_accessibility_illustration_colorblind.xml
+++ /dev/null
@@ -1,67 +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:viewportHeight="264.0"
-        android:viewportWidth="264.0">
-    <path android:fillColor="#FBBC04"
-          android:pathData="M112.52,208.91c-0.15,-0.9 -0.95,-1.54 -1.87,-1.51c-17.81,0.66 -36.14,-7.45 -51.36,-19.19c-24.31,-18.75 -40.49,-51.17 -34.81,-79.36l-3.53,-1.81c-24.28,31.54 -18.42,76.8 13.11,101.11c23.58,18.19 53.7,19.43 78.15,5.76L112.52,208.91z"/>
-    <path android:fillColor="#FDE293"
-          android:pathData="M44.48,195.92c18.36,14.16 46.39,20.23 66.95,18.26c1.04,-0.1 1.79,-1.05 1.62,-2.09l-0.52,-3.19c-0.15,-0.9 -0.95,-1.54 -1.87,-1.51c-17.81,0.66 -36.14,-7.45 -51.36,-19.19c-24.31,-18.75 -40.49,-51.17 -34.81,-79.36l-3.53,-1.81C9.98,136.93 15.03,173.21 44.48,195.92z"/>
-    <path android:fillColor="#6D4C41"
-          android:pathData="M20.8,107.25l1.15,-7.6c0.18,-1.17 1.42,-1.85 2.5,-1.38l3.31,1.44c1.01,0.44 1.39,1.67 0.81,2.6l-4.08,6.55L20.8,107.25z"/>
-    <path android:fillColor="#6D4C41"
-          android:pathData="M102,74.65l-0.03,2.62c-1.15,0.05 -2.31,0.04 -3.46,-0.02c-0.01,-0.04 0.01,-2.58 0,-2.62c-1.03,-7.56 0.59,-13.08 1.98,-16.21c0.35,-0.79 1.22,-1.2 2.05,-0.98c1.22,0.33 2.44,0.68 3.64,1.04c1.1,0.34 1.58,1.65 0.94,2.61C102.05,68.82 102,74.65 102,74.65z"/>
-    <path android:fillColor="#FEEFC3"
-          android:pathData="M148.04,97.35c-1.11,-13.75 -12.4,-24.77 -26.17,-25.59c-3.6,-0.21 -7.06,0.26 -10.28,1.29c-7.39,2.39 -15.3,2.33 -22.66,-0.15c-3.2,-1.08 -6.65,-1.6 -10.26,-1.43c-13.78,0.63 -25.21,11.5 -26.51,25.24c-0.47,4.97 0.38,9.7 2.22,13.9l-0.01,0l18.44,43.41c0.04,0.1 0.08,0.2 0.12,0.29l0.15,0.36l0.02,0c2.21,4.75 6.99,8.06 12.57,8.1c2.57,0.02 4.99,-0.66 7.07,-1.86c4.26,-2.46 9.62,-2.42 13.85,0.09c2.06,1.23 4.47,1.94 7.04,1.96c5.58,0.04 10.41,-3.21 12.68,-7.93l0.02,0l0.16,-0.36c0.04,-0.1 0.09,-0.19 0.13,-0.29l19.02,-43.16l-0.01,0C147.53,107.05 148.45,102.33 148.04,97.35z"/>
-    <path android:fillColor="#EA4335"
-          android:pathData="M79.99,77.27c2.43,0 4.81,0.39 7.08,1.16c4.34,1.47 8.86,2.21 13.42,2.21c4.38,0 8.71,-0.68 12.89,-2.03c2.18,-0.71 4.47,-1.06 6.79,-1.06c0.45,0 0.9,0.01 1.35,0.04c10.92,0.65 19.83,9.35 20.71,20.25c0.31,3.83 -0.33,7.53 -1.9,10.99l-3.94,8.69l0.13,-0.01l-15.22,34.54l-0.03,0.06l-0.02,0.04l0,0.01l-0.17,0.36c-1.38,2.86 -4.19,4.63 -7.34,4.63l-0.06,0c-1.45,-0.01 -2.87,-0.4 -4.1,-1.14c-3,-1.78 -6.45,-2.73 -9.98,-2.73c-3.44,0 -6.81,0.9 -9.75,2.6c-1.23,0.71 -2.63,1.08 -4.06,1.08l-0.06,0c-3.13,-0.02 -6,-1.88 -7.33,-4.73l-0.15,-0.33l-0.02,-0.05l-0.02,-0.05l-0.02,-0.05l-14.77,-34.77l0.13,0.01l-3.82,-8.71c-1.53,-3.48 -2.12,-7.19 -1.76,-11.02c1.03,-10.88 10.05,-19.47 20.98,-19.97C79.3,77.28 79.64,77.27 79.99,77.27L79.99,77.27M79.99,71.45c-0.44,0 -0.87,0.01 -1.31,0.03c-13.78,0.63 -25.21,11.5 -26.51,25.24c-0.47,4.97 0.38,9.7 2.22,13.9l-0.01,0l18.44,43.41c0.04,0.1 0.08,0.2 0.12,0.29l0.15,0.36l0.02,0c2.21,4.75 6.99,8.06 12.57,8.1c0.03,0 0.06,0 0.1,0c2.54,0 4.92,-0.68 6.97,-1.86c2.1,-1.21 4.47,-1.82 6.84,-1.82c2.43,0 4.86,0.64 7,1.91c2.06,1.23 4.47,1.94 7.04,1.96c0.03,0 0.06,0 0.1,0c5.54,0 10.33,-3.24 12.58,-7.93l0.02,0l0.16,-0.36c0.04,-0.1 0.09,-0.19 0.13,-0.29l19.02,-43.16l-0.01,0c1.9,-4.17 2.81,-8.9 2.41,-13.87c-1.11,-13.75 -12.4,-24.77 -26.17,-25.59c-0.57,-0.03 -1.13,-0.05 -1.69,-0.05c-2.99,0 -5.88,0.47 -8.58,1.35c-3.62,1.17 -7.36,1.75 -11.1,1.75c-3.9,0 -7.8,-0.63 -11.56,-1.9C86.13,71.96 83.12,71.45 79.99,71.45L79.99,71.45z"/>
-    <path android:fillColor="#FBBC04"
-          android:pathData="M87.76,114.52c-1.45,-0.01 -2.63,1.16 -2.64,2.6c-0.01,1.45 1.16,2.63 2.6,2.64c1.45,0.01 5.26,-2.59 5.26,-2.59S89.21,114.53 87.76,114.52z"/>
-    <path android:fillColor="#FBBC04"
-          android:pathData="M93.4,106.75c-1.02,-1.03 -2.68,-1.04 -3.71,-0.02c-1.03,1.02 -1.04,2.68 -0.02,3.71c1.02,1.03 5.55,1.89 5.55,1.89S94.42,107.78 93.4,106.75z"/>
-    <path android:fillColor="#FBBC04"
-          android:pathData="M93.26,128.06c-1.03,1.02 -2.69,1.01 -3.71,-0.02c-1.02,-1.03 -1.01,-2.69 0.02,-3.71c1.03,-1.02 5.57,-1.82 5.57,-1.82S94.29,127.04 93.26,128.06z"/>
-    <path android:fillColor="#EA4335"
-          android:pathData="M148.04,97.35c-1.11,-13.75 -12.4,-24.77 -26.17,-25.59c-3.6,-0.21 -7.06,0.26 -10.28,1.29c-3.69,1.19 -7.52,1.78 -11.34,1.75l-0.56,84.29c2.4,0.02 4.8,0.65 6.91,1.91c2.06,1.23 4.47,1.94 7.04,1.96c5.58,0.04 10.41,-3.21 12.68,-7.93l0.02,0l0.16,-0.36c0.04,-0.1 0.09,-0.19 0.13,-0.29l19.02,-43.16l-0.01,0C147.53,107.05 148.45,102.33 148.04,97.35z"/>
-    <path android:fillColor="#9CCC65"
-          android:pathData="M169.25,173.55c-0.75,-0.24 -1.54,-0.38 -2.37,-0.37c-4.11,0.03 -7.42,3.38 -7.39,7.49C164.05,180.63 167.9,177.65 169.25,173.55z"/>
-    <path android:fillColor="#9CCC65"
-          android:pathData="M149.06,170.38c0.04,5.72 4.71,10.33 10.43,10.29C159.45,174.94 154.78,170.34 149.06,170.38z"/>
-    <path android:fillColor="#F57C00"
-          android:pathData="M128.64,213.24a31.07,31.07 0,1 0,62.14 -0.42a31.07,31.07 0,1 0,-62.14 0.42z"/>
-    <path android:fillColor="#9CCC65"
-          android:pathData="M153.74,20.13c-1.04,0.17 -1.87,0.99 -2.04,2.04c-0.86,5.29 0.73,10.9 4.81,14.97s9.69,5.67 14.97,4.81c1.04,-0.17 1.87,-0.99 2.04,-2.04c0.86,-5.29 -0.73,-10.9 -4.81,-14.97C164.64,20.86 159.03,19.27 153.74,20.13z"/>
-    <path android:fillColor="#3949AB"
-          android:pathData="M158.58,69.64a12.99,12.99 62.72,1 0,4.91 -25.51a12.99,12.99 62.72,1 0,-4.91 25.51z"/>
-    <path android:fillColor="#1A237E"
-          android:pathData="M159.66,51.83l2.66,2.78l3.74,0.91l-2.78,2.66l-0.91,3.75l-2.66,-2.79l-3.74,-0.91l2.78,-2.66z"/>
-    <path android:fillColor="#3949AB"
-          android:pathData="M185.95,62.31a12.99,12.99 114.61,1 0,4.91 -25.51a12.99,12.99 62.72,1 0,-4.91 25.51z"/>
-    <path android:fillColor="#1A237E"
-          android:pathData="M187.03,44.49l2.66,2.79l3.74,0.91l-2.78,2.66l-0.91,3.74l-2.66,-2.78l-3.74,-0.91l2.78,-2.66z"/>
-    <path android:fillColor="#3949AB"
-          android:pathData="M169.42,83.27a12.99,12.99 87.23,1 0,21.51 -14.57a12.99,12.99 123.26,1 0,-21.51 14.57z"/>
-    <path android:fillColor="#1A237E"
-          android:pathData="M182.79,71.45l-0.09,3.85l2,3.29l-3.85,-0.09l-3.29,2l0.09,-3.85l-2,-3.29l3.85,0.09z"/>
-    <path android:fillColor="#8D6E63"
-          android:pathData="M242.38,62.35c0.98,2.75 2.3,9.01 -1.42,17.85l2.91,0.73c0,0 5.93,-9.31 4.14,-20.42c-0.2,-1.27 -1.58,-2 -2.76,-1.49c-0.72,0.31 -1.35,0.61 -1.88,0.87C242.47,60.35 242.04,61.4 242.38,62.35z"/>
-    <path android:fillColor="#9CCC65"
-          android:pathData="M255.94,108.8c2.85,-6.33 2.91,-13.91 -0.73,-20.75c-4.98,-9.36 -15.93,-14.24 -26.21,-11.7c-7.34,1.81 -12.85,6.72 -15.72,12.86c-4.4,9.42 -11.23,17.6 -19.98,23.21c-7.06,4.53 -12.73,11.42 -15.69,20.17c-5.98,17.69 1.9,37.45 18.39,46.22c19.93,10.6 44.32,1.98 53.36,-18.29c3.05,-6.84 3.95,-14.1 2.98,-21.01C250.87,129.11 251.62,118.38 255.94,108.8z"/>
-    <path android:fillColor="#81C995"
-          android:pathData="M252.33,139.52c-1.46,-10.41 -0.71,-21.14 3.61,-30.72c2.85,-6.33 2.91,-13.91 -0.73,-20.75c-0.9,-1.69 -1.99,-3.22 -3.24,-4.6c1.62,5.53 1.11,11.25 -1.12,16.2c-4.32,9.59 -5.07,20.31 -3.61,30.72c0.97,6.91 0.08,14.17 -2.98,21.01c-9.04,20.26 -33.43,28.89 -53.36,18.29c-5.07,-2.7 -9.32,-6.43 -12.61,-10.83c3.26,8.34 9.38,15.56 17.7,19.98c19.93,10.6 44.32,1.98 53.36,-18.29C252.41,153.69 253.31,146.43 252.33,139.52z"/>
-</vector>
diff --git a/res/drawable/ic_add_blue_24dp.xml b/res/drawable/ic_add_blue_24dp.xml
deleted file mode 100644
index a9a2f607793..00000000000
--- a/res/drawable/ic_add_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:fillColor="#4285F4"
-        android:pathData="M20,13h-7v7h-2v-7H4v-2h7V4h2v7h7V13z"/>
-</vector>
-
diff --git a/res/drawable/ic_add_to_home.xml b/res/drawable/ic_add_to_home.xml
deleted file mode 100644
index 1f55b7194cb..00000000000
--- a/res/drawable/ic_add_to_home.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.0"
-        android:viewportHeight="24.0"
-        android:tint="?android:attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M18,1.01L8,1c-1.1,0 -2,0.9 -2,2v3h2V5h10v14H8v-1H6v3c0,1.1 0.9,2 2,2h10c1.1,0 2,-0.9 2,-2V3c0,-1.1 -0.9,-1.99 -2,-1.99zM10,15h2V8H5v2h3.59L3,15.59 4.41,17 10,11.41V15z"/>
-</vector>
diff --git a/res/drawable/ic_airplane_safe_networks_24dp.xml b/res/drawable/ic_airplane_safe_networks_24dp.xml
deleted file mode 100644
index 6c0d9f7f4d5..00000000000
--- a/res/drawable/ic_airplane_safe_networks_24dp.xml
+++ /dev/null
@@ -1,35 +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:fillColor="#FFFFFFFF"
-        android:pathData="M16,17.5V16l-5.89,-3.75V8.12C10.11,7.5 9.61,7 9,7S7.89,7.5 7.89,8.12v4.12L2,16v1.5l5.89,-1.88v4.12l-1.47,1.12V22L9,21.25L11.58,22v-1.12l-1.47,-1.12v-4.12L16,17.5z"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M18.05,9.59C17.69,9.22 17.19,9 16.64,9c-0.55,0 -1.05,0.22 -1.41,0.59L16.64,11L18.05,9.59z"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M16.64,7.5c0.96,0 1.84,0.39 2.47,1.03l1.42,-1.42c-1,-1 -2.37,-1.61 -3.89,-1.61s-2.89,0.62 -3.89,1.61l1.42,1.42C14.8,7.89 15.67,7.5 16.64,7.5z"/>
-    <path
-        android:fillColor="#FFFFFFFF"
-        android:pathData="M16.64,4c1.93,0 3.68,0.79 4.95,2.05L23,4.64C21.37,3.01 19.12,2 16.64,2c-2.49,0 -4.74,1.01 -6.36,2.64l1.42,1.42C12.96,4.79 14.71,4 16.64,4z"/>
-</vector>
diff --git a/res/drawable/ic_settings_all.xml b/res/drawable/ic_settings_all.xml
deleted file mode 100644
index 03958abe13b..00000000000
--- a/res/drawable/ic_settings_all.xml
+++ /dev/null
@@ -1,26 +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"
-    android:viewportHeight="24">
-  <path
-      android:pathData="M3,12L3,3h9,9v9,9L12,21 3,21ZM19,12L19,5L12,5 5,5v7,7h7,7zM7,16c0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1zM11,16c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1zM7,12c0,-0.55 0.45,-1 1,-1 0.55,0 1,0.45 1,1 0,0.55 -0.45,1 -1,1 -0.55,0 -1,-0.45 -1,-1zM11,12c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1zM7,8C7,7.45 7.45,7 8,7 8.55,7 9,7.45 9,8 9,8.55 8.55,9 8,9 7.45,9 7,8.55 7,8ZM11,8c0,-0.55 1.35,-1 3,-1 1.65,0 3,0.45 3,1 0,0.55 -1.35,1 -3,1 -1.65,0 -3,-0.45 -3,-1z"
-      android:fillColor="#000000"/>
-</vector>
-
diff --git a/res/drawable/ic_settings_personal.xml b/res/drawable/ic_settings_personal.xml
deleted file mode 100644
index 5139405fb2b..00000000000
--- a/res/drawable/ic_settings_personal.xml
+++ /dev/null
@@ -1,28 +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"
-    android:viewportHeight="24">
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M13.85,22.24h-3.7c-0.74,0 -1.36,-0.54 -1.45,-1.27l-0.27,-1.89c-0.27,-0.14 -0.53,-0.29 -0.79,-0.46l-1.8,0.72c-0.7,0.26 -1.47,-0.03 -1.81,-0.65L2.2,15.52c-0.35,-0.66 -0.2,-1.44 0.36,-1.88l1.53,-1.19c-0.01,-0.15 -0.02,-0.3 -0.02,-0.46c0,-0.15 0.01,-0.31 0.02,-0.46l-1.52,-1.19C1.98,9.89 1.83,9.09 2.2,8.47l1.85,-3.19c0.34,-0.62 1.11,-0.9 1.79,-0.63l1.81,0.73C7.91,5.2 8.17,5.05 8.43,4.91L8.7,3.01c0.09,-0.7 0.71,-1.25 1.44,-1.25h3.7c0.74,0 1.36,0.54 1.45,1.27l0.27,1.89c0.27,0.14 0.53,0.29 0.79,0.46l1.8,-0.72c0.71,-0.26 1.48,0.03 1.82,0.65l1.84,3.18c0.36,0.66 0.2,1.44 -0.36,1.88l-1.52,1.19c0.01,0.15 0.02,0.3 0.02,0.46s-0.01,0.31 -0.02,0.46l1.52,1.19c0.56,0.45 0.72,1.23 0.37,1.86l-1.86,3.22c-0.34,0.62 -1.11,0.9 -1.8,0.63l-1.8,-0.72c-0.26,0.17 -0.52,0.32 -0.78,0.46l-0.27,1.91C15.21,21.7 14.59,22.24 13.85,22.24zM13.32,20.72c0,0.01 0,0.01 0,0.02V20.72zM10.68,20.69v0.02C10.69,20.72 10.69,20.7 10.68,20.69zM10.62,20.24h2.76l0.37,-2.55l0.53,-0.22c0.44,-0.18 0.88,-0.44 1.34,-0.78l0.45,-0.34l2.38,0.96l1.38,-2.4l-2.03,-1.58l0.07,-0.56c0.03,-0.26 0.06,-0.51 0.06,-0.78c0,-0.27 -0.03,-0.53 -0.06,-0.78l-0.07,-0.56l2.03,-1.58l-1.39,-2.4l-2.39,0.96L15.6,7.28c-0.42,-0.32 -0.87,-0.58 -1.33,-0.77L13.75,6.3l-0.37,-2.55h-2.76L10.25,6.3L9.72,6.51C9.28,6.69 8.84,6.94 8.38,7.3L7.93,7.62L5.55,6.67L4.16,9.06l2.03,1.58L6.12,11.2c-0.03,0.26 -0.06,0.53 -0.06,0.79s0.02,0.53 0.06,0.78l0.07,0.56l-2.03,1.58l1.38,2.4l2.39,-0.96l0.45,0.35c0.43,0.33 0.86,0.58 1.33,0.77l0.53,0.22L10.62,20.24zM18.22,17.72c0,0.01 -0.01,0.02 -0.01,0.03L18.22,17.72zM5.77,17.7l0.01,0.02C5.78,17.72 5.77,17.7 5.77,17.7zM3.93,9.47L3.93,9.47L3.93,9.47zM18.22,6.26c0,0.01 0.01,0.02 0.01,0.02L18.22,6.26zM5.79,6.24L5.78,6.26C5.78,6.26 5.79,6.26 5.79,6.24zM13.31,3.27c0,0.01 0,0.01 0,0.02V3.27zM10.69,3.25v0.02C10.69,3.26 10.69,3.26 10.69,3.25z"/>
-  <path
-      android:fillColor="#FF000000"
-      android:pathData="M13.56,10.44l-1.56,-3.44l-1.56,3.44l-3.44,1.56l3.44,1.56l1.56,3.44l1.56,-3.44l3.44,-1.56z"/>
-</vector>
diff --git a/res/layout/battery_active_view.xml b/res/layout/battery_active_view.xml
deleted file mode 100644
index 306fc4bb7a0..00000000000
--- a/res/layout/battery_active_view.xml
+++ /dev/null
@@ -1,40 +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.
--->
-
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:paddingEnd="56dp"
-    android:paddingTop="4dp"
-    android:orientation="vertical">
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:textAlignment="viewStart"
-        android:textAppearance="?android:attr/textAppearanceMedium"
-        android:hyphenationFrequency="normalFast"
-        android:lineBreakWordStyle="phrase"
-        android:textColor="?android:attr/textColorSecondary" />
-
-    <com.android.settings.fuelgauge.BatteryActiveView
-        android:id="@+id/battery_active"
-        android:layout_width="match_parent"
-        android:layout_height="6dp" />
-
-</LinearLayout>
diff --git a/res/layout/confirm_lock_background_base.xml b/res/layout/confirm_lock_background_base.xml
deleted file mode 100644
index 62be672f2f5..00000000000
--- a/res/layout/confirm_lock_background_base.xml
+++ /dev/null
@@ -1,21 +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.
--->
-<ImageView
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/background_image"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:scaleType="centerCrop" />
\ No newline at end of file
diff --git a/res/layout/dock_audio_media_enable_dialog.xml b/res/layout/dock_audio_media_enable_dialog.xml
deleted file mode 100644
index 37ecdfedf43..00000000000
--- a/res/layout/dock_audio_media_enable_dialog.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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.
--->
-
-<CheckBox
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/dock_audio_media_enable_cb"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:text="@string/bluetooth_dock_settings_a2dp"
-    android:focusable="true"
-    android:clickable="true" />
diff --git a/res/layout/drawable_layout.xml b/res/layout/drawable_layout.xml
deleted file mode 100644
index fe5d4c4b46b..00000000000
--- a/res/layout/drawable_layout.xml
+++ /dev/null
@@ -1,27 +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
-  -->
-
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-             android:layout_width="match_parent"
-             android:layout_height="wrap_content">
-
-    <ImageView
-        android:id="@+id/drawable"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:layout_gravity="center"/>
-</FrameLayout>
\ No newline at end of file
diff --git a/res/layout/hotspot_ap_band_selection_dialog.xml b/res/layout/hotspot_ap_band_selection_dialog.xml
deleted file mode 100644
index e63426d2e37..00000000000
--- a/res/layout/hotspot_ap_band_selection_dialog.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- 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.
--->
-
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:orientation="vertical"
-    android:padding="8dp"
-    android:paddingStart="@dimen/wifi_ap_band_checkbox_padding">
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="8dp"
-        android:text="@string/wifi_ap_band_select_one"
-        android:textAppearance="?android:attr/textAppearanceSmall"/>
-
-    <CheckBox
-        android:id="@+id/box_2g"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginBottom="@dimen/wifi_ap_band_checkbox_padding"
-        android:layout_marginTop="@dimen/wifi_ap_band_checkbox_padding"
-        android:paddingStart="@dimen/wifi_ap_band_checkbox_padding"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-
-    <CheckBox
-        android:id="@+id/box_5g"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:paddingStart="@dimen/wifi_ap_band_checkbox_padding"
-        android:textAppearance="?android:attr/textAppearanceMedium"/>
-</LinearLayout>
\ No newline at end of file
diff --git a/res/layout/nfc_detection_point.xml b/res/layout/nfc_detection_point.xml
deleted file mode 100644
index 8f938d1926e..00000000000
--- a/res/layout/nfc_detection_point.xml
+++ /dev/null
@@ -1,29 +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:layout_width="match_parent"
-        android:layout_height="@dimen/nfc_detection_point_height"
-        android:scaleType="centerCrop"
-        android:cropToPadding="true"
-        android:src="@drawable/nfc_detection_point"
-        android:contentDescription="@null" />
-
-</FrameLayout>
diff --git a/res/layout/notification_app.xml b/res/layout/notification_app.xml
deleted file mode 100644
index 15e83f1837b..00000000000
--- a/res/layout/notification_app.xml
+++ /dev/null
@@ -1,65 +0,0 @@
-<!--
-     Copyright (C) 2014 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.
--->
-
-<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/listChoiceBackgroundIndicator"
-    android:paddingStart="?android:attr/listPreferredItemPaddingStart"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-    <ImageView
-        android:id="@android:id/icon"
-        android:layout_width="@dimen/notification_app_icon_size"
-        android:layout_height="@dimen/notification_app_icon_size"
-        android:layout_centerVertical="true"
-        android:contentDescription="@null"
-        android:padding="8dp" />
-
-    <TextView
-        android:id="@android:id/title"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_centerVertical="true"
-        android:layout_toEndOf="@android:id/icon"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:hyphenationFrequency="normalFast"
-        android:lineBreakWordStyle="phrase"
-        android:textAppearance="?android:attr/textAppearanceMedium" />
-
-    <TextView
-        android:id="@android:id/text1"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/notification_app_icon_size"
-        android:layout_toEndOf="@android:id/icon"
-        android:gravity="bottom"
-        android:ellipsize="end"
-        android:singleLine="true"
-        android:textAlignment="viewStart"
-        android:textColor="?android:attr/textColorSecondary"
-        android:hyphenationFrequency="normalFast"
-        android:lineBreakWordStyle="phrase"
-        android:textAppearance="?android:attr/textAppearanceSmall" />
-
-    <View
-        android:id="@+id/row_divider"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:background="?android:attr/listDivider" />
-
-</RelativeLayout>
\ No newline at end of file
diff --git a/res/layout/preference_radio_with_extra_widget.xml b/res/layout/preference_radio_with_extra_widget.xml
deleted file mode 100644
index 9b7e1783326..00000000000
--- a/res/layout/preference_radio_with_extra_widget.xml
+++ /dev/null
@@ -1,108 +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
-  -->
-<!-- This file is copied from preference_radio.xml with modification to
-     support an extra clickable icon on the opposite side horizontally -->
-<LinearLayout
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="?android:attr/selectableItemBackground"
-    android:gravity="center_vertical"
-    android:minHeight="?android:attr/listPreferredItemHeightSmall"
-    android:paddingEnd="?android:attr/listPreferredItemPaddingEnd">
-
-    <LinearLayout
-        android:id="@android:id/widget_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:gravity="center"
-        android:minWidth="56dp"
-        android:layout_marginEnd="16dp"
-        android:orientation="vertical" />
-
-    <LinearLayout
-        android:id="@+id/icon_frame"
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:gravity="center_vertical"
-        android:minWidth="32dp"
-        android:orientation="horizontal"
-        android:layout_marginEnd="16dp"
-        android:paddingTop="4dp"
-        android:paddingBottom="4dp">
-        <androidx.preference.internal.PreferenceImageView
-            android:id="@android:id/icon"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            settings:maxWidth="@dimen/secondary_app_icon_size"
-            settings:maxHeight="@dimen/secondary_app_icon_size" />
-    </LinearLayout>
-
-    <LinearLayout
-        android:layout_width="0dp"
-        android:layout_height="wrap_content"
-        android:layout_weight="1"
-        android:orientation="vertical"
-        android:paddingTop="16dp"
-        android:paddingBottom="16dp">
-
-        <TextView android:id="@android:id/title"
-                  android:layout_width="wrap_content"
-                  android:layout_height="wrap_content"
-                  android:singleLine="true"
-                  android:textAppearance="?android:attr/textAppearanceListItem"
-                  android:ellipsize="marquee"
-                  android:fadingEdge="horizontal" />
-
-        <TextView android:id="@android:id/summary"
-                  android:layout_width="match_parent"
-                  android:layout_height="wrap_content"
-                  android:layout_weight="1"
-                  android:textAppearance="?android:attr/textAppearanceSmall"
-                  android:textAlignment="viewStart"
-                  android:hyphenationFrequency="normalFast"
-                  android:lineBreakWordStyle="phrase"
-                  android:textColor="?android:attr/textColorSecondary" />
-    </LinearLayout>
-    <LinearLayout
-        android:id="@+id/radio_extra_widget_container"
-        android:layout_width="wrap_content"
-        android:layout_height="match_parent"
-        android:orientation="horizontal"
-        android:gravity="center_vertical">
-        <View
-            android:id="@+id/radio_extra_widget_divider"
-            android:layout_width="@dimen/vertical_divider_width"
-            android:layout_height="match_parent"
-            android:layout_marginTop="36dp"
-            android:layout_marginBottom="36dp"
-            android:layout_marginStart="8dp"
-            android:background="?android:attr/dividerVertical" />
-        <ImageView
-            android:id="@+id/radio_extra_widget"
-            android:layout_width="wrap_content"
-            android:layout_height="fill_parent"
-            android:paddingStart="16dp"
-            android:paddingEnd="16dp"
-            android:src="@drawable/ic_settings_about"
-            android:contentDescription="@string/information_label"
-            android:layout_gravity="center"
-            android:background="?android:attr/selectableItemBackground" />
-    </LinearLayout>
-
-</LinearLayout>
diff --git a/res/layout/vertical_divider.xml b/res/layout/vertical_divider.xml
deleted file mode 100644
index 4f1cc43bf40..00000000000
--- a/res/layout/vertical_divider.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.
--->
-
-<View
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/divider"
-    android:layout_width="@dimen/vertical_divider_width"
-    android:layout_height="match_parent"
-    android:background="?android:attr/dividerVertical"/>
diff --git a/res/menu/home_bottom_navigation.xml b/res/menu/home_bottom_navigation.xml
deleted file mode 100644
index c58efd766a7..00000000000
--- a/res/menu/home_bottom_navigation.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-     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.
--->
-
-<menu xmlns:android="http://schemas.android.com/apk/res/android">
-    <item
-        android:id="@+id/homepage_personal_settings"
-        android:icon="@drawable/ic_settings_personal"
-        android:title="@string/homepage_personal_settings" />
-    <item
-        android:id="@+id/homepage_all_settings"
-        android:icon="@drawable/ic_settings_all"
-        android:title="@string/homepage_all_settings" />
-</menu>
diff --git a/res/values-h480dp/dimens.xml b/res/values-h480dp/dimens.xml
deleted file mode 100644
index 2795d98bd80..00000000000
--- a/res/values-h480dp/dimens.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-
-          http://www.apache.org/licenses/LICENSE-2.0
-
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Dimensions for Wifi Assistant Card -->
-    <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
-    <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
-    <dimen name="wifi_assistant_padding">25dp</dimen>
-    <dimen name="wifi_assistant_text_padding">16dp</dimen>
-</resources>
diff --git a/res/values-night/colors.xml b/res/values-night/colors.xml
index e4b402f3e95..8dab7981bdb 100644
--- a/res/values-night/colors.xml
+++ b/res/values-night/colors.xml
@@ -20,11 +20,8 @@
     <color name="switchbar_switch_thumb_tint">@android:color/black</color>
     <color name="homepage_accessibility_background">#783BE5</color>
     <color name="homepage_support_background">#3F5FBD</color>
-    <color name="homepage_card_dismissal_background">@*android:color/material_grey_900</color>
     <color name="contextual_card_background">@*android:color/material_grey_900</color>
     <color name="search_bar_background">?androidprv:attr/colorSurfaceVariant</color>
-    <color name="notification_importance_selection_bg">@*android:color/material_grey_800</color>
-    <color name="notification_importance_button_selected">#AECBFA</color> <!-- material blue 200 -->
     <color name="notification_importance_button_unselected">#5F6368</color>
     <color name="notification_history_background">#202124</color>
 
@@ -40,7 +37,6 @@
     <color name="palette_list_color_gray">@color/palette_list_dark_mode_color_gray</color>
     <color name="gestures_setting_background_color">@android:color/black</color>
 
-    <color name="color_surface_header">@*android:color/surface_header_dark</color>
     <!-- Dialog error color. -->
     <color name="settings_dialog_colorError">#f28b82</color> <!-- Red 300 -->
 
diff --git a/res/values-sw600dp-land/dimens.xml b/res/values-sw600dp-land/dimens.xml
index e090ee89316..3a88386e45d 100755
--- a/res/values-sw600dp-land/dimens.xml
+++ b/res/values-sw600dp-land/dimens.xml
@@ -17,6 +17,5 @@
 <resources>
     <dimen name="screen_margin_sides">128dip</dimen>
 
-    <dimen name="confirm_credentials_top_padding">20dp</dimen>
     <dimen name="confirm_credentials_top_margin">24dp</dimen>
 </resources>
diff --git a/res/values-sw600dp/bools.xml b/res/values-sw600dp/bools.xml
deleted file mode 100644
index 1454800dbfa..00000000000
--- a/res/values-sw600dp/bools.xml
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 The Android Open Source Project
-
-     Licensed under the Apache License, Version 2.0 (the "License");
-     you may not use this file except in compliance with the License.
-     You may obtain a copy of the License at
-  
-          http://www.apache.org/licenses/LICENSE-2.0
-  
-     Unless required by applicable law or agreed to in writing, software
-     distributed under the License is distributed on an "AS IS" BASIS,
-     WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-     See the License for the specific language governing permissions and
-     limitations under the License.
--->
-
-<resources>
-    <!-- Whether there is a silent mode checkbox  -->
-    <bool name="has_silent_mode">false</bool>
-</resources>
-
diff --git a/res/values-sw600dp/dimens.xml b/res/values-sw600dp/dimens.xml
index 2bfaef72f67..0fcf9d43cc1 100755
--- a/res/values-sw600dp/dimens.xml
+++ b/res/values-sw600dp/dimens.xml
@@ -27,15 +27,6 @@
     <!-- SwitchBar sub settings margin start / end -->
     <dimen name="switchbar_subsettings_margin_start">80dp</dimen>
 
-    <!-- Dimensions for Wifi Assistant Card -->
-    <dimen name="wifi_assistant_padding_top_bottom">24dp</dimen>
-    <dimen name="wifi_assistant_padding_start_end">24dp</dimen>
-    <dimen name="wifi_assistant_padding">25dp</dimen>
-    <dimen name="wifi_assistant_text_padding">24dp</dimen>
-
-    <dimen name="confirm_credentials_security_method_margin">72dp</dimen>
-    <dimen name="confirm_credentials_layout_width">328dp</dimen>
-    <dimen name="confirm_credentials_top_padding">48dp</dimen>
     <dimen name="confirm_credentials_side_margin">0dp</dimen>
     <dimen name="confirm_credentials_top_margin">64dp</dimen>
 
diff --git a/res/values-sw720dp/dimens.xml b/res/values-sw720dp/dimens.xml
index 8f4c787ee1f..e730fcc45dc 100644
--- a/res/values-sw720dp/dimens.xml
+++ b/res/values-sw720dp/dimens.xml
@@ -15,13 +15,6 @@
 -->
 
 <resources>
-    <dimen name="pager_tabs_padding">0dp</dimen>
-
-    <!-- Weight of the left pane in a multi-pane preference layout. -->
-    <integer name="preferences_left_pane_weight">1</integer>
-    <!-- Weight of the right pane in a multi-pane preference layout. So the split is 1:2 -->
-    <integer name="preferences_right_pane_weight">2</integer>
-
     <!-- ActionBar contentInsetStart -->
     <dimen name="actionbar_contentInsetStart">80dp</dimen>
     <dimen name="actionbar_subsettings_contentInsetStart">80dp</dimen>
@@ -29,10 +22,4 @@
     <!-- SwitchBar sub settings margin start / end -->
     <dimen name="switchbar_subsettings_margin_start">80dp</dimen>
     <dimen name="switchbar_subsettings_margin_end">80dp</dimen>
-
-    <!-- Dimensions for Wifi Assistant Card -->
-    <dimen name="wifi_assistant_padding_top_bottom">24dp</dimen>
-    <dimen name="wifi_assistant_padding_start_end">24dp</dimen>
-    <dimen name="wifi_assistant_padding">25dp</dimen>
-    <dimen name="wifi_assistant_text_padding">24dp</dimen>
 </resources>
diff --git a/res/values/arrays.xml b/res/values/arrays.xml
index 63194db5e30..80c8821dd26 100644
--- a/res/values/arrays.xml
+++ b/res/values/arrays.xml
@@ -452,20 +452,6 @@
         <item>gid</item>
     </string-array>
 
-    <!-- Apps on SD installation location options in ApplicationSettings -->
-    <string-array name="app_install_location_entries">
-        <item>Internal device storage</item>
-        <item>Removable SD card</item>
-        <item>Let the system decide</item>
-    </string-array>
-
-    <!-- Do not translate. -->
-    <string-array name="app_install_location_values" translatable="false">
-        <item>device</item>
-        <item>sdcard</item>
-        <item>auto</item>
-    </string-array>
-
     <!-- User display names for app ops codes -->
     <string-array name="app_ops_summaries">
         <item>coarse location</item>
@@ -1330,14 +1316,6 @@
         <item>@string/rtt_settings_always_visible</item>
     </string-array>
 
-    <!-- Values of list for one-handed timeout options. [DO NOT TRANSLATE] -->
-    <string-array name="one_handed_timeout_values" translatable="false">
-        <item>0</item>
-        <item>4</item>
-        <item>8</item>
-        <item>12</item>
-    </string-array>
-
     <!-- All the preference when the open app supports TapPay -->
     <string-array name="nfc_payment_favor">
         <item>Always</item>
diff --git a/res/values/colors.xml b/res/values/colors.xml
index 7d938440cfc..7985c82062c 100644
--- a/res/values/colors.xml
+++ b/res/values/colors.xml
@@ -92,7 +92,6 @@
     <color name="biometric_enroll_intro_color_outline">#e3e3e3</color>
 
     <!-- notification settings -->
-    <color name="notification_block_color">#ffff0000</color>
     <color name="notification_importance_button_unselected">#DADCE0</color>
 
     <!-- launcher icon color -->
diff --git a/res/values/dimens.xml b/res/values/dimens.xml
index 7a07dea9b8f..26f08af184a 100755
--- a/res/values/dimens.xml
+++ b/res/values/dimens.xml
@@ -41,34 +41,15 @@
 
     <dimen name="ring_progress_bar_thickness">4dp</dimen>
 
-    <!-- Weight of the left pane in a multi-pane preference layout. -->
-    <integer name="preferences_left_pane_weight">4</integer>
-    <!-- Weight of the right pane in a multi-pane preference layout. So the split is 40:60 -->
-    <integer name="preferences_right_pane_weight">6</integer>
-
-    <dimen name="nfc_detection_point_height">300dp</dimen>
-
-    <dimen name="notification_app_icon_size">64dp</dimen>
-    <dimen name="notification_app_icon_badge_size">20dp</dimen>
-    <dimen name="notification_app_icon_badge_margin">4dp</dimen>
-    <dimen name="notification_importance_toggle_size">48dp</dimen>
     <dimen name="notification_importance_toggle_marginTop">28dp</dimen>
-    <dimen name="notification_importance_toggle_marginBottom">28dp</dimen>
-    <dimen name="notification_importance_text_marginTop">20dp</dimen>
     <dimen name="notification_importance_button_separation">16dp</dimen>
-    <dimen name="notification_importance_button_width">178dp</dimen>
-    <dimen name="notification_importance_button_horiz_padding">36dp</dimen>
     <dimen name="notification_importance_drawable_padding">8dp</dimen>
-    <dimen name="notification_importance_description_padding">20dp</dimen>
     <dimen name="notification_importance_description_text">14sp</dimen>
     <dimen name="notification_importance_button_text">16sp</dimen>
     <dimen name="notification_importance_button_padding">14dp</dimen>
 
-    <dimen name="notification_history_header_drawable_start">26dp</dimen>
     <dimen name="conversation_icon_size">32dp</dimen>
 
-    <dimen name="zen_mode_icon_size">36dp</dimen>
-    <dimen name="zen_mode_icon_margin">16dp</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>
@@ -139,30 +120,10 @@
     <!-- horizontal: homepage_padding_horizontal_two_pane - homepage_app_bar_padding_two_pane -->
     <dimen name="homepage_app_bar_margin_horizontal_two_pane">18dp</dimen>
 
-    <!-- Dimensions for Wifi Assistant Card -->
-    <dimen name="wifi_assistant_padding_top_bottom">16dp</dimen>
-    <dimen name="wifi_assistant_padding_start_end">16dp</dimen>
-    <dimen name="wifi_assistant_padding">25dp</dimen>
-    <dimen name="wifi_assistant_text_padding">16dp</dimen>
-    <dimen name="wifi_assistant_height">182dp</dimen>
-    <dimen name="wifi_assistant_image_top">32dp</dimen>
-    <dimen name="wifi_assistant_image_start">24dp</dimen>
-
-    <!-- SIM Dialog Margin top -->
-    <dimen name="sim_dialog_margin_top">8dip</dimen>
-    <!-- SIM Dialog Margin bottom -->
-    <dimen name="sim_dialog_margin_bottom">16dip</dimen>
     <!-- SIM Dialog padding -->
-    <dimen name="sim_dialog_padding">8dip</dimen>
     <dimen name="sim_color_spinner_padding">12dip</dimen>
     <dimen name="sim_label_padding">16dip</dimen>
     <dimen name="sim_content_padding">24dip</dimen>
-    <!-- Sim Card Name length -->
-    <integer name="sim_name_length">32</integer>
-
-    <!-- CheckBoxPreference -->
-    <dimen name="checkbox_widget_min_width">58dip</dimen>
-    <dimen name="checkbox_layout_padding">16dip</dimen>
 
     <!-- Bluetooth Preferences -->
     <dimen name="bluetooth_dialog_padding">8dip</dimen>
@@ -175,8 +136,6 @@
     <dimen name="bluetooth_companion_app_widget">20dp</dimen>
 
     <!-- WiFi Preferences -->
-    <dimen name="wifi_divider_height">1px</dimen>
-    <dimen name="wifi_ap_band_checkbox_padding">16dp</dimen>
     <dimen name="wifi_detail_page_header_image_size">32dp</dimen>
 
     <!-- Internet Preferences -->
@@ -198,7 +157,6 @@
     <dimen name="fingerprint_find_sensor_graphic_size">190dp</dimen>
     <dimen name="fingerprint_error_text_appear_distance">16dp</dimen>
     <dimen name="fingerprint_error_text_disappear_distance">-8dp</dimen>
-    <dimen name="fingerprint_animation_size">88dp</dimen>
     <dimen name="sfps_enrollment_finished_icon_max_size">295dp</dimen>
     <dimen name="fingerprint_progress_bar_max_size">240dp</dimen>
     <dimen name="fingerprint_progress_bar_min_size">120dp</dimen>
@@ -211,9 +169,6 @@
     <dimen name="face_enroll_intro_illustration_margin_bottom">0dp</dimen>
 
     <!-- Confirm device credentials -->
-    <dimen name="confirm_credentials_security_method_margin">48dp</dimen>
-    <dimen name="confirm_credentials_layout_width">@dimen/match_parent</dimen>
-    <dimen name="confirm_credentials_top_padding">0dp</dimen>
     <dimen name="confirm_credentials_side_margin">16dp</dimen>
     <dimen name="confirm_credentials_top_margin">16dp</dimen>
 
@@ -228,18 +183,12 @@
     <!-- Launcher Icons -->
     <dimen name="shortcut_size_maskable">120dp</dimen>
     <dimen name="shortcut_size">40dp</dimen>
-    <dimen name="shortcut_icon_size">16dp</dimen>
-    <dimen name="badge_size">10dp</dimen>
 
     <!-- Admin support contact details dialog. -->
     <dimen name="admin_details_dialog_padding">24dp</dimen>
     <dimen name="admin_details_dialog_padding_bottom">32dp</dimen>
     <dimen name="admin_details_dialog_title_bottom_padding">16dp</dimen>
     <dimen name="admin_details_dialog_icon_size">32dp</dimen>
-    <dimen name="admin_details_dialog_link_padding_top">36dp</dimen>
-    <dimen name="admin_details_dialog_learn_more_button_top_margin">24dp</dimen>
-    <dimen name="admin_details_dialog_learn_more_button_padding">8dp</dimen>
-    <dimen name="admin_details_dialog_learn_more_button_minWidth">88dp</dimen>
 
     <!-- Display, Screen zoom -->
     <dimen name="conversation_message_list_padding">10dp</dimen>
@@ -257,11 +206,8 @@
 
     <!-- Accessibility Settings -->
     <dimen name="accessibility_layout_margin_start_end">16dp</dimen>
-    <dimen name="accessibility_button_preference_padding_top_bottom">18dp</dimen>
     <dimen name="accessibility_imageview_size">176dp</dimen>
     <dimen name="accessibility_illustration_view_radius">28dp</dimen>
-    <!-- The margin between two Textviews-->
-    <dimen name="accessibility_textview_layout_margin_bottom">24dp</dimen>
 
     <!-- Accessibility icon -->
     <dimen name="accessibility_icon_size">32dp</dimen>
@@ -276,22 +222,9 @@
     <!-- Restricted icon size in switch bar -->
     <dimen name="restricted_icon_size">@*android:dimen/config_restrictedIconSize</dimen>
 
-    <!-- Display Size and Font Size preview screen -->
-    <dimen name="preview_pager_padding">8dp</dimen>
-
-    <!-- Padding between the radio buttons/checkbox and text on the redaction interstitial -->
-    <dimen name="redaction_padding_start">16dp</dimen>
-
     <!-- Padding for Gestures settings screen -->
-    <dimen name="gestures_settings_padding_top_bottom">20dp</dimen>
     <dimen name="gestures_play_button_size">36dp</dimen>
 
-    <dimen name="password_requirement_textsize">14sp</dimen>
-
-    <!-- Visible vertical space we want to show below password edittext field when ime is shown.
-         The unit is sp as it is related to the text size of password requirement item. -->
-    <dimen name="visible_vertical_space_below_password">20sp</dimen>
-
     <!-- Minimum height for setting a lock pattern -->
     <dimen name="choose_lockscreen_min_height">200dp</dimen>
 
@@ -305,17 +238,8 @@
     <dimen name="battery_meter_height">100dp</dimen>
 
     <!-- Margin for the reset screens -->
-    <dimen name="reset_network_margin_start">72dp</dimen>
-    <dimen name="reset_network_margin_end">12dp</dimen>
     <dimen name="reset_button_margin_end">20dp</dimen>
 
-    <!-- Padding for the reset screens -->
-    <dimen name="reset_checkbox_padding_end">8dp</dimen>
-    <dimen name="reset_checkbox_title_padding_top">12dp</dimen>
-    <dimen name="reset_checkbox_summary_padding_top">4dp</dimen>
-    <dimen name="reset_checkbox_title_text_size">18sp</dimen>
-    <dimen name="reset_checkbox_summary_text_size">14sp</dimen>
-
     <!-- Homepage cards size and padding -->
     <dimen name="contextual_card_icon_size">24dp</dimen>
     <dimen name="contextual_card_vertical_margin">8dp</dimen>
@@ -338,9 +262,6 @@
     <!-- Horizontal divider size and margin -->
     <dimen name="horizontal_divider_height">.75dp</dimen>
 
-    <!-- Vertical divider size -->
-    <dimen name="vertical_divider_width">.75dp</dimen>
-
     <!-- Signal icon in NetworkSelectSetting -->
     <dimen name="signal_strength_icon_size">24dp</dimen>
 
@@ -375,9 +296,6 @@
     <!-- Maximum height for SliceView, override on slices/view/src/main/res/values/dimens.xml -->
     <dimen name="abc_slice_large_height">1800dp</dimen>
 
-    <!-- System navigation settings illustration height -->
-    <dimen name="system_navigation_illustration_height">320dp</dimen>
-
     <dimen name="back_gesture_indicator_width">60dp</dimen>
 
     <!-- Header title size of advanced bluetooth device -->
@@ -417,10 +335,8 @@
     <dimen name="list_preferred_item_padding">16dp</dimen>
 
     <!-- Output switcher panel related dimensions -->
-    <dimen name="output_switcher_slice_padding_top">11dp</dimen>
     <dimen name="output_switcher_slice_max_height">600dp</dimen>
     <dimen name="output_switcher_panel_icon_size">52dp</dimen>
-    <dimen name="output_switcher_panel_icon_corner_radius">16dp</dimen>
 
     <!-- Settings panel related dimensions -->
     <dimen name="settings_panel_corner_radius">28dp</dimen>
@@ -436,9 +352,6 @@
     <dimen name="empty_text_padding">24dp</dimen>
     <dimen name="empty_text_layout_height">450dp</dimen>
 
-    <!--  Choose SIM Activity dimens  -->
-    <dimen name="subtitle_bottom_padding">24dp</dimen>
-
     <!-- Battery usage chart view component -->
     <dimen name="chartview_text_padding">6dp</dimen>
     <dimen name="chartview_divider_width">1dp</dimen>
@@ -459,8 +372,6 @@
     <dimen name="dream_item_icon_padding">18dp</dimen>
     <dimen name="dream_item_title_margin_horizontal">8dp</dimen>
     <dimen name="dream_preference_card_padding">16dp</dimen>
-    <dimen name="dream_preference_margin_bottom">20dp</dimen>
-    <dimen name="dream_picker_margin_horizontal">48dp</dimen>
     <dimen name="dream_preview_placeholder_width">52dp</dimen>
 
     <!-- Sims/Data mobile/Calls/SMS select dialog-->
diff --git a/res/values/strings.xml b/res/values/strings.xml
index 1272d50b022..bf39625ee86 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -1826,18 +1826,11 @@
     <!-- Bluetooth device details companion apps. In the confirmation dialog for removing an associated app, this is the label on the button that will complete the disassociate action. [CHAR LIMIT=80] -->
     <string name = "bluetooth_companion_app_remove_association_confirm_button">Disconnect app</string>
 
-    <!-- Bluetooth settings.  Connection options screen.  The title of the screen. [CHAR LIMIT=40] -->
-    <string name="bluetooth_device_advanced_title">Paired Bluetooth device</string>
-    <!-- Bluetooth settings.  Connection options screen.  The title of the header that is above all of the profiles.
-         When a user decides what Bluetooth capabilities to use with the device.  -->
-    <string name="bluetooth_device_advanced_profile_header_title">Use for</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (user role). [CHAR LIMIT=25]-->
     <string name="bluetooth_pan_user_profile_summary_connected">Connected to device for internet access</string>
     <!-- Bluetooth settings. Connection options screen. The summary for the checkbox preference when PAN is connected (NAP role). [CHAR LIMIT=25]-->
     <string name="bluetooth_pan_nap_profile_summary_connected">Sharing local internet connection with device</string>
 
-    <!-- Bluetooth settings.  Dock Setting Dialog - Checkbox selection 2: Use dock for media audio -->
-    <string name="bluetooth_dock_settings_a2dp">For music and media</string>
     <!-- Bluetooth settings.  Dock Setting Dialog - Remember setting and don't ask user again -->
     <string name="bluetooth_dock_settings_remember">Remember settings</string>
 
@@ -3111,8 +3104,6 @@
     <string name="screensaver_settings_summary_never">Never</string>
     <!-- Dream settings screen, action label, when to dream [CHAR LIMIT=20] -->
     <string name="screensaver_settings_when_to_dream">When to start</string>
-    <!-- Dream settings screen, action label, current selected screen saver [CHAR LIMIT=35] -->
-    <string name="screensaver_settings_current">Current screen saver</string>
     <!-- Sound & display settings screen, setting option name to change whether the screen adjusts automatically based on lighting conditions -->
     <string name="automatic_brightness">Automatic brightness</string>
     <!-- [CHAR LIMIT=40] Display settings screen, setting option name to change whether the device wakes up when a lift gesture is detected. -->
@@ -3258,8 +3249,6 @@
 
     <!-- About phone screen, show when a value of some status item is unavailable. -->
     <string name="device_info_not_available">Not available</string>
-    <!-- About phone screen, phone status screen title -->
-    <string name="device_status_activity_title">Status</string>
     <!-- Main settings screen item's title to go into the storage settings screen [CHAR LIMIT=25] -->
     <string name="storage_settings" >Storage</string>
     <!-- Settings title that shows user how much storage and cache space an App is taking [CHAR LIMIT=50] -->
@@ -6760,38 +6749,11 @@
     <!-- TODO: Remove it once the same entry in SettingsLib is translated. -->
     <!-- Title of data usage item that represents all uninstalled applications or removed users. [CHAR LIMIT=48] -->
     <string name="data_usage_uninstalled_apps_users">Removed apps and users</string>
-    <!-- Combination of total network bytes sent and received by an application. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_received_sent"><xliff:g id="received" example="128KB">%1$s</xliff:g> received, <xliff:g id="sent" example="1.3GB">%2$s</xliff:g> sent</string>
-    <!-- Label displaying total network data transferred during a specific time period. [CHAR LIMIT=64] -->
-    <string name="data_usage_total_during_range"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used.</string>
 
-    <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
-    <string name="data_usage_total_during_range_mobile" product="tablet"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used, as measured by your tablet. Your carrier\u2019s data usage accounting may differ.</string>
-    <!-- Label displaying total network data transferred during a specific time period, including a disclaimer that contrasts device versus carrier reporting. [CHAR LIMIT=80] -->
-    <string name="data_usage_total_during_range_mobile" product="default"><xliff:g id="range" example="Jul 1 - Jul 31">%2$s</xliff:g>: about <xliff:g id="total" example="128KB">%1$s</xliff:g> used, as measured by your phone. Your carrier\u2019s data usage accounting may differ.</string>
-
-    <!-- Dialog title for selecting metered networks. [CHAR LIMIT=25] -->
-    <string name="data_usage_metered_title">Network restrictions</string>
-    <!-- Dialog body for selecting paid networks. [CHAR LIMIT=NONE] -->
-    <string name="data_usage_metered_body">Metered networks are treated like mobile networks when background data is restricted. Apps may warn before using these networks for large downloads.</string>
-    <!-- Header for list of mobile networks. [CHAR LIMIT=32] -->
-    <string name="data_usage_metered_mobile">Mobile networks</string>
-    <!-- Header for list of Wi-Fi networks. [CHAR LIMIT=32] -->
-    <string name="data_usage_metered_wifi">Metered Wi\u2011Fi networks</string>
-    <!-- Body text prompting user to enable Wi-Fi to configure metered networks. [CHAR LIMIT=64] -->
-    <string name="data_usage_metered_wifi_disabled">To select metered networks, turn Wi\u2011Fi on.</string>
-
-    <!-- Option for indicating that a network being metered (expensive) should be determined automatically. [CHAR LIMIT=32] -->
-    <string name="data_usage_metered_auto">Automatic</string>
     <!-- Title for Network usage to control whether Wifi is metered or not [CHAR LIMIT=20] -->
     <string name="wifi_metered_title">Network usage</string>
     <!-- Option for indicating that a network is metered (expensive). [CHAR LIMIT=32] -->
     <string name="data_usage_metered_yes">Metered</string>
-    <!-- Option for indicating that a network is not metered (inexpensive). [CHAR LIMIT=32] -->
-    <string name="data_usage_metered_no">Not metered</string>
-
-    <!-- Disclaimer string for data usage measured by device. [CHAR LIMIT=80] -->
-    <string name="data_usage_disclaimer">Carrier data accounting may differ from your device.</string>
 
     <!-- Input label for the name of a VPN profile. [CHAR LIMIT=40] -->
     <string name="vpn_name">Name</string>
@@ -10704,9 +10666,6 @@
     <!-- Summary describing when the billing cycle for their phone carrier starts [CHAR LIMIT=NONE] -->
     <string name="billing_cycle_fragment_summary">Monthly on day <xliff:g name="day_of_month" example="17">%1$s</xliff:g></string>
 
-    <!-- Title of button and screen for which wifi networks have data restrictions [CHAR LIMIT=30 -->
-    <string name="network_restrictions">Network restrictions</string>
-
     <!-- A summary shown on data usage screens to indicate inaccuracy of data tracking [CHAR LIMIT=NONE] -->
     <string name="operator_warning">Carrier data accounting may differ from device accounting</string>
 
@@ -11884,12 +11843,6 @@
     <!-- Title for Connected device shortcut [CHAR LIMIT=30] -->
     <string name="devices_title">Devices</string>
 
-    <!-- Homepage bottom menu. Title for display all Settings [CHAR LIMIT=30] -->
-    <string name="homepage_all_settings">All Settings</string>
-
-    <!-- Homepage bottom menu. Title for display personalized Settings [CHAR LIMIT=30] -->
-    <string name="homepage_personal_settings">Suggestions</string>
-
     <!-- Available networks screen, name of button when user wants to select network manually [CHAR LIMIT=60] -->
     <string name="choose_network_title">Choose network</string>
     <!-- Available networks screen, text when no networks connected [CHAR LIMIT=60] -->
diff --git a/res/xml/bluetooth_device_advanced.xml b/res/xml/bluetooth_device_advanced.xml
deleted file mode 100644
index 75c89ca20e2..00000000000
--- a/res/xml/bluetooth_device_advanced.xml
+++ /dev/null
@@ -1,30 +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.
--->
-
-<PreferenceScreen
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:title="@string/bluetooth_device_advanced_title">
-
-    <PreferenceCategory
-            android:key="profile_container"
-            android:order="100"
-            android:title="@string/bluetooth_device_advanced_profile_header_title">
-
-        <!-- Profile checkboxes will be added here programmatically. -->
-        
-    </PreferenceCategory>
-
-</PreferenceScreen>
diff --git a/res/xml/current_dream_settings.xml b/res/xml/current_dream_settings.xml
deleted file mode 100644
index d95e830f523..00000000000
--- a/res/xml/current_dream_settings.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  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.
-  -->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:title="@string/screensaver_settings_current" />
diff --git a/res/xml/dark_ui_settings.xml b/res/xml/dark_ui_settings.xml
deleted file mode 100644
index 8932670d106..00000000000
--- a/res/xml/dark_ui_settings.xml
+++ /dev/null
@@ -1,24 +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.
-  -->
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/dark_ui_mode"
-    android:key="dark_ui_mode_screen"
-    settings:staticPreferenceLocation="append"
-    settings:keywords="@string/keywords_dark_ui_mode">
-</PreferenceScreen >
\ No newline at end of file
diff --git a/res/xml/data_usage_metered_prefs.xml b/res/xml/data_usage_metered_prefs.xml
deleted file mode 100644
index 9764ad38248..00000000000
--- a/res/xml/data_usage_metered_prefs.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2012 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:key="data_usage_metered_prefs"
-    android:title="@string/network_restrictions">
-
-    <PreferenceCategory
-        android:key="mobile"
-        android:title="@string/data_usage_metered_mobile"
-        android:persistent="false" />
-
-    <PreferenceCategory
-        android:key="wifi"
-        android:title="@string/data_usage_metered_wifi"
-        android:persistent="false">
-
-        <Preference
-            android:key="wifi_disabled"
-            android:summary="@string/data_usage_metered_wifi_disabled"
-            android:persistent="false"
-            android:selectable="false" />
-
-    </PreferenceCategory>
-
-    <com.android.settingslib.widget.FooterPreference
-        android:title="@string/data_usage_metered_body"
-        android:key="footer_preference"
-        android:selectable="false" />
-
-</PreferenceScreen>
diff --git a/res/xml/device_info_phone_status.xml b/res/xml/device_info_phone_status.xml
deleted file mode 100644
index ccda55ff043..00000000000
--- a/res/xml/device_info_phone_status.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!-- Copyright (C) 2014 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/imei_information_title">
-
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="min_number"
-        android:title="@string/status_min_number"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false"/>
-
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="prl_version"
-        android:title="@string/status_prl_version"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false"/>
-
-    <!-- This menu item is only for CDMA phone -->
-    <Preference android:key="meid_number"
-        android:title="@string/status_meid_number"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false"/>
-
-    <Preference android:key="imei"
-        android:title="@string/status_imei"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false"/>
-
-    <Preference android:key="imei_sv"
-        android:title="@string/status_imei_sv"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false"/>
-
-    <Preference android:key="icc_id"
-        android:title="@string/status_icc_id"
-        android:summary="@string/device_info_not_available"
-        android:persistent="false"/>
-
-</PreferenceScreen>
diff --git a/res/xml/device_info_status.xml b/res/xml/device_info_status.xml
deleted file mode 100644
index a784ed99d39..00000000000
--- a/res/xml/device_info_status.xml
+++ /dev/null
@@ -1,92 +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.
--->
-
-<PreferenceScreen
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    android:key="device_status_screen"
-    android:title="@string/device_status_activity_title">
-
-    <Preference
-        android:key="battery_status"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/battery_status_title"
-        android:summary="@string/summary_placeholder" />
-    <Preference
-        android:key="battery_level"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/battery_level_title"
-        android:summary="@string/summary_placeholder"
-        android:persistent="false" />
-    <Preference
-        android:key="sim_status"
-        android:title="@string/sim_status_title"
-        android:persistent="false">
-        <intent
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.Settings$SimStatusActivity" />
-    </Preference>
-    <Preference
-        android:key="imei_info"
-        android:title="@string/imei_information_title"
-        android:persistent="false">
-        <intent
-            android:targetPackage="com.android.settings"
-            android:targetClass="com.android.settings.Settings$ImeiInformationActivity" />
-    </Preference>
-    <Preference
-        android:key="wifi_ip_address"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/wifi_advanced_ip_address_title"
-        android:summary="@string/summary_placeholder"
-        android:persistent="false" />
-    <Preference
-        android:key="wifi_mac_address"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/status_wifi_mac_address"
-        android:summary="@string/summary_placeholder"
-        android:persistent="false" />
-    <Preference
-        android:key="bt_address"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/status_bt_address"
-        android:summary="@string/summary_placeholder"
-        android:persistent="false" />
-    <Preference
-        android:key="serial_number"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/status_serial_number"
-        android:summary="@string/summary_placeholder"
-        android:persistent="false" />
-    <Preference
-        android:key="up_time"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/status_up_time"
-        android:summary="@string/summary_placeholder"
-        android:persistent="false" />
-    <Preference
-        android:key="ims_reg_state"
-        android:enabled="false"
-        android:shouldDisableView="false"
-        android:title="@string/ims_reg_title"
-        android:persistent="false" />
-</PreferenceScreen>
diff --git a/res/xml/high_power_details.xml b/res/xml/high_power_details.xml
deleted file mode 100644
index 6eba78e9982..00000000000
--- a/res/xml/high_power_details.xml
+++ /dev/null
@@ -1,26 +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.
--->
-
-<PreferenceScreen xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:settings="http://schemas.android.com/apk/res-auto"
-    android:title="@string/high_power_apps">
-
-    <SwitchPreference
-        android:key="high_power_switch"
-        android:summary="@string/high_power_desc"
-        android:title="@string/high_power_apps" />
-
-</PreferenceScreen>
diff --git a/tests/robotests/res/xml-mcc999/display_settings.xml b/tests/robotests/res/xml-mcc999/display_settings.xml
index b5bf789a883..69e52532ce6 100644
--- a/tests/robotests/res/xml-mcc999/display_settings.xml
+++ b/tests/robotests/res/xml-mcc999/display_settings.xml
@@ -50,8 +50,8 @@
         android:key="pref_key_4"
         android:title="pref_title_4"
         android:summary="summary_4"
-        android:entries="@array/app_install_location_entries"
-        android:entryValues="@array/app_install_location_values"
+        android:entries="@array/mvno_type_entries"
+        android:entryValues="@array/mvno_type_values"
         settings:keywords="keywords1, keywords2, keywords3" />
 
     <CheckBoxPreference
@@ -61,4 +61,4 @@
             android:summaryOff="summary_off"
             settings:searchable="false"
             settings:keywords="keywords1, keywords2, keywords3" />
-</PreferenceScreen>
\ No newline at end of file
+</PreferenceScreen>
diff --git a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
index 23ade9d14ab..833324a4bc1 100644
--- a/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/core/PreferenceXmlParserUtilsTest.java
@@ -124,7 +124,7 @@ public class PreferenceXmlParserUtilsTest {
         final AttributeSet attrs = Xml.asAttributeSet(parser);
         String entries = PreferenceXmlParserUtils.getDataEntries(mContext, attrs);
         String[] expEntries = mContext.getResources()
-                .getStringArray(R.array.app_install_location_entries);
+                .getStringArray(R.array.mvno_type_entries);
         for (String expEntry : expEntries) {
             assertThat(entries).contains(expEntry);
         }
diff --git a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
index dae455c7e8a..9559043570c 100644
--- a/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
+++ b/tests/robotests/src/com/android/settings/gestures/OneHandedSettingsUtilsTest.java
@@ -22,8 +22,6 @@ import android.content.Context;
 import android.os.UserHandle;
 import android.provider.Settings;
 
-import com.android.settings.R;
-
 import org.junit.Before;
 import org.junit.Test;
 import org.junit.runner.RunWith;
@@ -33,24 +31,17 @@ import org.robolectric.RuntimeEnvironment;
 @RunWith(RobolectricTestRunner.class)
 public class OneHandedSettingsUtilsTest {
 
-    private static final int TIMEOUT_INDEX_NEVER = 0;
-    private static final int TIMEOUT_INDEX_SHORT = 1;
-    private static final int TIMEOUT_INDEX_MEDIUM = 2;
-    private static final int TIMEOUT_INDEX_LONG = 3;
-
     private static final int OFF = 0;
     private static final int ON = 1;
 
     private Context mContext;
 
-    private String[] mConfigTimeout;
     private int mCurrentUserId;
 
     @Before
     public void setUp() {
         mContext = RuntimeEnvironment.application;
         mCurrentUserId = UserHandle.myUserId();
-        mConfigTimeout = mContext.getResources().getStringArray(R.array.one_handed_timeout_values);
         OneHandedSettingsUtils.setUserId(mCurrentUserId);
     }
 
@@ -94,7 +85,7 @@ public class OneHandedSettingsUtilsTest {
         assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
                 Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
                 OneHandedSettingsUtils.OneHandedTimeout.NEVER.getValue(), mCurrentUserId))
-                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_NEVER]));
+                .isEqualTo(0);
     }
 
     @Test
@@ -105,7 +96,7 @@ public class OneHandedSettingsUtilsTest {
         assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
                 Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
                 OneHandedSettingsUtils.OneHandedTimeout.SHORT.getValue(), mCurrentUserId))
-                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_SHORT]));
+                .isEqualTo(4);
     }
 
     @Test
@@ -116,7 +107,7 @@ public class OneHandedSettingsUtilsTest {
         assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
                 Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
                 OneHandedSettingsUtils.OneHandedTimeout.MEDIUM.getValue(), mCurrentUserId))
-                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_MEDIUM]));
+                .isEqualTo(8);
     }
 
     @Test
@@ -127,6 +118,6 @@ public class OneHandedSettingsUtilsTest {
         assertThat(Settings.Secure.getIntForUser(mContext.getContentResolver(),
                 Settings.Secure.ONE_HANDED_MODE_TIMEOUT,
                 OneHandedSettingsUtils.OneHandedTimeout.LONG.getValue(), mCurrentUserId))
-                .isEqualTo(Integer.parseInt(mConfigTimeout[TIMEOUT_INDEX_LONG]));
+                .isEqualTo(12);
     }
 }