Merge "Makes fake EffectsController injectable" into main
diff --git a/res/drawable/check_circle_grey_large.xml b/res/drawable/check_circle_grey_large.xml
deleted file mode 100644
index f22c910..0000000
--- a/res/drawable/check_circle_grey_large.xml
+++ /dev/null
@@ -1,31 +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.
--->
-<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
-    <item>
-        <shape android:shape="oval">
-            <size android:width="@dimen/center_check_size"
-                android:height="@dimen/center_check_size" />
-            <solid android:color="@color/color_accent_primary_variant" />
-        </shape>
-    </item>
-    <item>
-        <inset android:drawable="@drawable/ic_check_24dp"
-            android:insetTop="@dimen/center_check_padding"
-            android:insetRight="@dimen/center_check_padding"
-            android:insetBottom="@dimen/center_check_padding"
-            android:insetLeft="@dimen/center_check_padding"/>
-    </item>
-</layer-list>
diff --git a/res/values-is/strings.xml b/res/values-is/strings.xml
index 10210ef..abad9ec 100644
--- a/res/values-is/strings.xml
+++ b/res/values-is/strings.xml
@@ -128,7 +128,7 @@
     <string name="keyguard_affordance_enablement_dialog_dismiss_button" msgid="629754625264422508">"Lokið"</string>
     <string name="keyguard_quick_affordance_title" msgid="4242813186995735584">"Flýtileiðir"</string>
     <string name="keyguard_quick_affordance_section_title" msgid="2806304242671717309">"Flýtileiðir"</string>
-    <string name="color_contrast_section_title" msgid="7194809124718896091">"Birtuskil lita"</string>
+    <string name="color_contrast_section_title" msgid="7194809124718896091">"Litaskil"</string>
     <string name="color_contrast_default_title" msgid="7954235103549276978">"Sjálfgefið"</string>
     <string name="color_contrast_medium_title" msgid="8071574793250090215">"Miðlungs"</string>
     <string name="color_contrast_high_title" msgid="5554685752479470200">"Mikil"</string>
diff --git a/res/values-km/strings.xml b/res/values-km/strings.xml
index b92850d..19762ef 100644
--- a/res/values-km/strings.xml
+++ b/res/values-km/strings.xml
@@ -128,7 +128,7 @@
     <string name="keyguard_affordance_enablement_dialog_dismiss_button" msgid="629754625264422508">"រួចរាល់"</string>
     <string name="keyguard_quick_affordance_title" msgid="4242813186995735584">"ផ្លូវកាត់"</string>
     <string name="keyguard_quick_affordance_section_title" msgid="2806304242671717309">"ផ្លូវកាត់"</string>
-    <string name="color_contrast_section_title" msgid="7194809124718896091">"កម្រិតពណ៌"</string>
+    <string name="color_contrast_section_title" msgid="7194809124718896091">"កម្រិតរំលេចពណ៌"</string>
     <string name="color_contrast_default_title" msgid="7954235103549276978">"លំនាំដើម"</string>
     <string name="color_contrast_medium_title" msgid="8071574793250090215">"មធ្យម"</string>
     <string name="color_contrast_high_title" msgid="5554685752479470200">"ខ្ពស់"</string>