Snap for 9049251 from 6b0718b04ec755e6b3d013371a70842ca5a4e789 to mainline-media-releaseaml_med_331115000

Change-Id: Ibbf491c537586591ce3ba5de8cbf49253880e680

195 files changed, 3401 insertions, 2722 deletions

diff --git a/PermissionController/res/drawable-v33/ic_block.xml b/PermissionController/res/drawable-v33/ic_block.xml
deleted file mode 100644
index b77c26034..000000000
--- a/PermissionController/res/drawable-v33/ic_block.xml
+++ /dev/null
@@ -1,26 +0,0 @@
-<!--
-  ~ Copyright (C) 2022 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="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M12,2C6.48,2 2,6.48 2,12s4.48,10 10,10 10,-4.48 10,-10S17.52,2 12,2zM4,12c0,-4.42 3.58,-8 8,-8 1.85,0 3.55,0.63 4.9,1.69L5.69,16.9C4.63,15.55 4,13.85 4,12zM12,20c-1.85,0 -3.55,-0.63 -4.9,-1.69L18.31,7.1C19.37,8.45 20,10.15 20,12c0,4.42 -3.58,8 -8,8z"/>
-</vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/ic_history.xml b/PermissionController/res/drawable-v33/ic_history.xml
deleted file mode 100644
index 24ed38a65..000000000
--- a/PermissionController/res/drawable-v33/ic_history.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<!--
-  ~ Copyright (C) 2022 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="?attr/colorControlNormal">
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M4,4v2.01C5.83,3.58 8.73,2 12.01,2 17.53,2 22,6.48 22,12s-4.47,10 -9.99,10C6.48,22 2,17.52 2,12h2c0,4.42 3.58,8 8,8s8,-3.58 8,-8 -3.58,-8 -8,-8C9.04,4 6.47,5.61 5.09,8H8v2H2V4h2z"/>
-    <path
-        android:fillColor="@android:color/white"
-        android:pathData="M13,12V6h-2v7l4.97,3.49 1.26,-1.55z"/>
-</vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_center_card_background.xml b/PermissionController/res/drawable-v33/safety_center_card_background.xml
index e9f6349a9..e04b32f4f 100644
--- a/PermissionController/res/drawable-v33/safety_center_card_background.xml
+++ b/PermissionController/res/drawable-v33/safety_center_card_background.xml
@@ -17,5 +17,5 @@
 
 <shape xmlns:android="http://schemas.android.com/apk/res/android">
     <solid android:color="?attr/colorSurface" />
-    <corners android:radius="28dp"/>
+    <corners android:radius="@dimen/sc_card_corner_radius_large"/>
 </shape>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_center_issue_action_button.xml b/PermissionController/res/drawable-v33/safety_center_issue_action_button.xml
deleted file mode 100644
index d68e6a95e..000000000
--- a/PermissionController/res/drawable-v33/safety_center_issue_action_button.xml
+++ /dev/null
@@ -1,20 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  ~ Copyright (C) 2022 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.
-  -->
-<shape xmlns:android="http://schemas.android.com/apk/res/android"
-       android:shape="rectangle">
-    <corners android:radius="10dp" />
-</shape>
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_large_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_large_background.xml
index 919d2154a..ef78867b8 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_large_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_large_background.xml
@@ -20,14 +20,18 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorSurface" />
-            <corners android:bottomLeftRadius="28dp" android:bottomRightRadius="28dp" />
+            <corners
+                android:bottomLeftRadius="@dimen/sc_card_corner_radius_large"
+                android:bottomRightRadius="@dimen/sc_card_corner_radius_large" />
         </shape>
     </item>
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#FFFF" />
-            <corners android:bottomLeftRadius="28dp" android:bottomRightRadius="28dp" />
+            <corners
+                android:bottomLeftRadius="@dimen/sc_card_corner_radius_large"
+                android:bottomRightRadius="@dimen/sc_card_corner_radius_large" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_small_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_small_background.xml
index be565291a..dd455b0f6 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_small_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_flat_bottom_small_background.xml
@@ -20,14 +20,18 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorSurface" />
-            <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
+            <corners
+                android:bottomLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+                android:bottomRightRadius="@dimen/sc_card_corner_radius_xsmall" />
         </shape>
     </item>
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#FFFF" />
-            <corners android:bottomLeftRadius="4dp" android:bottomRightRadius="4dp" />
+            <corners
+                android:bottomLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+                android:bottomRightRadius="@dimen/sc_card_corner_radius_xsmall" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_flat_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_flat_background.xml
index f830ee505..2326ce4bd 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_flat_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_flat_background.xml
@@ -20,14 +20,18 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorSurface" />
-            <corners android:topLeftRadius="28dp" android:topRightRadius="28dp" />
+            <corners
+                android:topLeftRadius="@dimen/sc_card_corner_radius_large"
+                android:topRightRadius="@dimen/sc_card_corner_radius_large" />
         </shape>
     </item>
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#FFFF" />
-            <corners android:topLeftRadius="28dp" android:topRightRadius="28dp" />
+            <corners
+                android:topLeftRadius="@dimen/sc_card_corner_radius_large"
+                android:topRightRadius="@dimen/sc_card_corner_radius_large" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_large_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_large_background.xml
index 0e093820a..a5a60e85b 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_large_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_large_background.xml
@@ -20,14 +20,14 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorSurface" />
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/sc_card_corner_radius_large" />
         </shape>
     </item>
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#FFFF" />
-            <corners android:radius="28dp" />
+            <corners android:radius="@dimen/sc_card_corner_radius_large" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_small_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_small_background.xml
index d846331be..2cbe94e8f 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_small_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_large_bottom_small_background.xml
@@ -20,10 +20,10 @@
   <item>
     <shape android:shape="rectangle">
       <corners
-          android:bottomLeftRadius="4dp"
-          android:bottomRightRadius="4dp"
-          android:topLeftRadius="28dp"
-          android:topRightRadius="28dp" />
+          android:bottomLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+          android:bottomRightRadius="@dimen/sc_card_corner_radius_xsmall"
+          android:topLeftRadius="@dimen/sc_card_corner_radius_large"
+          android:topRightRadius="@dimen/sc_card_corner_radius_large" />
       <solid android:color="?attr/colorSurface" />
     </shape>
   </item>
@@ -31,10 +31,10 @@
   <item android:id="@android:id/mask">
     <shape android:shape="rectangle">
       <corners
-          android:bottomLeftRadius="4dp"
-          android:bottomRightRadius="4dp"
-          android:topLeftRadius="28dp"
-          android:topRightRadius="28dp" />
+          android:bottomLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+          android:bottomRightRadius="@dimen/sc_card_corner_radius_xsmall"
+          android:topLeftRadius="@dimen/sc_card_corner_radius_large"
+          android:topRightRadius="@dimen/sc_card_corner_radius_large" />
       <solid android:color="#FFFF" />
     </shape>
   </item>
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_flat_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_flat_background.xml
index 086013a9f..eced55ee8 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_flat_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_flat_background.xml
@@ -20,14 +20,18 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorSurface" />
-            <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
+            <corners
+                android:topLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+                android:topRightRadius="@dimen/sc_card_corner_radius_xsmall" />
         </shape>
     </item>
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#FFFF" />
-            <corners android:topLeftRadius="4dp" android:topRightRadius="4dp" />
+            <corners
+                android:topLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+                android:topRightRadius="@dimen/sc_card_corner_radius_xsmall" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_large_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_large_background.xml
index 894c452ec..5e26cd41a 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_large_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_large_background.xml
@@ -20,10 +20,10 @@
   <item>
     <shape android:shape="rectangle">
       <corners
-          android:bottomLeftRadius="28dp"
-          android:bottomRightRadius="28dp"
-          android:topLeftRadius="4dp"
-          android:topRightRadius="4dp" />
+          android:bottomLeftRadius="@dimen/sc_card_corner_radius_large"
+          android:bottomRightRadius="@dimen/sc_card_corner_radius_large"
+          android:topLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+          android:topRightRadius="@dimen/sc_card_corner_radius_xsmall" />
       <solid android:color="?attr/colorSurface" />
     </shape>
   </item>
@@ -31,10 +31,10 @@
   <item android:id="@android:id/mask">
     <shape android:shape="rectangle">
       <corners
-          android:bottomLeftRadius="28dp"
-          android:bottomRightRadius="28dp"
-          android:topLeftRadius="4dp"
-          android:topRightRadius="4dp" />
+          android:bottomLeftRadius="@dimen/sc_card_corner_radius_large"
+          android:bottomRightRadius="@dimen/sc_card_corner_radius_large"
+          android:topLeftRadius="@dimen/sc_card_corner_radius_xsmall"
+          android:topRightRadius="@dimen/sc_card_corner_radius_xsmall" />
       <solid android:color="#FFFF" />
     </shape>
   </item>
diff --git a/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_small_background.xml b/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_small_background.xml
index 04eee731b..6c8df5022 100644
--- a/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_small_background.xml
+++ b/PermissionController/res/drawable-v33/safety_entity_top_small_bottom_small_background.xml
@@ -20,14 +20,14 @@
     <item>
         <shape android:shape="rectangle">
             <solid android:color="?attr/colorSurface" />
-            <corners android:radius="4dp" />
+            <corners android:radius="@dimen/sc_card_corner_radius_xsmall" />
         </shape>
     </item>
 
     <item android:id="@android:id/mask">
         <shape android:shape="rectangle">
             <solid android:color="#FFFF" />
-            <corners android:radius="4dp" />
+            <corners android:radius="@dimen/sc_card_corner_radius_xsmall" />
         </shape>
     </item>
 </ripple>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/safety_status_info_to_info_anim.xml b/PermissionController/res/drawable-v33/safety_status_info_to_info_anim.xml
index e16d2f4e9..b41e9c083 100644
--- a/PermissionController/res/drawable-v33/safety_status_info_to_info_anim.xml
+++ b/PermissionController/res/drawable-v33/safety_status_info_to_info_anim.xml
@@ -1,35 +1,37 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                <group android:name="_R_G_L_3_G">
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="281.25"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusInfo"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.37 C-14,-12.37 0,-17.5 0,-17.5 C0,-17.5 14,-12.37 14,-12.37 C14,-12.37 14,-1.63 14,-1.63 C14,2.8 12.6,6.77 10.03,10.5 C7.47,14.23 3.97,16.57 0,17.5 C-3.97,16.57 -7.47,14.23 -10.03,10.5 C-12.6,6.77 -14,2.8 -14,-1.63 C-14,-1.63 -14,-12.37 -14,-12.37c "/>
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusInfo" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G" android:translateX="0.125"
-                           android:translateY="-0.5">
-                        <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                              android:fillAlpha="1" android:fillType="nonZero"
-                              android:pathData=" M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "/>
-                    </group>
+                <group android:name="_R_G_L_0_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorSurface"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "/>
+                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="?attr/colorSurface"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -56,28 +58,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -87,93 +89,73 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_0_G_N_1_T_0">
+    <target android:name="_R_G_L_0_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
diff --git a/PermissionController/res/drawable-v33/safety_status_recommend_to_info_anim.xml b/PermissionController/res/drawable-v33/safety_status_recommend_to_info_anim.xml
index 6a2c9d9ec..39e2f640c 100644
--- a/PermissionController/res/drawable-v33/safety_status_recommend_to_info_anim.xml
+++ b/PermissionController/res/drawable-v33/safety_status_recommend_to_info_anim.xml
@@ -1,65 +1,79 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_5_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_5_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundRecommend"
+                <group android:name="_R_G_L_5_G">
+                    <path android:name="_R_G_L_5_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundRecommend"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_4_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_4_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                    <path android:name="_R_G_L_4_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_3_G" android:translateX="281.25"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusRecommend"
-                          android:fillAlpha="1" android:fillType="nonZero"
+                <group android:name="_R_G_L_3_G" android:translateX="112.5" android:translateY="112"
+                       android:scaleX="4" android:scaleY="4">
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusRecommend" android:fillAlpha="1"
+                          android:fillType="nonZero"
                           android:pathData=" M-14 -12.37 C-14,-12.37 0,-17.5 0,-17.5 C0,-17.5 14,-12.37 14,-12.37 C14,-12.37 14,-1.63 14,-1.63 C14,2.8 12.6,6.77 10.03,10.5 C7.47,14.23 3.97,16.57 0,17.5 C-3.97,16.57 -7.47,14.23 -10.03,10.5 C-12.6,6.77 -14,2.8 -14,-1.63 C-14,-1.63 -14,-12.37 -14,-12.37c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="281.25"
-                       android:translateY="275" android:rotation="135" android:scaleX="10"
-                       android:scaleY="0">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "/>
+                <group android:name="_R_G_L_2_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="0">
+                    <group android:name="_R_G_L_2_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:rotation="-49.449" android:scaleX="0.25" android:scaleY="0.25">
+                        <path android:name="_R_G_L_2_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="0"
+                              android:fillType="nonZero"
+                              android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "/>
+                        <path android:name="_R_G_L_2_G_D_1_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="0"
+                              android:fillType="nonZero"
+                              android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "/>
+                    </group>
                 </group>
-                <group android:name="_R_G_L_1_G_N_2_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G_N_2_T_1" android:translateX="0"
-                           android:translateY="-4" android:rotation="0">
-                        <group android:name="_R_G_L_1_G_N_2_T_0" android:translateY="4">
-                            <group android:name="_R_G_L_1_G_T_1" android:translateX="0"
-                                   android:translateY="5.333">
-                                <group android:name="_R_G_L_1_G" android:translateY="-5.333">
-                                    <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
-                                           android:pivotY="1.871" android:scaleX="1"
-                                           android:scaleY="1">
-                                        <path android:name="_R_G_L_1_G_D_0_P_0"
-                                              android:fillColor="?attr/colorScShieldAccent" android:fillAlpha="1"
-                                              android:fillType="nonZero"
-                                              android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                                    </group>
+                <group android:name="_R_G_L_1_G_N_2_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G_N_2_T_1" android:translateX="-0.001"
+                           android:translateY="-3.999" android:scaleX="0.25" android:scaleY="0.25"
+                           android:rotation="0">
+                        <group android:name="_R_G_L_1_G_N_2_T_0" android:translateX="-111.997"
+                               android:translateY="-96.002">
+                            <group android:name="_R_G_L_1_G_T_1" android:translateX="112"
+                                   android:translateY="112" android:scaleX="1" android:scaleY="1">
+                                <group android:name="_R_G_L_1_G" android:translateX="-112"
+                                       android:translateY="-112">
+                                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                                          android:fillColor="?attr/colorSurface"
+                                          android:fillAlpha="1" android:fillType="nonZero"
+                                          android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                                 </group>
                             </group>
                         </group>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G_T_1" android:translateX="0"
-                           android:translateY="-4" android:rotation="0">
-                        <group android:name="_R_G_L_0_G" android:translateY="4">
-                            <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G_T_1" android:translateX="-0.001"
+                           android:translateY="-3.999" android:scaleX="0.25" android:scaleY="0.25"
+                           android:rotation="0">
+                        <group android:name="_R_G_L_0_G" android:translateX="-111.997"
+                               android:translateY="-96.002">
+                            <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                                   android:translateX="111.997" android:translateY="96.002"
+                                   android:pivotX="0.055" android:pivotY="-18.901"
                                    android:scaleX="1" android:scaleY="1">
-                                <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                      android:fillAlpha="1" android:fillType="nonZero"
-                                      android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                                <path android:name="_R_G_L_0_G_D_0_P_0"
+                                      android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                      android:fillType="nonZero"
+                                      android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                             </group>
                         </group>
                     </group>
@@ -89,28 +103,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -120,24 +134,30 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="fillColor" android:duration="150"
-                                android:startOffset="0" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
+                                android:startOffset="0"
+                                android:valueFrom="?attr/colorScStatusRecommend"
+                                android:valueTo="?attr/colorScStatusRecommend"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="150" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusRecommend"
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="450"
-                                android:startOffset="317" android:valueFrom="?attr/colorScStatusInfo"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:startOffset="317"
+                                android:valueFrom="?attr/colorScStatusInfo"
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -150,43 +170,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -197,42 +217,90 @@
     <target android:name="_R_G_L_2_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
+                <objectAnimator android:propertyName="fillAlpha" android:duration="283"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="fillAlpha" android:duration="17"
+                                android:startOffset="283" android:valueFrom="0" android:valueTo="1"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
                 <objectAnimator android:propertyName="pathData" android:duration="300"
                                 android:startOffset="0"
-                                android:valueFrom="M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "
-                                android:valueTo="M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="33"
+                <objectAnimator android:propertyName="pathData" android:duration="350"
                                 android:startOffset="300"
-                                android:valueFrom="M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "
-                                android:valueTo="M-4.21 3.84 C-4.21,3.84 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -4.21,3.84 -4.21,3.84c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="fillAlpha" android:duration="283"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="117"
-                                android:startOffset="333"
-                                android:valueFrom="M-4.21 3.84 C-4.21,3.84 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -4.21,3.84 -4.21,3.84c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                <objectAnimator android:propertyName="fillAlpha" android:duration="17"
+                                android:startOffset="283" android:valueFrom="0" android:valueTo="1"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="300"
+                                android:startOffset="0"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.7 0.44,0.44 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="317"
-                                android:startOffset="450"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                <objectAnimator android:propertyName="pathData" android:duration="350"
+                                android:startOffset="300"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -241,18 +309,11 @@
     <target android:name="_R_G_L_2_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="rotation" android:duration="133"
-                                android:startOffset="0" android:valueFrom="135"
-                                android:valueTo="135" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="150"
-                                android:startOffset="133" android:valueFrom="135"
+                <objectAnimator android:propertyName="rotation" android:duration="283"
+                                android:startOffset="0" android:valueFrom="-49.449"
                                 android:valueTo="-49.449" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.319,0 0,0.887 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="rotation" android:duration="350"
@@ -272,70 +333,76 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_2_G">
+    <target android:name="_R_G_L_2_G_N_1_T_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0"
-                                android:startOffset="300" android:valueFrom="0" android:valueTo="10"
-                                android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="133"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                <objectAnimator android:propertyName="scaleX" android:duration="150"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="133"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                <objectAnimator android:propertyName="scaleY" android:duration="150"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="100"
-                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
-                                android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleX" android:duration="450"
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="100"
-                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
-                                android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleY" android:duration="450"
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="133"
-                                android:startOffset="233" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="scaleX" android:duration="167"
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="133"
-                                android:startOffset="233" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="scaleY" android:duration="167"
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="400"
-                                android:startOffset="367" android:valueFrom="0" android:valueTo="0"
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_1_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0"
+                                android:startOffset="300" android:valueFrom="0" android:valueTo="4"
+                                android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="fillAlpha" android:duration="283"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="400"
-                                android:startOffset="367" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="fillAlpha" android:duration="17"
+                                android:startOffset="283" android:valueFrom="1" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
@@ -348,29 +415,46 @@
     <target android:name="_R_G_L_1_G_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="133"
+                <objectAnimator android:propertyName="translateXY" android:duration="167"
                                 android:startOffset="0" android:propertyXName="translateX"
                                 android:propertyYName="translateY"
-                                android:pathData="M 0,5.333C 0,5.333 0,5.333 0,5.333">
+                                android:pathData="M 112,112C 112,108.25 112,93.25 112,89.5">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.2,0.2 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="200"
-                                android:startOffset="133" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,5.333C 0,3.8870000000000005 0,-1.898 0,-3.344">
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="133"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="433"
-                                android:startOffset="333" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,-3.344C 0,-3.344 0,-3.344 0,-3.344">
+                <objectAnimator android:propertyName="scaleY" android:duration="133"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="117"
+                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="117"
+                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,0 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -379,30 +463,13 @@
     <target android:name="_R_G_L_1_G_N_2_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="133"
+                <objectAnimator android:propertyName="translateXY" android:duration="283"
                                 android:startOffset="0" android:propertyXName="translateX"
                                 android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0,-4 0,-4 0,-4">
+                                android:pathData="M -0.001,-3.999C -0.36,-2.801 -1.798,1.9900000000000002 -2.157,3.188">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.3,0.3 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="150"
-                                android:startOffset="133" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0.284,-4.155 1.417,-4.773 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="483"
-                                android:startOffset="283" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 1.701,-4.928C 1.701,-4.928 1.701,-4.928 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.8,0.8 1.0,1.0"/>
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -411,25 +478,11 @@
     <target android:name="_R_G_L_1_G_N_2_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="rotation" android:duration="133"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="rotation" android:duration="617"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="321"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="150"
-                                android:startOffset="133" android:valueFrom="0"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="483"
-                                android:startOffset="283" android:valueFrom="172"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -439,43 +492,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -508,46 +561,32 @@
     <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="133"
+                <objectAnimator android:propertyName="scaleX" android:duration="200"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="133"
+                <objectAnimator android:propertyName="scaleY" android:duration="200"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="133" android:valueFrom="1"
-                                android:valueTo="0.79" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.225,0 0.573,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="133" android:valueFrom="1"
-                                android:valueTo="0.9400000000000001" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.225,0 0.573,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="483"
-                                android:startOffset="283" android:valueFrom="0.79"
-                                android:valueTo="0.79" android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleX" android:duration="100"
+                                android:startOffset="200" android:valueFrom="1"
+                                android:valueTo="0.77338" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.299,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="483"
-                                android:startOffset="283" android:valueFrom="0.9400000000000001"
-                                android:valueTo="0.9400000000000001" android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleY" android:duration="100"
+                                android:startOffset="200" android:valueFrom="1"
+                                android:valueTo="0.9275700000000001" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.299,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -556,30 +595,13 @@
     <target android:name="_R_G_L_0_G_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="133"
+                <objectAnimator android:propertyName="translateXY" android:duration="283"
                                 android:startOffset="0" android:propertyXName="translateX"
                                 android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0,-4 0,-4 0,-4">
+                                android:pathData="M -0.001,-3.999C -0.36,-2.801 -1.798,1.9900000000000002 -2.157,3.188">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.3,0.3 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="150"
-                                android:startOffset="133" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0.284,-4.155 1.417,-4.773 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="483"
-                                android:startOffset="283" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 1.701,-4.928C 1.701,-4.928 1.701,-4.928 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.8,0.8 1.0,1.0"/>
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -588,25 +610,11 @@
     <target android:name="_R_G_L_0_G_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="rotation" android:duration="133"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="rotation" android:duration="617"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="321"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="150"
-                                android:startOffset="133" android:valueFrom="0"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="483"
-                                android:startOffset="283" android:valueFrom="172"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -616,43 +624,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -664,7 +672,7 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleY" android:duration="0"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="4"
                                 android:valueType="floatType"/>
             </set>
         </aapt:attr>
@@ -673,7 +681,7 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleY" android:duration="0"
-                                android:startOffset="300" android:valueFrom="10" android:valueTo="0"
+                                android:startOffset="317" android:valueFrom="4" android:valueTo="0"
                                 android:valueType="floatType"/>
             </set>
         </aapt:attr>
diff --git a/PermissionController/res/drawable-v33/safety_status_warn_to_info_anim.xml b/PermissionController/res/drawable-v33/safety_status_warn_to_info_anim.xml
index 0fc02b3fa..00b4ff886 100644
--- a/PermissionController/res/drawable-v33/safety_status_warn_to_info_anim.xml
+++ b/PermissionController/res/drawable-v33/safety_status_warn_to_info_anim.xml
@@ -1,65 +1,79 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_5_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_5_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundWarn"
+                <group android:name="_R_G_L_5_G">
+                    <path android:name="_R_G_L_5_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundWarn"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_4_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_4_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                    <path android:name="_R_G_L_4_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_3_G" android:translateX="281.25"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusWarn"
-                          android:fillAlpha="1" android:fillType="nonZero"
+                <group android:name="_R_G_L_3_G" android:translateX="112.5" android:translateY="112"
+                       android:scaleX="4" android:scaleY="4">
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusWarn" android:fillAlpha="1"
+                          android:fillType="nonZero"
                           android:pathData=" M-14 -12.37 C-14,-12.37 0,-17.5 0,-17.5 C0,-17.5 14,-12.37 14,-12.37 C14,-12.37 14,-1.63 14,-1.63 C14,2.8 12.6,6.77 10.03,10.5 C7.47,14.23 3.97,16.57 0,17.5 C-3.97,16.57 -7.47,14.23 -10.03,10.5 C-12.6,6.77 -14,2.8 -14,-1.63 C-14,-1.63 -14,-12.37 -14,-12.37c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="281.25"
-                       android:translateY="275" android:rotation="135" android:scaleX="10"
-                       android:scaleY="0">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "/>
+                <group android:name="_R_G_L_2_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="0">
+                    <group android:name="_R_G_L_2_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:rotation="-49.449" android:scaleX="0.25" android:scaleY="0.25">
+                        <path android:name="_R_G_L_2_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="0"
+                              android:fillType="nonZero"
+                              android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "/>
+                        <path android:name="_R_G_L_2_G_D_1_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="0"
+                              android:fillType="nonZero"
+                              android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "/>
+                    </group>
                 </group>
-                <group android:name="_R_G_L_1_G_N_2_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G_N_2_T_1" android:translateX="0"
-                           android:translateY="-4" android:rotation="0">
-                        <group android:name="_R_G_L_1_G_N_2_T_0" android:translateY="4">
-                            <group android:name="_R_G_L_1_G_T_1" android:translateX="0"
-                                   android:translateY="5.333">
-                                <group android:name="_R_G_L_1_G" android:translateY="-5.333">
-                                    <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0"
-                                           android:pivotY="1.871" android:scaleX="1"
-                                           android:scaleY="1">
-                                        <path android:name="_R_G_L_1_G_D_0_P_0"
-                                              android:fillColor="?attr/colorScShieldAccent" android:fillAlpha="1"
-                                              android:fillType="nonZero"
-                                              android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                                    </group>
+                <group android:name="_R_G_L_1_G_N_2_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G_N_2_T_1" android:translateX="-0.001"
+                           android:translateY="-3.999" android:scaleX="0.25" android:scaleY="0.25"
+                           android:rotation="0">
+                        <group android:name="_R_G_L_1_G_N_2_T_0" android:translateX="-111.997"
+                               android:translateY="-96.002">
+                            <group android:name="_R_G_L_1_G_T_1" android:translateX="112"
+                                   android:translateY="112" android:scaleX="1" android:scaleY="1">
+                                <group android:name="_R_G_L_1_G" android:translateX="-112"
+                                       android:translateY="-112">
+                                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                                          android:fillColor="?attr/colorSurface"
+                                          android:fillAlpha="1" android:fillType="nonZero"
+                                          android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                                 </group>
                             </group>
                         </group>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G_T_1" android:translateX="0"
-                           android:translateY="-4" android:rotation="0">
-                        <group android:name="_R_G_L_0_G" android:translateY="4">
-                            <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G_T_1" android:translateX="-0.001"
+                           android:translateY="-3.999" android:scaleX="0.25" android:scaleY="0.25"
+                           android:rotation="0">
+                        <group android:name="_R_G_L_0_G" android:translateX="-111.997"
+                               android:translateY="-96.002">
+                            <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                                   android:translateX="111.997" android:translateY="96.002"
+                                   android:pivotX="0.055" android:pivotY="-18.901"
                                    android:scaleX="1" android:scaleY="1">
-                                <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                      android:fillAlpha="1" android:fillType="nonZero"
-                                      android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                                <path android:name="_R_G_L_0_G_D_0_P_0"
+                                      android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                      android:fillType="nonZero"
+                                      android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                             </group>
                         </group>
                     </group>
@@ -89,28 +103,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -121,23 +135,28 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="fillColor" android:duration="150"
                                 android:startOffset="0" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusWarn" android:valueType="colorType">
+                                android:valueTo="?attr/colorScStatusWarn"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="150" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusWarn"
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="450"
-                                android:startOffset="317" android:valueFrom="?attr/colorScStatusInfo"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:startOffset="317"
+                                android:valueFrom="?attr/colorScStatusInfo"
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -150,43 +169,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -197,42 +216,90 @@
     <target android:name="_R_G_L_2_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
+                <objectAnimator android:propertyName="fillAlpha" android:duration="283"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="fillAlpha" android:duration="17"
+                                android:startOffset="283" android:valueFrom="0" android:valueTo="1"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
                 <objectAnimator android:propertyName="pathData" android:duration="300"
                                 android:startOffset="0"
-                                android:valueFrom="M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "
-                                android:valueTo="M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="33"
+                <objectAnimator android:propertyName="pathData" android:duration="350"
                                 android:startOffset="300"
-                                android:valueFrom="M-2.21 1.86 C-2.21,1.86 0.25,4.33 0.25,4.33 C0.25,4.33 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -2.21,1.86 -2.21,1.86c "
-                                android:valueTo="M-4.21 3.84 C-4.21,3.84 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -4.21,3.84 -4.21,3.84c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="fillAlpha" android:duration="283"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="117"
-                                android:startOffset="333"
-                                android:valueFrom="M-4.21 3.84 C-4.21,3.84 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.76,1.39 -1.76,1.39 C-1.76,1.39 -4.21,3.84 -4.21,3.84c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                <objectAnimator android:propertyName="fillAlpha" android:duration="17"
+                                android:startOffset="283" android:valueFrom="0" android:valueTo="1"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="300"
+                                android:startOffset="0"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.7 0.44,0.44 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="pathData" android:duration="317"
-                                android:startOffset="450"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                <objectAnimator android:propertyName="pathData" android:duration="350"
+                                android:startOffset="300"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 105.33,115.27 105.33,115.27 C105.33,115.27 114.67,124.6 114.67,124.6 C114.67,124.6 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -241,18 +308,11 @@
     <target android:name="_R_G_L_2_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="rotation" android:duration="133"
-                                android:startOffset="0" android:valueFrom="135"
-                                android:valueTo="135" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="150"
-                                android:startOffset="133" android:valueFrom="135"
+                <objectAnimator android:propertyName="rotation" android:duration="283"
+                                android:startOffset="0" android:valueFrom="-49.449"
                                 android:valueTo="-49.449" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.319,0 0,0.887 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.001,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="rotation" android:duration="350"
@@ -272,70 +332,76 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_2_G">
+    <target android:name="_R_G_L_2_G_N_1_T_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleY" android:duration="0"
-                                android:startOffset="300" android:valueFrom="0" android:valueTo="10"
-                                android:valueType="floatType"/>
-            </set>
-        </aapt:attr>
-    </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="133"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                <objectAnimator android:propertyName="scaleX" android:duration="150"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="133"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                <objectAnimator android:propertyName="scaleY" android:duration="150"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="100"
-                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
-                                android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleX" android:duration="450"
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="100"
-                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
-                                android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleY" android:duration="450"
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="133"
-                                android:startOffset="233" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="scaleX" android:duration="167"
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="133"
-                                android:startOffset="233" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="scaleY" android:duration="167"
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="400"
-                                android:startOffset="367" android:valueFrom="0" android:valueTo="0"
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_2_G_N_1_T_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleY" android:duration="0"
+                                android:startOffset="300" android:valueFrom="0" android:valueTo="4"
+                                android:valueType="floatType"/>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_D_0_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="fillAlpha" android:duration="283"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="400"
-                                android:startOffset="367" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="fillAlpha" android:duration="17"
+                                android:startOffset="283" android:valueFrom="1" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
@@ -348,29 +414,46 @@
     <target android:name="_R_G_L_1_G_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="133"
+                <objectAnimator android:propertyName="translateXY" android:duration="167"
                                 android:startOffset="0" android:propertyXName="translateX"
                                 android:propertyYName="translateY"
-                                android:pathData="M 0,5.333C 0,5.333 0,5.333 0,5.333">
+                                android:pathData="M 112,112C 112,108.25 112,93.25 112,89.5">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.2,0.2 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="200"
-                                android:startOffset="133" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,5.333C 0,3.8870000000000005 0,-1.898 0,-3.344">
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_1_G_T_1">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="scaleX" android:duration="133"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="433"
-                                android:startOffset="333" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,-3.344C 0,-3.344 0,-3.344 0,-3.344">
+                <objectAnimator android:propertyName="scaleY" android:duration="133"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleX" android:duration="117"
+                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="scaleY" android:duration="117"
+                                android:startOffset="133" android:valueFrom="1" android:valueTo="0"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,0 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -379,30 +462,13 @@
     <target android:name="_R_G_L_1_G_N_2_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="133"
+                <objectAnimator android:propertyName="translateXY" android:duration="283"
                                 android:startOffset="0" android:propertyXName="translateX"
                                 android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0,-4 0,-4 0,-4">
+                                android:pathData="M -0.001,-3.999C -0.36,-2.801 -1.798,1.9900000000000002 -2.157,3.188">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.3,0.3 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="150"
-                                android:startOffset="133" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0.284,-4.155 1.417,-4.773 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="483"
-                                android:startOffset="283" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 1.701,-4.928C 1.701,-4.928 1.701,-4.928 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.8,0.8 1.0,1.0"/>
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -411,25 +477,11 @@
     <target android:name="_R_G_L_1_G_N_2_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="rotation" android:duration="133"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="rotation" android:duration="617"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="321"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="150"
-                                android:startOffset="133" android:valueFrom="0"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="483"
-                                android:startOffset="283" android:valueFrom="172"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -439,43 +491,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -508,46 +560,32 @@
     <target android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="scaleX" android:duration="133"
+                <objectAnimator android:propertyName="scaleX" android:duration="200"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="133"
+                <objectAnimator android:propertyName="scaleY" android:duration="200"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="133" android:valueFrom="1"
-                                android:valueTo="0.79" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.225,0 0.573,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="133" android:valueFrom="1"
-                                android:valueTo="0.9400000000000001" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.225,0 0.573,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="483"
-                                android:startOffset="283" android:valueFrom="0.79"
-                                android:valueTo="0.79" android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleX" android:duration="100"
+                                android:startOffset="200" android:valueFrom="1"
+                                android:valueTo="0.77338" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.299,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="483"
-                                android:startOffset="283" android:valueFrom="0.9400000000000001"
-                                android:valueTo="0.9400000000000001" android:valueType="floatType">
+                <objectAnimator android:propertyName="scaleY" android:duration="100"
+                                android:startOffset="200" android:valueFrom="1"
+                                android:valueTo="0.9275700000000001" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.299,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -556,30 +594,13 @@
     <target android:name="_R_G_L_0_G_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="translateXY" android:duration="133"
+                <objectAnimator android:propertyName="translateXY" android:duration="283"
                                 android:startOffset="0" android:propertyXName="translateX"
                                 android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0,-4 0,-4 0,-4">
+                                android:pathData="M -0.001,-3.999C -0.36,-2.801 -1.798,1.9900000000000002 -2.157,3.188">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.3,0.3 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="150"
-                                android:startOffset="133" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 0,-4C 0.284,-4.155 1.417,-4.773 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="translateXY" android:duration="483"
-                                android:startOffset="283" android:propertyXName="translateX"
-                                android:propertyYName="translateY"
-                                android:pathData="M 1.701,-4.928C 1.701,-4.928 1.701,-4.928 1.701,-4.928">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.8,0.8 1.0,1.0"/>
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -588,25 +609,11 @@
     <target android:name="_R_G_L_0_G_T_1">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="rotation" android:duration="133"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="0"
+                <objectAnimator android:propertyName="rotation" android:duration="617"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="321"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="150"
-                                android:startOffset="133" android:valueFrom="0"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.3,0 0.8,0.15 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="rotation" android:duration="483"
-                                android:startOffset="283" android:valueFrom="172"
-                                android:valueTo="172" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -616,43 +623,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -664,7 +671,7 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleY" android:duration="0"
-                                android:startOffset="0" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0" android:valueTo="4"
                                 android:valueType="floatType"/>
             </set>
         </aapt:attr>
@@ -673,7 +680,7 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleY" android:duration="0"
-                                android:startOffset="300" android:valueFrom="10" android:valueTo="0"
+                                android:startOffset="317" android:valueFrom="4" android:valueTo="0"
                                 android:valueType="floatType"/>
             </set>
         </aapt:attr>
diff --git a/PermissionController/res/drawable-v33/safety_status_warn_to_recommend_anim.xml b/PermissionController/res/drawable-v33/safety_status_warn_to_recommend_anim.xml
index 16023a6e1..871b529cb 100644
--- a/PermissionController/res/drawable-v33/safety_status_warn_to_recommend_anim.xml
+++ b/PermissionController/res/drawable-v33/safety_status_warn_to_recommend_anim.xml
@@ -1,61 +1,55 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_4_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_4_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundWarn"
+                <group android:name="_R_G_L_4_G">
+                    <path android:name="_R_G_L_4_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundWarn"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_3_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundRecommend"
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundRecommend"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="281.25"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusWarn"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.37 C-14,-12.37 0,-17.5 0,-17.5 C0,-17.5 14,-12.37 14,-12.37 C14,-12.37 14,-1.63 14,-1.63 C14,2.8 12.6,6.77 10.03,10.5 C7.47,14.23 3.97,16.57 0,17.5 C-3.97,16.57 -7.47,14.23 -10.03,10.5 C-12.6,6.77 -14,2.8 -14,-1.63 C-14,-1.63 -14,-12.37 -14,-12.37c "/>
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusWarn" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G_N_2_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G">
-                        <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                              android:fillAlpha="1" android:fillType="nonZero"
-                              android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:scaleX="0.25" android:scaleY="0.25">
+                        <path android:name="_R_G_L_1_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G">
-                        <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                              android:fillAlpha="1" android:fillType="nonZero"
-                              android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G" android:translateX="-111.999"
+                           android:translateY="-86.34700000000001" android:pivotX="111.999"
+                           android:pivotY="77.796" android:scaleX="0.25" android:scaleY="0.25">
+                        <path android:name="_R_G_L_0_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M121.33 77.33 C121.33,77.33 102.66,77.33 102.66,77.33 C102.66,77.33 102.66,114.67 102.66,114.67 C102.66,114.67 121.33,114.67 121.33,114.67 C121.33,114.67 121.33,77.33 121.33,77.33c "/>
                     </group>
                 </group>
             </group>
             <group android:name="time_group"/>
         </vector>
     </aapt:attr>
-    <target android:name="_R_G_L_4_G_D_0_P_0">
-        <aapt:attr name="android:animation">
-            <set android:ordering="together">
-                <objectAnimator android:propertyName="fillAlpha" android:duration="150"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="0"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-            </set>
-        </aapt:attr>
-    </target>
     <target android:name="_R_G_L_3_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
@@ -63,28 +57,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -93,25 +87,20 @@
     <target android:name="_R_G_L_2_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="fillColor" android:duration="150"
+                <objectAnimator android:propertyName="fillColor" android:duration="183"
                                 android:startOffset="0" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusWarn" android:valueType="colorType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="150" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
+                                android:valueTo="?attr/colorScStatusWarn"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
-                <objectAnimator android:propertyName="fillColor" android:duration="450"
-                                android:startOffset="317" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
+                <objectAnimator android:propertyName="fillColor" android:duration="333"
+                                android:startOffset="183"
+                                android:valueFrom="?attr/colorScStatusWarn"
+                                android:valueTo="?attr/colorScStatusRecommend"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -124,93 +113,83 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_N_2_N_1_T_0">
+    <target android:name="_R_G_L_1_G_N_1_T_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -220,45 +199,45 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
diff --git a/PermissionController/res/drawable-v33/status_info_to_scanning_anim.xml b/PermissionController/res/drawable-v33/status_info_to_scanning_anim.xml
index 823881719..2c22f6ae9 100644
--- a/PermissionController/res/drawable-v33/status_info_to_scanning_anim.xml
+++ b/PermissionController/res/drawable-v33/status_info_to_scanning_anim.xml
@@ -1,26 +1,30 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                <group android:name="_R_G_L_2_G">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusInfo"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_1_G">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusInfo" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "/>
+                <group android:name="_R_G_L_0_G">
+                    <path android:name="_R_G_L_0_G_D_0_P_0"
+                          android:fillColor="?attr/colorScShieldAccent" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "/>
+                    <path android:name="_R_G_L_0_G_D_1_P_0"
+                          android:fillColor="?attr/colorScShieldAccent" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -83,29 +87,94 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="pathData" android:duration="83"
                                 android:startOffset="0"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-4.2 3.84 C-4.2,3.84 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.39 -1.75,1.39 C-1.75,1.39 -4.2,3.84 -4.2,3.84c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 94.77,124.55 94.77,124.55 C94.77,124.55 104.1,115.22 104.1,115.22 C104.1,115.22 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="250"
+                                android:startOffset="83"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 94.77,124.55 94.77,124.55 C94.77,124.55 104.1,115.22 104.1,115.22 C104.1,115.22 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M143.78 95.07 C143.78,95.07 134.58,85.93 134.58,85.93 C134.58,85.93 134.54,85.72 134.54,85.72 C134.54,85.72 134.53,85.72 134.53,85.72 C134.53,85.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 143.78,95.07 143.78,95.07c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="17"
+                                android:startOffset="333"
+                                android:valueFrom="M143.78 95.07 C143.78,95.07 134.58,85.93 134.58,85.93 C134.58,85.93 134.54,85.72 134.54,85.72 C134.54,85.72 134.53,85.72 134.53,85.72 C134.53,85.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 143.78,95.07 143.78,95.07c "
+                                android:valueTo="M143.78 95.07 C143.78,95.07 134.58,85.93 134.58,85.93 C134.58,85.93 134.54,85.72 134.54,85.72 C134.54,85.72 134.53,85.72 134.53,85.72 C134.53,85.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 143.78,95.07 143.78,95.07c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="fillAlpha" android:duration="250"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="1"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="fillAlpha" android:duration="83"
+                                android:startOffset="250" android:valueFrom="1" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+                <objectAnimator android:propertyName="fillAlpha" android:duration="17"
+                                android:startOffset="333" android:valueFrom="0" android:valueTo="0"
+                                android:valueType="floatType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="83"
+                                android:startOffset="0"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 94.77,124.55 94.77,124.55 C94.77,124.55 104.1,115.22 104.1,115.22 C104.1,115.22 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 1,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="pathData" android:duration="250"
                                 android:startOffset="83"
-                                android:valueFrom="M-4.2 3.84 C-4.2,3.84 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.39 -1.75,1.39 C-1.75,1.39 -4.2,3.84 -4.2,3.84c "
-                                android:valueTo="M5.59 -5.95 C5.59,-5.95 8.03,-3.49 8.03,-3.49 C8.03,-3.49 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 5.58,-5.94 5.58,-5.94 C5.58,-5.94 5.61,-5.98 5.61,-5.98 C5.61,-5.98 5.59,-5.95 5.59,-5.95c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 94.77,124.55 94.77,124.55 C94.77,124.55 104.1,115.22 104.1,115.22 C104.1,115.22 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M143.78 95.07 C143.78,95.07 134.58,85.93 134.58,85.93 C134.58,85.93 134.54,85.72 134.54,85.72 C134.54,85.72 134.53,85.72 134.53,85.72 C134.53,85.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 143.78,95.07 143.78,95.07c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0,0 0.667,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="pathData" android:duration="17"
                                 android:startOffset="333"
-                                android:valueFrom="M5.59 -5.95 C5.59,-5.95 8.03,-3.49 8.03,-3.49 C8.03,-3.49 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 5.58,-5.94 5.58,-5.94 C5.58,-5.94 5.61,-5.98 5.61,-5.98 C5.61,-5.98 5.59,-5.95 5.59,-5.95c "
-                                android:valueTo="M5.59 -5.95 C5.59,-5.95 8.03,-3.49 8.03,-3.49 C8.03,-3.49 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 5.58,-5.94 5.58,-5.94 C5.58,-5.94 5.61,-5.98 5.61,-5.98 C5.61,-5.98 5.59,-5.95 5.59,-5.95c "
+                                android:valueFrom="M143.78 95.07 C143.78,95.07 134.58,85.93 134.58,85.93 C134.58,85.93 134.54,85.72 134.54,85.72 C134.54,85.72 134.53,85.72 134.53,85.72 C134.53,85.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 143.78,95.07 143.78,95.07c "
+                                android:valueTo="M143.78 95.07 C143.78,95.07 134.58,85.93 134.58,85.93 C134.58,85.93 134.54,85.72 134.54,85.72 C134.54,85.72 134.53,85.72 134.53,85.72 C134.53,85.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 143.78,95.07 143.78,95.07c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.333,0 0.667,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -120,4 +189,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_recommend_to_scanning_anim.xml b/PermissionController/res/drawable-v33/status_recommend_to_scanning_anim.xml
index c7fc62750..f97632f72 100644
--- a/PermissionController/res/drawable-v33/status_recommend_to_scanning_anim.xml
+++ b/PermissionController/res/drawable-v33/status_recommend_to_scanning_anim.xml
@@ -1,38 +1,35 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundRecommend"
+                <group android:name="_R_G_L_3_G">
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundRecommend"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusRecommend"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusRecommend" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,62.53 168,62.53 C168,62.53 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="279.998"
-                       android:translateY="327.289" android:pivotY="5.333" android:scaleX="9.86664"
-                       android:scaleY="9.86664">
-                    <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                           android:scaleX="1" android:scaleY="1">
-                        <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                              android:fillAlpha="1" android:fillType="nonZero"
-                              android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                    </group>
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorSurface"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="9.86664" android:scaleY="9.86664">
-                    <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                           android:scaleX="1" android:scaleY="1">
-                        <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                              android:fillAlpha="1" android:fillType="nonZero"
-                              android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G">
+                    <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="111.997"
+                           android:translateY="96.002" android:pivotX="0.055"
+                           android:pivotY="-18.901" android:scaleX="1" android:scaleY="1">
+                        <path android:name="_R_G_L_0_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                     </group>
                 </group>
             </group>
@@ -61,21 +58,21 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -124,4 +121,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_scanning_anim_info.xml b/PermissionController/res/drawable-v33/status_scanning_anim_info.xml
index a63e45fa1..7e5998c4b 100644
--- a/PermissionController/res/drawable-v33/status_scanning_anim_info.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_anim_info.xml
@@ -1,24 +1,27 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_2_G">
+                <group android:name="_R_G_L_2_G" android:translateX="-168" android:translateY="-168"
+                       android:pivotX="280" android:pivotY="280" android:scaleX="0.4"
+                       android:scaleY="0.4">
                     <path android:name="_R_G_L_2_G_S" android:fillColor="?attr/colorSurface"
                           android:pathData="M0,0 L560,0 L560,560 L0,560z"/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="1" android:scaleY="1">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="0.1" android:scaleY="0.1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScStatusInfo"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_0_G">
+                    <path android:name="_R_G_L_0_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusInfo" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -48,14 +51,14 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="1000"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0.1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="1000"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0.1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
diff --git a/PermissionController/res/drawable-v33/status_scanning_anim_recommend.xml b/PermissionController/res/drawable-v33/status_scanning_anim_recommend.xml
index 21671c626..335ee5307 100644
--- a/PermissionController/res/drawable-v33/status_scanning_anim_recommend.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_anim_recommend.xml
@@ -1,24 +1,27 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_2_G">
+                <group android:name="_R_G_L_2_G" android:translateX="-168" android:translateY="-168"
+                       android:pivotX="280" android:pivotY="280" android:scaleX="0.4"
+                       android:scaleY="0.4">
                     <path android:name="_R_G_L_2_G_S" android:fillColor="?attr/colorSurface"
                           android:pathData="M0,0 L560,0 L560,560 L0,560z"/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="1" android:scaleY="1">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundRecommend"
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="0.1" android:scaleY="0.1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundRecommend"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScStatusRecommend"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_0_G">
+                    <path android:name="_R_G_L_0_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusRecommend" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,62.53 168,62.53 C168,62.53 112,42 112,42c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -48,14 +51,14 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="1000"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0.1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="1000"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0.1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
@@ -73,4 +76,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_scanning_anim_warn.xml b/PermissionController/res/drawable-v33/status_scanning_anim_warn.xml
index c46e9a283..e35f1ebdd 100644
--- a/PermissionController/res/drawable-v33/status_scanning_anim_warn.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_anim_warn.xml
@@ -1,24 +1,27 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_2_G">
+                <group android:name="_R_G_L_2_G" android:translateX="-168" android:translateY="-168"
+                       android:pivotX="280" android:pivotY="280" android:scaleX="0.4"
+                       android:scaleY="0.4">
                     <path android:name="_R_G_L_2_G_S" android:fillColor="?attr/colorSurface"
                           android:pathData="M0,0 L560,0 L560,560 L0,560z"/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="1" android:scaleY="1">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundWarn"
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="0.1" android:scaleY="0.1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundWarn"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScStatusWarn"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_0_G">
+                    <path android:name="_R_G_L_0_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusWarn" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,62.53 168,62.53 C168,62.53 112,42 112,42c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -48,14 +51,14 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="1000"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0.1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="1000"
-                                android:startOffset="0" android:valueFrom="1" android:valueTo="10"
+                                android:startOffset="0" android:valueFrom="0.1" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
@@ -73,4 +76,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_info.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_info.xml
index 10d3a9bc3..936bbcbd5 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_info.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_info.xml
@@ -1,26 +1,31 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusInfo"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusInfo" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
+                <group android:name="_R_G_L_0_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorSurface"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "/>
+                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="?attr/colorSurface"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-7.87 0.18 C-7.87,0.18 -7.86,0.19 -7.86,0.19 C-7.86,0.19 -5.41,-2.25 -5.41,-2.25 C-5.41,-2.25 -5.39,-2.23 -5.39,-2.23 C-5.39,-2.23 -5.42,-2.26 -5.42,-2.26 C-5.42,-2.26 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "/>
+                          android:pathData=" M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -33,28 +38,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -64,31 +69,35 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -99,8 +108,8 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="pathData" android:duration="50"
                                 android:startOffset="0"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -7.86,0.19 -7.86,0.19 C-7.86,0.19 -5.41,-2.25 -5.41,-2.25 C-5.41,-2.25 -5.39,-2.23 -5.39,-2.23 C-5.39,-2.23 -5.42,-2.26 -5.42,-2.26 C-5.42,-2.26 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 0.7,3.85 0.7,3.85 C0.7,3.85 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                                android:valueFrom="M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
@@ -109,14 +118,40 @@
                 </objectAnimator>
                 <objectAnimator android:propertyName="pathData" android:duration="167"
                                 android:startOffset="50"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 0.7,3.85 0.7,3.85 C0.7,3.85 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="50"
+                                android:startOffset="0"
+                                android:valueFrom="M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="167"
+                                android:startOffset="50"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
             </set>
         </aapt:attr>
     </target>
@@ -124,31 +159,35 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -163,4 +202,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_recommend.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_recommend.xml
index 3e84ab99e..8df502847 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_recommend.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_recommend.xml
@@ -1,40 +1,47 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_3_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundRecommend"
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundRecommend"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusInfo"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusInfo" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G">
-                        <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                               android:scaleX="0" android:scaleY="0">
-                            <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                        </group>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:scaleX="0" android:scaleY="0">
+                        <path android:name="_R_G_L_1_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G">
-                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                               android:scaleX="1" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G" android:translateX="-111.999"
+                           android:translateY="-86.34700000000001" android:pivotX="111.999"
+                           android:pivotY="77.796" android:scaleX="0.25" android:scaleY="0.25">
+                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                               android:translateX="111.997" android:translateY="96.002"
+                               android:pivotX="0.055" android:pivotY="-18.901" android:scaleX="1"
+                               android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_D_0_P_0"
+                                  android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                  android:fillType="nonZero"
+                                  android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                         </group>
                     </group>
                 </group>
@@ -49,28 +56,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -81,23 +88,18 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="fillColor" android:duration="150"
                                 android:startOffset="0" android:valueFrom="?attr/colorScStatusInfo"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="150" android:valueFrom="?attr/colorScStatusInfo"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="fillColor" android:duration="367"
-                                android:startOffset="317" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusInfo"
+                                android:valueTo="?attr/colorScStatusRecommend"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -110,79 +112,69 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -192,43 +184,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -260,43 +252,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -313,4 +305,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_warn.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_warn.xml
index 6424dfc97..2ae23e1ed 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_warn.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_info_to_warn.xml
@@ -1,40 +1,47 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_3_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundWarn"
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundWarn"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusInfo"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusInfo" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G">
-                        <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                               android:scaleX="0" android:scaleY="0">
-                            <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                        </group>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:scaleX="0" android:scaleY="0">
+                        <path android:name="_R_G_L_1_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G">
-                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                               android:scaleX="1" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G" android:translateX="-111.999"
+                           android:translateY="-86.34700000000001" android:pivotX="111.999"
+                           android:pivotY="77.796" android:scaleX="0.25" android:scaleY="0.25">
+                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                               android:translateX="111.997" android:translateY="96.002"
+                               android:pivotX="0.055" android:pivotY="-18.901" android:scaleX="1"
+                               android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_D_0_P_0"
+                                  android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                  android:fillType="nonZero"
+                                  android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                         </group>
                     </group>
                 </group>
@@ -49,28 +56,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -81,23 +88,18 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="fillColor" android:duration="150"
                                 android:startOffset="0" android:valueFrom="?attr/colorScStatusInfo"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="150" android:valueFrom="?attr/colorScStatusInfo"
-                                android:valueTo="?attr/colorScStatusWarn" android:valueType="colorType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="fillColor" android:duration="33"
-                                android:startOffset="317" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusWarn" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusInfo"
+                                android:valueTo="?attr/colorScStatusWarn"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -110,79 +112,69 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -192,43 +184,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -260,43 +252,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -313,4 +305,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_info.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_info.xml
index 9e9929e0e..6fe13f3ba 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_info.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_info.xml
@@ -1,26 +1,31 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusRecommend"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusRecommend" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
+                <group android:name="_R_G_L_0_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorSurface"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "/>
+                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="?attr/colorSurface"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-7.87 0.18 C-7.87,0.18 -7.86,0.19 -7.86,0.19 C-7.86,0.19 -5.41,-2.25 -5.41,-2.25 C-5.41,-2.25 -5.39,-2.23 -5.39,-2.23 C-5.39,-2.23 -5.42,-2.26 -5.42,-2.26 C-5.42,-2.26 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "/>
+                          android:pathData=" M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -33,28 +38,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -63,17 +68,21 @@
     <target android:name="_R_G_L_1_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="fillColor" android:duration="133"
-                                android:startOffset="0" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
+                <objectAnimator android:propertyName="fillColor" android:duration="150"
+                                android:startOffset="0"
+                                android:valueFrom="?attr/colorScStatusRecommend"
+                                android:valueTo="?attr/colorScStatusRecommend"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="133" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusRecommend"
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -86,31 +95,35 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -121,8 +134,8 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="pathData" android:duration="50"
                                 android:startOffset="0"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -7.86,0.19 -7.86,0.19 C-7.86,0.19 -5.41,-2.25 -5.41,-2.25 C-5.41,-2.25 -5.39,-2.23 -5.39,-2.23 C-5.39,-2.23 -5.42,-2.26 -5.42,-2.26 C-5.42,-2.26 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 0.7,3.85 0.7,3.85 C0.7,3.85 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                                android:valueFrom="M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
@@ -131,14 +144,40 @@
                 </objectAnimator>
                 <objectAnimator android:propertyName="pathData" android:duration="167"
                                 android:startOffset="50"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 0.7,3.85 0.7,3.85 C0.7,3.85 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="50"
+                                android:startOffset="0"
+                                android:valueFrom="M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="167"
+                                android:startOffset="50"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
             </set>
         </aapt:attr>
     </target>
@@ -146,31 +185,35 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_recommend.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_recommend.xml
index 6c08f9a3e..f85e02eb0 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_recommend.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_recommend.xml
@@ -1,40 +1,47 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_3_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundRecommend"
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundRecommend"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusRecommend"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusRecommend" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G">
-                        <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                               android:scaleX="0" android:scaleY="0">
-                            <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                        </group>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:scaleX="0" android:scaleY="0">
+                        <path android:name="_R_G_L_1_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G">
-                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                               android:scaleX="1" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G" android:translateX="-111.999"
+                           android:translateY="-86.34700000000001" android:pivotX="111.999"
+                           android:pivotY="77.796" android:scaleX="0.25" android:scaleY="0.25">
+                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                               android:translateX="111.997" android:translateY="96.002"
+                               android:pivotX="0.055" android:pivotY="-18.901" android:scaleX="1"
+                               android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_D_0_P_0"
+                                  android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                  android:fillType="nonZero"
+                                  android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                         </group>
                     </group>
                 </group>
@@ -49,28 +56,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -80,79 +87,69 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -162,43 +159,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -230,43 +227,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -283,4 +280,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_warn.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_warn.xml
index eab453592..2bc46bb2c 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_warn.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_recommend_to_warn.xml
@@ -1,40 +1,47 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_3_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundWarn"
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundWarn"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusRecommend"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusRecommend" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G">
-                        <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                               android:scaleX="0" android:scaleY="0">
-                            <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                        </group>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:scaleX="0" android:scaleY="0">
+                        <path android:name="_R_G_L_1_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G">
-                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                               android:scaleX="1" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G" android:translateX="-111.999"
+                           android:translateY="-86.34700000000001" android:pivotX="111.999"
+                           android:pivotY="77.796" android:scaleX="0.25" android:scaleY="0.25">
+                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                               android:translateX="111.997" android:translateY="96.002"
+                               android:pivotX="0.055" android:pivotY="-18.901" android:scaleX="1"
+                               android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_D_0_P_0"
+                                  android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                  android:fillType="nonZero"
+                                  android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                         </group>
                     </group>
                 </group>
@@ -49,28 +56,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -80,16 +87,20 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="fillColor" android:duration="150"
-                                android:startOffset="0" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
+                                android:startOffset="0"
+                                android:valueFrom="?attr/colorScStatusRecommend"
+                                android:valueTo="?attr/colorScStatusRecommend"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="150" android:valueFrom="?attr/colorScStatusRecommend"
-                                android:valueTo="?attr/colorScStatusWarn" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusRecommend"
+                                android:valueTo="?attr/colorScStatusWarn"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -102,79 +113,69 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -184,43 +185,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -252,43 +253,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_info.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_info.xml
index d4961c58e..8d070d337 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_info.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_info.xml
@@ -1,26 +1,31 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundInfo"
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundInfo"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScStatusWarn"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusWarn" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
+                <group android:name="_R_G_L_0_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorSurface"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "/>
+                    <path android:name="_R_G_L_0_G_D_1_P_0" android:fillColor="?attr/colorSurface"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-7.87 0.18 C-7.87,0.18 -7.86,0.19 -7.86,0.19 C-7.86,0.19 -5.41,-2.25 -5.41,-2.25 C-5.41,-2.25 -5.39,-2.23 -5.39,-2.23 C-5.39,-2.23 -5.42,-2.26 -5.42,-2.26 C-5.42,-2.26 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "/>
+                          android:pathData=" M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "/>
                 </group>
             </group>
             <group android:name="time_group"/>
@@ -33,28 +38,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -63,17 +68,20 @@
     <target android:name="_R_G_L_1_G_D_0_P_0">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
-                <objectAnimator android:propertyName="fillColor" android:duration="133"
+                <objectAnimator android:propertyName="fillColor" android:duration="150"
                                 android:startOffset="0" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusWarn" android:valueType="colorType">
+                                android:valueTo="?attr/colorScStatusWarn"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="133" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusInfo" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusWarn"
+                                android:valueTo="?attr/colorScStatusInfo"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -86,31 +94,35 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -121,8 +133,8 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="pathData" android:duration="50"
                                 android:startOffset="0"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -7.86,0.19 -7.86,0.19 C-7.86,0.19 -5.41,-2.25 -5.41,-2.25 C-5.41,-2.25 -5.39,-2.23 -5.39,-2.23 C-5.39,-2.23 -5.42,-2.26 -5.42,-2.26 C-5.42,-2.26 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 0.7,3.85 0.7,3.85 C0.7,3.85 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                                android:valueFrom="M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
@@ -131,14 +143,40 @@
                 </objectAnimator>
                 <objectAnimator android:propertyName="pathData" android:duration="167"
                                 android:startOffset="50"
-                                android:valueFrom="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 0.7,3.85 0.7,3.85 C0.7,3.85 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
-                                android:valueTo="M-7.87 0.18 C-7.87,0.18 -1.75,6.3 -1.75,6.3 C-1.75,6.3 8.05,-3.5 8.05,-3.5 C8.05,-3.5 5.6,-5.95 5.6,-5.95 C5.6,-5.95 -1.75,1.4 -1.75,1.4 C-1.75,1.4 -5.42,-2.27 -5.42,-2.27 C-5.42,-2.27 -7.87,0.18 -7.87,0.18c "
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
+            </set>
+        </aapt:attr>
+    </target>
+    <target android:name="_R_G_L_0_G_D_1_P_0">
+        <aapt:attr name="android:animation">
+            <set android:ordering="together">
+                <objectAnimator android:propertyName="pathData" android:duration="50"
+                                android:startOffset="0"
+                                android:valueFrom="M80.31 109.98 C80.31,109.98 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 89.5,100.63 89.5,100.63 C89.5,100.63 89.86,100.7 89.86,100.7 C89.86,100.7 89.58,100.52 89.58,100.52 C89.58,100.52 80.31,109.98 80.31,109.98c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
                                 android:valueType="pathType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
+                <objectAnimator android:propertyName="pathData" android:duration="167"
+                                android:startOffset="50"
+                                android:valueFrom="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 104.73,114.96 104.73,114.96 C104.73,114.96 114.06,124.29 114.06,124.29 C114.06,124.29 104.53,135.26 104.53,135.26c "
+                                android:valueTo="M104.53 135.26 C104.53,135.26 80.27,110.06 80.27,110.06 C80.27,110.06 89.6,100.72 89.6,100.72 C89.6,100.72 104.53,114.72 104.53,114.72 C104.53,114.72 134.4,85.79 134.4,85.79 C134.4,85.79 143.73,95.12 143.73,95.12 C143.73,95.12 104.53,135.26 104.53,135.26c "
+                                android:valueType="pathType">
+                    <aapt:attr name="android:interpolator">
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.667,1 1.0,1.0"/>
+                    </aapt:attr>
+                </objectAnimator>
             </set>
         </aapt:attr>
     </target>
@@ -146,31 +184,35 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_recommend.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_recommend.xml
index 0793acf37..fa5bc61f8 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_recommend.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_recommend.xml
@@ -1,40 +1,47 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_3_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundRecommend"
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundRecommend"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusWarn"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusWarn" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G">
-                        <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                               android:scaleX="0" android:scaleY="0">
-                            <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                        </group>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:scaleX="0" android:scaleY="0">
+                        <path android:name="_R_G_L_1_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G">
-                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                               android:scaleX="1" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G" android:translateX="-111.999"
+                           android:translateY="-86.34700000000001" android:pivotX="111.999"
+                           android:pivotY="77.796" android:scaleX="0.25" android:scaleY="0.25">
+                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                               android:translateX="111.997" android:translateY="96.002"
+                               android:pivotX="0.055" android:pivotY="-18.901" android:scaleX="1"
+                               android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_D_0_P_0"
+                                  android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                  android:fillType="nonZero"
+                                  android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                         </group>
                     </group>
                 </group>
@@ -49,28 +56,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -81,23 +88,18 @@
             <set android:ordering="together">
                 <objectAnimator android:propertyName="fillColor" android:duration="150"
                                 android:startOffset="0" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusWarn" android:valueType="colorType">
+                                android:valueTo="?attr/colorScStatusWarn"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="fillColor" android:duration="167"
-                                android:startOffset="150" android:valueFrom="?attr/colorScStatusWarn"
-                                android:valueTo="?attr/colorScStatusRecommend" android:valueType="colorType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator
-                            android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="fillColor" android:duration="367"
-                                android:startOffset="317" android:valueFrom="#f9ab00"
-                                android:valueTo="#f9ab00" android:valueType="colorType">
+                                android:startOffset="150"
+                                android:valueFrom="?attr/colorScStatusWarn"
+                                android:valueTo="?attr/colorScStatusRecommend"
+                                android:valueType="colorType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator
                             android:pathData="M 0.0,0.0 c0.167,0.167 0.833,0.833 1.0,1.0"/>
@@ -110,79 +112,69 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -192,43 +184,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -260,43 +252,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
diff --git a/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_warn.xml b/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_warn.xml
index 6c91b8599..219b0c427 100644
--- a/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_warn.xml
+++ b/PermissionController/res/drawable-v33/status_scanning_end_anim_warn_to_warn.xml
@@ -1,40 +1,47 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
+                <group android:name="_R_G_L_3_G" android:pivotX="112" android:pivotY="112"
                        android:scaleX="0" android:scaleY="0">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundWarn"
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundWarn"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusWarn"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusWarn" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,63.47 168,63.47 C168,63.47 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_1_G">
-                        <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                               android:scaleX="0" android:scaleY="0">
-                            <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                        </group>
+                <group android:name="_R_G_L_1_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_1_G" android:translateX="-112"
+                           android:translateY="-112" android:pivotX="112" android:pivotY="112"
+                           android:scaleX="0" android:scaleY="0">
+                        <path android:name="_R_G_L_1_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                     </group>
                 </group>
-                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="280"
-                       android:translateY="280" android:scaleX="10" android:scaleY="10">
-                    <group android:name="_R_G_L_0_G">
-                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                               android:scaleX="1" android:scaleY="0">
-                            <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                                  android:fillAlpha="1" android:fillType="nonZero"
-                                  android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G_N_1_T_0" android:translateX="112"
+                       android:translateY="112" android:scaleX="4" android:scaleY="4">
+                    <group android:name="_R_G_L_0_G" android:translateX="-111.999"
+                           android:translateY="-86.34700000000001" android:pivotX="111.999"
+                           android:pivotY="77.796" android:scaleX="0.25" android:scaleY="0.25">
+                        <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0"
+                               android:translateX="111.997" android:translateY="96.002"
+                               android:pivotX="0.055" android:pivotY="-18.901" android:scaleX="1"
+                               android:scaleY="0">
+                            <path android:name="_R_G_L_0_G_D_0_P_0"
+                                  android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                                  android:fillType="nonZero"
+                                  android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                         </group>
                     </group>
                 </group>
@@ -49,28 +56,28 @@
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="517"
-                                android:startOffset="250" android:valueFrom="0" android:valueTo="10"
+                                android:startOffset="250" android:valueFrom="0" android:valueTo="1"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.05,0.542 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.049,0.562 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -80,79 +87,69 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="1" android:valueTo="0.9"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.809,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
-                    <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
-                    </aapt:attr>
-                </objectAnimator>
-                <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="0.9"
+                                android:valueTo="1" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator
+                            android:pathData="M 0.0,0.0 c0.167,0.167 0.002,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="100"
                                 android:startOffset="0" android:valueFrom="0" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
-                                android:startOffset="100" android:valueFrom="0" android:valueTo="1"
-                                android:valueType="floatType">
+                                android:startOffset="100" android:valueFrom="0"
+                                android:valueTo="0.25" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c0.2,0 0,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c0.199,0 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -162,43 +159,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -230,43 +227,43 @@
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="150"
-                                android:startOffset="0" android:valueFrom="10" android:valueTo="9"
+                                android:startOffset="0" android:valueFrom="4" android:valueTo="3.6"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.8,0 0.833,0.833 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="450"
-                                android:startOffset="150" android:valueFrom="9" android:valueTo="10"
-                                android:valueType="floatType">
+                                android:startOffset="150" android:valueFrom="3.6"
+                                android:valueTo="4" android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0.167 0,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleX" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="167"
-                                android:startOffset="600" android:valueFrom="10"
-                                android:valueTo="10" android:valueType="floatType">
+                                android:startOffset="600" android:valueFrom="4" android:valueTo="4"
+                                android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
                         <pathInterpolator android:pathData="M 0.0,0.0 c0.167,0 0.833,1 1.0,1.0"/>
                     </aapt:attr>
@@ -283,4 +280,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/drawable-v33/status_warn_to_scanning_anim.xml b/PermissionController/res/drawable-v33/status_warn_to_scanning_anim.xml
index 6f51df7bf..f97c374cd 100644
--- a/PermissionController/res/drawable-v33/status_warn_to_scanning_anim.xml
+++ b/PermissionController/res/drawable-v33/status_warn_to_scanning_anim.xml
@@ -1,38 +1,35 @@
 <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="560dp" android:width="560dp" android:viewportHeight="560"
-                android:viewportWidth="560">
+        <vector android:height="224dp" android:width="224dp" android:viewportHeight="224"
+                android:viewportWidth="224">
             <group android:name="_R_G">
-                <group android:name="_R_G_L_3_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_3_G_D_0_P_0" android:fillColor="?attr/colorScStatusBackgroundWarn"
+                <group android:name="_R_G_L_3_G">
+                    <path android:name="_R_G_L_3_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusBackgroundWarn"
                           android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M28 0 C28,15.46 15.46,28 0,28 C-15.46,28 -28,15.46 -28,0 C-28,-15.46 -15.46,-28 0,-28 C15.46,-28 28,-15.46 28,0c "/>
+                          android:pathData=" M112 0 C112,0 112,0 112,0 C173.86,0 224,50.14 224,112 C224,112 224,112 224,112 C224,173.86 173.86,224 112,224 C112,224 112,224 112,224 C50.14,224 0,173.86 0,112 C0,112 0,112 0,112 C0,50.14 50.14,0 112,0c "/>
                 </group>
-                <group android:name="_R_G_L_2_G" android:translateX="280" android:translateY="275"
-                       android:scaleX="10" android:scaleY="10">
-                    <path android:name="_R_G_L_2_G_D_0_P_0" android:fillColor="?attr/colorScStatusWarn"
-                          android:fillAlpha="1" android:fillType="nonZero"
-                          android:pathData=" M-14 -12.25 C-14,-12.25 0,-17.5 0,-17.5 C0,-17.5 14,-12.25 14,-12.25 C14,-12.25 14,-1.57 14,-1.57 C14,2.8 12.6,6.83 9.98,10.5 C7.35,14.18 4.03,16.45 0,17.5 C-4.03,16.45 -7.35,14.18 -9.97,10.5 C-12.6,6.83 -14,2.8 -14,-1.57 C-14,-1.57 -14,-12.25 -14,-12.25c "/>
+                <group android:name="_R_G_L_2_G">
+                    <path android:name="_R_G_L_2_G_D_0_P_0"
+                          android:fillColor="?attr/colorScStatusWarn" android:fillAlpha="1"
+                          android:fillType="nonZero"
+                          android:pathData=" M112 42 C112,42 56,62.53 56,62.53 C56,62.53 56,105.47 56,105.47 C56,123.2 61.6,139.07 71.87,154 C82.13,168.93 96.13,178.27 112,182 C127.87,178.27 141.87,168.93 152.13,154 C162.4,139.07 168,123.2 168,105.47 C168,105.47 168,62.53 168,62.53 C168,62.53 112,42 112,42c "/>
                 </group>
-                <group android:name="_R_G_L_1_G" android:translateX="279.998"
-                       android:translateY="327.289" android:pivotY="5.333" android:scaleX="9.86664"
-                       android:scaleY="9.86664">
-                    <group android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0" android:pivotY="1.871"
-                           android:scaleX="1" android:scaleY="1">
-                        <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                              android:fillAlpha="1" android:fillType="nonZero"
-                              android:pathData=" M0 7.67 C1.29,7.67 2.33,6.62 2.33,5.33 C2.33,4.04 1.29,3 0,3 C-1.29,3 -2.33,4.04 -2.33,5.33 C-2.33,6.62 -1.29,7.67 0,7.67c "/>
-                    </group>
+                <group android:name="_R_G_L_1_G" android:pivotX="112" android:pivotY="112"
+                       android:scaleX="1" android:scaleY="1">
+                    <path android:name="_R_G_L_1_G_D_0_P_0" android:fillColor="?attr/colorSurface"
+                          android:fillAlpha="1" android:fillType="nonZero"
+                          android:pathData=" M112 142.67 C117.15,142.67 121.33,138.49 121.33,133.33 C121.33,128.18 117.15,124 112,124 C106.84,124 102.66,128.18 102.66,133.33 C102.66,138.49 106.84,142.67 112,142.67c "/>
                 </group>
-                <group android:name="_R_G_L_0_G" android:translateX="280" android:translateY="280"
-                       android:scaleX="9.86664" android:scaleY="9.86664">
-                    <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:pivotY="-8.616"
-                           android:scaleX="1" android:scaleY="1">
-                        <path android:name="_R_G_L_0_G_D_0_P_0" android:fillColor="?attr/colorScShieldAccent"
-                              android:fillAlpha="1" android:fillType="nonZero"
-                              android:pathData=" M2.33 -8.67 C2.33,-8.67 -2.33,-8.67 -2.33,-8.67 C-2.33,-8.67 -2.33,0.67 -2.33,0.67 C-2.33,0.67 2.33,0.67 2.33,0.67 C2.33,0.67 2.33,-8.67 2.33,-8.67c "/>
+                <group android:name="_R_G_L_0_G">
+                    <group android:name="_R_G_L_0_G_D_0_P_0_G_0_T_0" android:translateX="111.997"
+                           android:translateY="96.002" android:pivotX="0.055"
+                           android:pivotY="-18.901" android:scaleX="1" android:scaleY="1">
+                        <path android:name="_R_G_L_0_G_D_0_P_0"
+                              android:fillColor="?attr/colorSurface" android:fillAlpha="1"
+                              android:fillType="nonZero"
+                              android:pathData=" M9.33 -18.67 C9.33,-18.67 -9.33,-18.67 -9.33,-18.67 C-9.33,-18.67 -9.33,18.67 -9.33,18.67 C-9.33,18.67 9.33,18.67 9.33,18.67 C9.33,18.67 9.33,-18.67 9.33,-18.67c "/>
                     </group>
                 </group>
             </group>
@@ -61,21 +58,21 @@
             </set>
         </aapt:attr>
     </target>
-    <target android:name="_R_G_L_1_G_D_0_P_0_G_0_T_0">
+    <target android:name="_R_G_L_1_G">
         <aapt:attr name="android:animation">
             <set android:ordering="together">
                 <objectAnimator android:propertyName="scaleX" android:duration="250"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
                 <objectAnimator android:propertyName="scaleY" android:duration="250"
                                 android:startOffset="0" android:valueFrom="1" android:valueTo="0"
                                 android:valueType="floatType">
                     <aapt:attr name="android:interpolator">
-                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.8,1 1.0,1.0"/>
+                        <pathInterpolator android:pathData="M 0.0,0.0 c1,0 0.801,1 1.0,1.0"/>
                     </aapt:attr>
                 </objectAnimator>
             </set>
@@ -124,4 +121,4 @@
             </set>
         </aapt:attr>
     </target>
-</animated-vector>
+</animated-vector>
\ No newline at end of file
diff --git a/PermissionController/res/layout-v33/indicator_card.xml b/PermissionController/res/layout-v33/indicator_card.xml
index bf28d80e3..373792b38 100644
--- a/PermissionController/res/layout-v33/indicator_card.xml
+++ b/PermissionController/res/layout-v33/indicator_card.xml
@@ -24,62 +24,56 @@
         android:layout_height="wrap_content"
         android:id="@+id/full_card"
         style="@style/SafetyCenterIndicatorForeground">
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/indicator_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        style="@style/SafetyCenterIndicatorForeground">
-        <ImageView
-            android:id="@+id/indicator_icon"
-            android:importantForAccessibility="no"
-            style="@style/SafetyCenterIndicatorImageView"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent"
-        />
-        <TextView
-            android:id="@+id/indicator_title"
-            app:layout_constraintStart_toEndOf="@id/indicator_icon"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            style="@style/SafetyCenterIndicatorTitleText"
-        />
-        <TextView
-            android:id="@+id/indicator_label"
-            app:layout_constraintTop_toBottomOf="@id/indicator_title"
-            app:layout_constraintStart_toStartOf="@id/indicator_title"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toStartOf="@id/expand_view"
-            style="@style/SafetyCenterIndicatorLabelText"
-        />
-        <ImageView
-            android:id="@+id/expand_view"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            style="@style/SafetyCenterIndicatorExpandView"
-        />
-    </androidx.constraintlayout.widget.ConstraintLayout>
-    <androidx.constraintlayout.widget.ConstraintLayout
-        android:id="@+id/expanded_layout"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:visibility="gone"
-        style="@style/SafetyCenterIndicatorForeground">
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/primary_button"
-            style="@style/SafetyCenterIndicatorActionButton"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-        />
-        <com.google.android.material.button.MaterialButton
-            android:id="@+id/secondary_button"
-            app:layout_constraintTop_toBottomOf="@id/primary_button"
-            app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintEnd_toEndOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            style="@style/SafetyCenterIndicatorSecondaryActionButton"
-        />
-    </androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/indicator_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            style="@style/SafetyCenterIndicatorForeground">
+            <ImageView
+                android:id="@+id/indicator_icon"
+                android:importantForAccessibility="no"
+                style="@style/SafetyCenterIndicatorImageView"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
+            <TextView
+                android:id="@+id/indicator_title"
+                app:layout_constraintStart_toEndOf="@id/indicator_icon"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                style="@style/SafetyCenterIndicatorTitleText" />
+            <TextView
+                android:id="@+id/indicator_label"
+                app:layout_constraintTop_toBottomOf="@id/indicator_title"
+                app:layout_constraintStart_toStartOf="@id/indicator_title"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintEnd_toStartOf="@id/expand_view"
+                style="@style/SafetyCenterIndicatorLabelText" />
+            <ImageView
+                android:id="@+id/expand_view"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                style="@style/SafetyCenterIndicatorExpandView" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
+        <androidx.constraintlayout.widget.ConstraintLayout
+            android:id="@+id/expanded_layout"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone"
+            style="@style/SafetyCenterIndicatorForeground">
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/primary_button"
+                style="@style/SafetyCenterIndicatorActionButton"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent" />
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/secondary_button"
+                app:layout_constraintTop_toBottomOf="@id/primary_button"
+                app:layout_constraintStart_toStartOf="parent"
+                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                style="@style/SafetyCenterIndicatorSecondaryActionButton" />
+        </androidx.constraintlayout.widget.ConstraintLayout>
     </LinearLayout>
 </androidx.cardview.widget.CardView>
diff --git a/PermissionController/res/layout-v33/safety_center_group.xml b/PermissionController/res/layout-v33/safety_center_group.xml
index 5adc76c53..dc62b8a14 100644
--- a/PermissionController/res/layout-v33/safety_center_group.xml
+++ b/PermissionController/res/layout-v33/safety_center_group.xml
@@ -39,7 +39,6 @@
         </LinearLayout>
 
         <ImageView android:id="@+id/chevron_icon"
-            android:clickable="true"
             style="@style/SafetyCenterExpandedGroupIcon" />
 
     </LinearLayout>
diff --git a/PermissionController/res/values-af/strings.xml b/PermissionController/res/values-af/strings.xml
index e1a42fced..9f4b10a4b 100644
--- a/PermissionController/res/values-af/strings.xml
+++ b/PermissionController/res/values-af/strings.xml
@@ -133,7 +133,7 @@
     <string name="permission_usage_access_dialog_subtitle" msgid="4171772805196955753">"Wanneer hierdie program jou <xliff:g id="PERMGROUP">%1$s</xliff:g>-toestemming gebruik het"</string>
     <string name="permission_usage_access_dialog_learn_more" msgid="7121468469493184613">"Kom meer te wete"</string>
     <string name="learn_more_content_description" msgid="8673699744544502539">"Kom meer te wete oor <xliff:g id="PERMGROUP">%1$s</xliff:g>"</string>
-    <string name="manage_permission_summary" msgid="4117555482684114317">"Beheer programtoegang tot jou <xliff:g id="PERMGROUP">%1$s</xliff:g>"</string>
+    <string name="manage_permission_summary" msgid="4117555482684114317">"Beheer apptoegang tot jou <xliff:g id="PERMGROUP">%1$s</xliff:g>"</string>
     <string name="auto_permission_usage_timeline_summary" msgid="2713135806453218703">"<xliff:g id="ACCESS_TIME">%1$s</xliff:g> • <xliff:g id="SUMMARY_TEXT">%2$s</xliff:g>"</string>
     <string name="history_preference_subtext_2" msgid="1521763591164293683">"<xliff:g id="APP_NAME">%1$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%2$s</xliff:g>"</string>
     <string name="history_preference_subtext_3" msgid="758761785983094351">"<xliff:g id="ATTRIBUTION_NAME">%1$s</xliff:g> • <xliff:g id="APP_NAME">%2$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%3$s</xliff:g>"</string>
@@ -426,9 +426,9 @@
     <string name="default_app_no_apps" msgid="115720991680586885">"Geen programme nie"</string>
     <string name="car_default_app_selected" msgid="5416420830430644174">"Gekies"</string>
     <string name="car_default_app_selected_with_info" msgid="1932204186080593500">"Gekies – <xliff:g id="ADDITIONAL_INFO">%1$s</xliff:g>"</string>
-    <string name="special_app_access_search_keyword" msgid="8032347212290774210">"spesiale programtoegang"</string>
-    <string name="special_app_access" msgid="5019319067120213797">"Spesiale programtoegang"</string>
-    <string name="no_special_app_access" msgid="6950277571805106247">"Geen spesiale programtoegang nie"</string>
+    <string name="special_app_access_search_keyword" msgid="8032347212290774210">"spesiale apptoegang"</string>
+    <string name="special_app_access" msgid="5019319067120213797">"Spesiale apptoegang"</string>
+    <string name="no_special_app_access" msgid="6950277571805106247">"Geen spesiale apptoegang nie"</string>
     <string name="special_app_access_no_apps" msgid="4102911722787886970">"Geen programme nie"</string>
     <string name="home_missing_work_profile_support" msgid="1756855847669387977">"Steun nie werkprofiel nie"</string>
     <string name="encryption_unaware_confirmation_message" msgid="8274491794636402484">"Let wel: As jy jou toestel herbegin en \'n skermslot is gestel, kan hierdie program nie begin totdat jy jou toestel ontsluit nie."</string>
diff --git a/PermissionController/res/values-ar/strings.xml b/PermissionController/res/values-ar/strings.xml
index 2bac60f00..26362fae3 100644
--- a/PermissionController/res/values-ar/strings.xml
+++ b/PermissionController/res/values-ar/strings.xml
@@ -265,7 +265,7 @@
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{تطبيق واحد غير مستخدَم}zero{# تطبيق غير مستخدَم}two{تطبيقان غير مستخدَمين}few{# تطبيقات غير مستخدَمة}many{# تطبيقًا غير مستخدَم}other{# تطبيق غير مستخدَم}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"تمت إزالة الأذونات والملفات المؤقتة وتم إيقاف الإشعارات. انقر لمراجعة الإعدادات."</string>
     <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"مراجعة التطبيقات التي تمت إزالة الأذونات منها"</string>
-    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"بالنسبة إلى التطبيقات غير المُستخدَمة لفترة محدّدة، تمت إزالة الأذونات والملفات المؤقّتة وإيقاف الإشعارات."</string>
+    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"بالنسبة إلى التطبيقات غير المُستخدَمة منذ فترة، تمت إزالة الأذونات والملفات المؤقّتة وإيقاف الإشعارات."</string>
     <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"مراجعة التطبيقات"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"التحقّق من الأذونات الحديثة"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"أثناء القيادة، منحت <xliff:g id="APP">%1$s</xliff:g> الإذن بالوصول إلى <xliff:g id="PERMISSION">%2$s</xliff:g>."</string>
diff --git a/PermissionController/res/values-as/strings.xml b/PermissionController/res/values-as/strings.xml
index 6e2e9151d..8e9cf9189 100644
--- a/PermissionController/res/values-as/strings.xml
+++ b/PermissionController/res/values-as/strings.xml
@@ -564,9 +564,9 @@
     <string name="media_confirm_dialog_message_q_to_s_aural_deny" msgid="6832087393653561911">"এই এপ্‌টোৱে Androidৰ শেহতীয়া সংস্কৰণ সমৰ্থন নকৰে। যদি এই এপ্‌টোৱে সংগীত আৰু অডিঅ’ ফাইল এক্সেছ কৰিব নোৱাৰে, ইয়াক ফট’ আৰু ভিডিঅ’ও এক্সেছ কৰিবলৈ দিয়া নহ’ব।"</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_allow" msgid="3504335060843147760">"এই এপ্‌টোৱে Androidৰ শেহতীয়া সংস্কৰণ সমৰ্থন নকৰে। যদি এই এপ্‌টোৱে ফট’ আৰু ভিডিঅ’ এক্সেছ কৰিব পাৰে, ইয়াক সংগীত আৰু অডিঅ’ ফাইলো এক্সেছ কৰিবলৈ দিয়া হ’ব।"</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_deny" msgid="2145973462806481992">"এই এপ্‌টোৱে Androidৰ শেহতীয়া সংস্কৰণ সমৰ্থন নকৰে। যদি এই এপ্‌টোৱে সংগীত আৰু অডিঅ’ ফাইল এক্সেছ কৰিব নোৱাৰে, ইয়াক ফট’ আৰু ভিডিঅ’ও এক্সেছ কৰিবলৈ দিয়া নহ’ব।"</string>
-    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"অৱস্থানৰ নেপথ্যৰ এক্সেছ থকা এপ্‌সমূহ পৰ্যালোচনা কৰক"</string>
+    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"নেপথ্যত অৱস্থানৰ এক্সেছ থকা এপ্‌সমূহ পৰ্যালোচনা কৰক"</string>
     <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"<xliff:g id="APP_NAME">%s</xliff:g>এ যিকোনো সময়তে আপোনাৰ অৱস্থান এক্সেছ কৰিব পাৰে, আনকি এপ্‌টো বন্ধ থাকিলেও"</string>
-    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"অৱস্থানৰ নেপথ্যৰ এক্সেছ থকা এপ্‌সমূহ পৰ্যালোচনা কৰক"</string>
+    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"নেপথ্যত অৱস্থানৰ এক্সেছ থকা এপ্‌সমূহ পৰ্যালোচনা কৰক"</string>
     <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"এই এপ্‌টোৱে যিকোনো সময়তে আপোনাৰ অৱস্থান এক্সেছ কৰিব পাৰে, আনকি ই বন্ধ থাকিলেও।"</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"এক্সেছ সলনি কৰা হৈছে"</string>
     <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"শেহতীয়া অৱস্থানৰ ব্যৱহাৰ চাওক"</string>
diff --git a/PermissionController/res/values-b+sr+Latn/strings.xml b/PermissionController/res/values-b+sr+Latn/strings.xml
index e18aa2740..40cbed6f6 100644
--- a/PermissionController/res/values-b+sr+Latn/strings.xml
+++ b/PermissionController/res/values-b+sr+Latn/strings.xml
@@ -282,8 +282,8 @@
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g> ima vašu lokaciju u pozadini"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Ova aplikacija može uvek da pristupa lokaciji. Dodirnite da biste to promenili."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Pregledajte aplikaciju sa pristupom obaveštenjima"</string>
-    <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> može da odbacuje sadržaj u vašim obaveštenjima, reaguje i pristupa tom sadržaju"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Ova aplikacija može da odbacuje sadržaj u vašim obaveštenjima, reaguje i pristupa tom sadržaju. Nekim aplikacijama je potreban ovakav tip pristupa da bi funkcionisale kao što je predviđeno."</string>
+    <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> može da reaguje, odbacuje i pristupa sadržaju u obaveštenjima"</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Ova aplikacija može da reaguje, odbacuje i pristupa sadržaju u obaveštenjima. Nekim aplikacijama je potreban ovakav tip pristupa da bi funkcionisale kao što je predviđeno."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Ukloni pristup"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Prikaži još opcija"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Pristup je uklonjen"</string>
diff --git a/PermissionController/res/values-bg/strings.xml b/PermissionController/res/values-bg/strings.xml
index a28533466..0275e3353 100644
--- a/PermissionController/res/values-bg/strings.xml
+++ b/PermissionController/res/values-bg/strings.xml
@@ -225,7 +225,7 @@
     <string name="last_opened_summary_short" msgid="1646067226191176825">"Последно отваряне на <xliff:g id="DATE">%s</xliff:g>"</string>
     <string name="app_permission_footer_special_file_access" msgid="1884202176147657788">"Ако разрешите управлението на всички файлове, това приложение може да осъществява достъп до, да променя и изтрива всички файлове в стандартното хранилище на устройството или в свързаните хранилища. Приложението може да осъществява достъп до файловете, без да ви пита."</string>
     <string name="special_file_access_dialog" msgid="583804114020740610">"Да се разреши ли на това приложение да осъществява достъп до, да променя и изтрива файлове на устройството или в свързаните хранилища? Приложението може да осъществява достъп до файловете, без да ви пита."</string>
-    <string name="permission_description_summary_generic" msgid="5401399408814903391">"Приложенията с това разрешение могат да <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
+    <string name="permission_description_summary_generic" msgid="5401399408814903391">"Приложенията с това разрешение могат да осъществяват <xliff:g id="DESCRIPTION">%1$s</xliff:g>"</string>
     <string name="permission_description_summary_activity_recognition" msgid="2652850576497070146">"Приложенията с това разрешение имат достъп до физическата ви активност, като например ходене, колоездене, шофиране, брой крачки и др."</string>
     <string name="permission_description_summary_calendar" msgid="103329982944411010">"Приложенията с това разрешение имат достъп до календара ви"</string>
     <string name="permission_description_summary_call_log" msgid="7321437186317577624">"Приложенията с това разрешение могат да четат списъка с телефонните обаждания и да записват в него"</string>
diff --git a/PermissionController/res/values-bs/strings.xml b/PermissionController/res/values-bs/strings.xml
index d2bfe4d1b..568e98335 100644
--- a/PermissionController/res/values-bs/strings.xml
+++ b/PermissionController/res/values-bs/strings.xml
@@ -265,7 +265,7 @@
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# nekorištena aplikacija}one{# nekorištena aplikacija}few{# nekorištene aplikacije}other{# nekorištenih aplikacija}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"Odobrenja i privremeni fajlovi su uklonjeni, a obavještenja zaustavljena. Dodirnite da pregledate."</string>
     <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"Pregledajte aplikacije čija odobrenja su uklonjena"</string>
-    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"Za aplikacije koje duže vrijeme niste koristili, odobrenja i privremeni fajlovi su uklonjeni, a obavještenja su zaustavljena."</string>
+    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"Za aplikacije koje duže vrijeme niste koristili odobrenja i privremeni fajlovi su uklonjeni, a obavještenja su zaustavljena."</string>
     <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"Pregledajte aplikacije"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"Provjerite nedavna odobrenja"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"Prilikom vožnje dali ste aplikaciji <xliff:g id="APP">%1$s</xliff:g> pristup odobrenju <xliff:g id="PERMISSION">%2$s</xliff:g>"</string>
diff --git a/PermissionController/res/values-ca/strings.xml b/PermissionController/res/values-ca/strings.xml
index 0c5f84b38..0f834c6ec 100644
--- a/PermissionController/res/values-ca/strings.xml
+++ b/PermissionController/res/values-ca/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Aquesta aplicació pot accedir a la teva ubicació en qualsevol moment. Toca per canviar-ho."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Revisa l\'aplicació amb accés a les notificacions"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> pot ignorar contingut dins de les teves notificacions, així com també accedir-hi o interaccionar-hi"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Aquesta aplicació pot ignorar contingut dins de les teves notificacions, així com també accedir-hi o interaccionar-hi. Algunes aplicacions requereixen aquest accés perquè funcionin de la manera prevista."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Aquesta aplicació pot ignorar contingut dins de les teves notificacions, així com també accedir-hi o interaccionar-hi. Algunes aplicacions requereixen aquest accés per funcionar de la manera prevista."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Suprimeix l\'accés"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Mostra més opcions"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"S\'ha suprimit l\'accés"</string>
diff --git a/PermissionController/res/values-cs/strings.xml b/PermissionController/res/values-cs/strings.xml
index 60ae86216..17130da1c 100644
--- a/PermissionController/res/values-cs/strings.xml
+++ b/PermissionController/res/values-cs/strings.xml
@@ -194,8 +194,8 @@
     <string name="approximate_image_description" msgid="938803699637069884">"Přibližná poloha"</string>
     <string name="app_permission_location_accuracy" msgid="7166912915040018669">"Používat přesnou polohu"</string>
     <string name="app_permission_location_accuracy_subtitle" msgid="2654077606404987210">"Když je přesná poloha vypnutá, aplikace mají přístup k vaší přibližné poloze"</string>
-    <string name="app_permission_title" msgid="2090897901051370711">"<xliff:g id="PERM">%1$s</xliff:g>: oprávnění"</string>
-    <string name="app_permission_header" msgid="2951363137032603806">"<xliff:g id="PERM">%1$s</xliff:g>: Přístup této aplikace"</string>
+    <string name="app_permission_title" msgid="2090897901051370711">"Oprávnění: <xliff:g id="PERM">%1$s</xliff:g>"</string>
+    <string name="app_permission_header" msgid="2951363137032603806">"Aplikace má přístup k: <xliff:g id="PERM">%1$s</xliff:g>"</string>
     <string name="app_permission_footer_app_permissions_link" msgid="4926890342636587393">"Zobrazit všechna oprávnění aplikace <xliff:g id="APP">%1$s</xliff:g>"</string>
     <string name="app_permission_footer_permission_apps_link" msgid="3941988129992794327">"Zobrazit všechny aplikace s tímto oprávněním"</string>
     <string name="assistant_mic_label" msgid="1011432357152323896">"Zobrazit používání mikrofonu asistentem"</string>
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Tato aplikace má neomezený přístup k poloze. Klepnutím to změníte."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Zkontrolujte aplikaci s přístupem k vašim oznámením"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"Aplikace <xliff:g id="APP_NAME">%s</xliff:g> může zavírat obsah v oznámeních, reagovat na něj a přistupovat k němu"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Tato aplikace může zavírat obsah uvnitř vašich oznámení, reagovat na něj a přistupovat k němu. Některé aplikace tento přístup k poskytování svých funkcí potřebují."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Tato aplikace může zavírat obsah uvnitř vašich oznámení, reagovat na něj a mít k němu přístup. Některé aplikace tento přístup k poskytování svých funkcí potřebují."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Odebrat přístup"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Zobrazit další možnosti"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Přístup byl odebrán"</string>
diff --git a/PermissionController/res/values-de/strings.xml b/PermissionController/res/values-de/strings.xml
index acd30b410..99e35dc24 100644
--- a/PermissionController/res/values-de/strings.xml
+++ b/PermissionController/res/values-de/strings.xml
@@ -23,8 +23,7 @@
     <string name="back" msgid="6249950659061523680">"Zurück"</string>
     <string name="available" msgid="6007778121920339498">"Verfügbar"</string>
     <string name="blocked" msgid="9195547604866033708">"Gesperrt"</string>
-    <!-- no translation found for on (280241003226755921) -->
-    <skip />
+    <string name="on" msgid="280241003226755921">"An"</string>
     <string name="off" msgid="1438489226422866263">"Aus"</string>
     <string name="uninstall_or_disable" msgid="4496612999740858933">"Deinstallieren oder deaktivieren"</string>
     <string name="app_not_found_dlg_title" msgid="6029482906093859756">"App nicht gefunden"</string>
@@ -133,8 +132,7 @@
     <string name="permission_group_usage_subtitle_7d" msgid="1465828402260324654">"Zeitachse, wann Apps in den letzten 7 Tagen die Berechtigungsgruppe „<xliff:g id="PERMGROUP">%1$s</xliff:g>“ verwendet haben"</string>
     <string name="permission_usage_access_dialog_subtitle" msgid="4171772805196955753">"Als diese App deine <xliff:g id="PERMGROUP">%1$s</xliff:g>-Berechtigung verwendet hat"</string>
     <string name="permission_usage_access_dialog_learn_more" msgid="7121468469493184613">"Weitere Informationen"</string>
-    <!-- no translation found for learn_more_content_description (8673699744544502539) -->
-    <skip />
+    <string name="learn_more_content_description" msgid="8673699744544502539">"Weitere Informationen zur Berechtigungsgruppe „<xliff:g id="PERMGROUP">%1$s</xliff:g>“"</string>
     <string name="manage_permission_summary" msgid="4117555482684114317">"App-Zugriff auf „<xliff:g id="PERMGROUP">%1$s</xliff:g>“ steuern"</string>
     <string name="auto_permission_usage_timeline_summary" msgid="2713135806453218703">"<xliff:g id="ACCESS_TIME">%1$s</xliff:g> • <xliff:g id="SUMMARY_TEXT">%2$s</xliff:g>"</string>
     <string name="history_preference_subtext_2" msgid="1521763591164293683">"<xliff:g id="APP_NAME">%1$s</xliff:g> • <xliff:g id="TRUNCATED_TIME">%2$s</xliff:g>"</string>
diff --git a/PermissionController/res/values-es-rUS/strings.xml b/PermissionController/res/values-es-rUS/strings.xml
index 4d21f9dec..fdafed09b 100644
--- a/PermissionController/res/values-es-rUS/strings.xml
+++ b/PermissionController/res/values-es-rUS/strings.xml
@@ -518,7 +518,7 @@
     <string name="safety_center_rescan_button" msgid="4517514567809409596">"Escanear dispositivo"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Descartar"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"¿Quieres descartar esta alerta?"</string>
-    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Revisa la configuración de privacidad y seguridad en cualquier momento para tomar medidas adicionales de protección"</string>
+    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Revisa la configuración de seguridad y privacidad en cualquier momento para tomar medidas adicionales de protección"</string>
     <string name="safety_center_issue_card_confirm_dismiss_button" msgid="5884137843083634556">"Descartar"</string>
     <string name="safety_center_issue_card_cancel_dismiss_button" msgid="2874578798877712346">"Cancelar"</string>
     <string name="safety_center_entries_category_title" msgid="34356964062813115">"Configuración"</string>
@@ -527,7 +527,7 @@
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"Permisos"</string>
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Seguridad y privacidad"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Comprobar estado"</string>
-    <string name="privacy_controls_qs" msgid="5780144882040591169">"Sus controles de privacidad"</string>
+    <string name="privacy_controls_qs" msgid="5780144882040591169">"Tus controles de privacidad"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Más parámetros"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Acceso a la cámara"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Acceso al micrófono"</string>
@@ -569,7 +569,7 @@
     <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Revisa la app con acceso a la ubicación en segundo plano"</string>
     <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"Esta app puede acceder a tu ubicación en todo momento, incluso cuando está cerrada."</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"Se cambió el acceso"</string>
-    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Ver uso de la ubicación reciente"</string>
+    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Ver uso reciente de la ubicación"</string>
     <string name="privacy_controls_title" msgid="7605929972256835199">"Controles de privacidad"</string>
     <string name="camera_toggle_title" msgid="1251201397431837666">"Acceso a la cámara"</string>
     <string name="mic_toggle_title" msgid="2649991093496110162">"Acceso al micrófono"</string>
diff --git a/PermissionController/res/values-eu/strings.xml b/PermissionController/res/values-eu/strings.xml
index bf302a86d..0107de8aa 100644
--- a/PermissionController/res/values-eu/strings.xml
+++ b/PermissionController/res/values-eu/strings.xml
@@ -386,7 +386,7 @@
     <string name="role_call_screening_label" msgid="883935222060878724">"Deitzailearen ID eta spam-aplikazio lehenetsia"</string>
     <string name="role_call_screening_short_label" msgid="2048465565063130834">"Deitzailearen IDa eta spama"</string>
     <string name="role_call_screening_description" msgid="2349431420497468981">"Deiak identifikatzeko, eta spama, dei automatizatuak eta nahi ez dituzun zenbakiak blokeatzeko aukera ematen dizuten aplikazioak"</string>
-    <string name="role_call_screening_request_title" msgid="7358309224566977290">"<xliff:g id="APP_NAME">%1$s</xliff:g> ezarri nahi duzu deitzailearen ID eta spam-aplikazio lehenetsi gisa?"</string>
+    <string name="role_call_screening_request_title" msgid="7358309224566977290">"<xliff:g id="APP_NAME">%1$s</xliff:g> ezarri nahi duzu deitzailearen identitate eta spam-aplikazio lehenetsi gisa?"</string>
     <string name="role_call_screening_request_description" msgid="7338511921032446006">"Ez du behar baimenik"</string>
     <string name="role_automotive_navigation_label" msgid="2701890757955474751">"Nabigatzeko aplikazio lehenetsia"</string>
     <string name="role_automotive_navigation_short_label" msgid="5165823092506922457">"Nabigatzeko aplikazioa"</string>
diff --git a/PermissionController/res/values-fa-v33/strings.xml b/PermissionController/res/values-fa-v33/strings.xml
index 5a564ba0f..f3a43a926 100644
--- a/PermissionController/res/values-fa-v33/strings.xml
+++ b/PermissionController/res/values-fa-v33/strings.xml
@@ -32,7 +32,7 @@
     <string name="safety_center_issue_card_content_description" msgid="1281390769721765363">"هشدار. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%2$s</xliff:g>"</string>
     <string name="safety_center_issue_card_content_description_with_subtitle" msgid="5504040663935313539">"هشدار. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUBTITLE">%2$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%3$s</xliff:g>"</string>
     <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"کنش کامل شد"</string>
-    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"بررسی تنظیماتی که می‌توانند امنیت بیشتری به دستگاهتان اضافه کنند"</string>
+    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"بررسی کردن تنظیماتی که می‌تواند امنیت بیشتری به دستگاهتان اضافه کند"</string>
     <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"تنظیمات فوری امنیت و حریم خصوصی"</string>
     <string name="safety_center_qs_close_button" msgid="1352313308176244599">"بستن"</string>
     <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"باز کردن و نمایش گزینه‌ها"</string>
diff --git a/PermissionController/res/values-fa/strings.xml b/PermissionController/res/values-fa/strings.xml
index d967fa556..0a704c847 100644
--- a/PermissionController/res/values-fa/strings.xml
+++ b/PermissionController/res/values-fa/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"این برنامه همیشه می‌تواند به مکانتان دسترسی داشته باشد. برای تغییر دادن، ضربه بزنید."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"مرور برنامهٔ دارای دسترسی به اعلان‌ها"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> می‌تواند اعلان‌ها را رد کند، روی آن‌ها کنش انجام دهد، و به محتوای داخل آن‌ها دسترسی داشته باشد"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"این برنامه می‌تواند اعلان‌ها را رد کند، روی آن‌ها کنش انجام دهد، و به محتوای داخل آن‌ها دسترسی داشته باشد. برخی برنامه‌ها به این نوع دسترسی نیاز دارند تا طبق انتظار کار کنند."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"این برنامه می‌تواند اعلان‌ها را رد کند، روی آن‌ها کنش انجام دهد، و به محتوای داخل آن‌ها دسترسی داشته باشد. برخی برنامه‌ها به این نوع دسترسی نیاز دارند تا طبق برنامه کار کنند."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"برداشتن دسترسی"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"مشاهده گزینه‌های بیشتر"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"دسترسی برداشته شد"</string>
diff --git a/PermissionController/res/values-fi/strings.xml b/PermissionController/res/values-fi/strings.xml
index 29612111a..d1435c1d6 100644
--- a/PermissionController/res/values-fi/strings.xml
+++ b/PermissionController/res/values-fi/strings.xml
@@ -527,7 +527,7 @@
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"Luvat"</string>
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Tietoturva ja yksityisyys"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Tarkista tila"</string>
-    <string name="privacy_controls_qs" msgid="5780144882040591169">"Tietosuojahallinta"</string>
+    <string name="privacy_controls_qs" msgid="5780144882040591169">"Yksityisyysasetukset"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Lisää asetuksia"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Pääsy kameraan"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Pääsy mikrofoniin"</string>
diff --git a/PermissionController/res/values-fr-rCA/strings.xml b/PermissionController/res/values-fr-rCA/strings.xml
index 4e7e5bd07..aeef16fc8 100644
--- a/PermissionController/res/values-fr-rCA/strings.xml
+++ b/PermissionController/res/values-fr-rCA/strings.xml
@@ -265,7 +265,7 @@
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# application non utilisée}one{# application non utilisée}other{# applications non utilisées}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"Les autorisations et les fichiers temporaires ont été retirés, et les notifications ont été arrêtées. Touchez pour examiner."</string>
     <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"Voir les applications qui n\'ont plus leurs autorisations"</string>
-    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"Pour les applications que vous n\'avez pas utilisées depuis un moment, les autorisations et les fichiers temporaires ont été supprimés et les notifications ont été désactivées."</string>
+    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"Pour les applications que vous n\'avez pas utilisées depuis un moment, les autorisations et les fichiers temporaires ont été retirés, et les notifications ont été désactivées."</string>
     <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"Voir les applications"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"Vérifiez les autorisations récentes"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"Pendant la conduite, vous avez donné à <xliff:g id="APP">%1$s</xliff:g> l\'accès à <xliff:g id="PERMISSION">%2$s</xliff:g>"</string>
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Cette application peut toujours accéder à votre position. Touchez l\'écran pour modifier cela."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Voir l\'application ayant accès à vos notifications"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> peut ignorer et gérer le contenu de vos notifications de même qu\'y accéder"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Cette application peut ignorer et gérer le contenu de vos notifications de même qu\'y accéder. Certaines applications ont besoin de cet accès pour fonctionner correctement."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Cette application peut ignorer le contenu de vos notifications, y accéder et le gérer. Certaines applications ont besoin de cet accès pour fonctionner correctement."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Retirer l\'accès"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Afficher d\'autres options"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Accès retiré"</string>
diff --git a/PermissionController/res/values-fr/strings.xml b/PermissionController/res/values-fr/strings.xml
index b86d07baa..01d804ba5 100644
--- a/PermissionController/res/values-fr/strings.xml
+++ b/PermissionController/res/values-fr/strings.xml
@@ -281,9 +281,9 @@
     <string name="auto_revoke_preference_summary" msgid="5517958331781391481">"Les autorisations ont été supprimées pour protéger votre vie privée"</string>
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g> a accès à votre position en arrière-plan"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Cette application peut accéder en permanence à votre position. Appuyez dessus pour modifier cette autorisation."</string>
-    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Examiner l\'appli avec accès à vos notifications"</string>
+    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Examiner l\'appli qui a accès à vos notifications"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> peut ignorer le contenu de vos notifications, y accéder et agir dessus"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Cette appli peut ignorer le contenu de vos notifications, y accéder et agir dessus. Certaines applis ont besoin de cet accès pour fonctionner correctement."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Cette appli peut ignorer vos notifications, accéder à leurs contenus et agir en conséquence. Certaines applis ont besoin de cet accès pour fonctionner correctement."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Supprimer l\'accès"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Afficher plus d\'options"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Accès supprimé"</string>
@@ -519,7 +519,7 @@
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Ignorer"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"Ignorer cette alerte ?"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Vérifiez vos paramètres de confidentialité et de sécurité à tout moment pour renforcer la protection"</string>
-    <string name="safety_center_issue_card_confirm_dismiss_button" msgid="5884137843083634556">"Fermer"</string>
+    <string name="safety_center_issue_card_confirm_dismiss_button" msgid="5884137843083634556">"Ignorer"</string>
     <string name="safety_center_issue_card_cancel_dismiss_button" msgid="2874578798877712346">"Annuler"</string>
     <string name="safety_center_entries_category_title" msgid="34356964062813115">"Paramètres"</string>
     <string name="safety_status_preference_title_and_summary_content_description" msgid="3511373256505058464">"État de la sécurité et de la confidentialité. <xliff:g id="OVERALL_SAFETY_STATUS">%1$s</xliff:g>. <xliff:g id="SUMMARY_OF_DEVICE_STATUS">%2$s</xliff:g>"</string>
@@ -532,8 +532,8 @@
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Accès à l\'appareil photo"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Accès au micro"</string>
     <string name="permissions_removed_qs" msgid="8957319130625294572">"Autorisation supprimée"</string>
-    <string name="camera_usage_qs" msgid="4394233566086665994">"Consulter l\'utilisation récente de la caméra"</string>
-    <string name="microphone_usage_qs" msgid="8527666682168170417">"Consulter l\'utilisation récente du micro"</string>
+    <string name="camera_usage_qs" msgid="4394233566086665994">"Voir l\'utilisation récente de l\'appareil photo"</string>
+    <string name="microphone_usage_qs" msgid="8527666682168170417">"Voir l\'utilisation récente du micro"</string>
     <string name="remove_camera_qs" msgid="3649996161066883350">"Supprimer l\'autorisation de cette appli"</string>
     <string name="remove_microphone_qs" msgid="1276551965129953198">"Supprimer l\'autorisation de cette appli"</string>
     <string name="manage_service_qs" msgid="7862555549364153805">"Gérer le service"</string>
@@ -564,9 +564,9 @@
     <string name="media_confirm_dialog_message_q_to_s_aural_deny" msgid="6832087393653561911">"Cette appli n\'est pas compatible avec la dernière version d\'Android. Si cette appli ne peut pas accéder à la musique ni aux fichiers audio, elle ne sera pas non plus autorisée à accéder aux photos ni aux vidéos."</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_allow" msgid="3504335060843147760">"Cette appli n\'est pas compatible avec la dernière version d\'Android. Si cette appli peut accéder aux photos et aux vidéos, elle sera également autorisée à accéder à la musique et aux fichiers audio."</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_deny" msgid="2145973462806481992">"Cette appli n\'est pas compatible avec la dernière version d\'Android. Si cette appli ne peut pas accéder à la musique ni aux fichiers audio, elle ne sera pas non plus autorisée à accéder aux photos ni aux vidéos."</string>
-    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Examiner l\'appli avec accès à la localisation en arrière-plan"</string>
+    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Examiner l\'appli qui a accès à la localisation en arrière-plan"</string>
     <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"<xliff:g id="APP_NAME">%s</xliff:g> peut toujours accéder à votre localisation, même lorsque l\'appli est fermée"</string>
-    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Examiner l\'appli avec accès à la localisation en arrière-plan"</string>
+    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Examiner l\'appli qui a accès à la localisation en arrière-plan"</string>
     <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"Même fermée, cette appli peut toujours accéder à votre localisation."</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"Accès modifié"</string>
     <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Voir l\'utilisation récente de la localisation"</string>
diff --git a/PermissionController/res/values-gl/strings.xml b/PermissionController/res/values-gl/strings.xml
index 8d048e096..5692c2710 100644
--- a/PermissionController/res/values-gl/strings.xml
+++ b/PermissionController/res/values-gl/strings.xml
@@ -103,7 +103,7 @@
     <!-- no translation found for background_access_chooser_dialog_choices:1 (9127301153688725448) -->
     <!-- no translation found for background_access_chooser_dialog_choices:2 (4305536986042401191) -->
     <string name="permission_access_always" msgid="1474641821883823446">"Permitir sempre"</string>
-    <string name="permission_access_only_foreground" msgid="7801170728159326195">"Só mentres se use a app"</string>
+    <string name="permission_access_only_foreground" msgid="7801170728159326195">"Permitir só mentres se use a aplicación"</string>
     <string name="permission_access_never" msgid="4647014230217936900">"Non permitir"</string>
     <string name="loading" msgid="4789365003890741082">"Cargando…"</string>
     <string name="all_permissions" msgid="6911125611996872522">"Todos os permisos"</string>
@@ -527,7 +527,7 @@
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"Permisos"</string>
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Seguranza e privacidade"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Comproba o estado"</string>
-    <string name="privacy_controls_qs" msgid="5780144882040591169">"Controis de privacidade"</string>
+    <string name="privacy_controls_qs" msgid="5780144882040591169">"Os teus controis de privacidade"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Máis opcións de configuración"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Acceso á cámara"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Acceso ao micrófono"</string>
diff --git a/PermissionController/res/values-gu/strings.xml b/PermissionController/res/values-gu/strings.xml
index 4753ba3c1..03b1bd358 100644
--- a/PermissionController/res/values-gu/strings.xml
+++ b/PermissionController/res/values-gu/strings.xml
@@ -527,7 +527,7 @@
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"પરવાનગીઓ"</string>
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"સુરક્ષા અને પ્રાઇવસી"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"સ્ટેટસ ચેક કરો"</string>
-    <string name="privacy_controls_qs" msgid="5780144882040591169">"પ્રાઇવસીને લગતા નિયંત્રણો"</string>
+    <string name="privacy_controls_qs" msgid="5780144882040591169">"તમારી પ્રાઇવસીને લગતા નિયંત્રણો"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"વધુ સેટિંગ"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"કૅમેરાનો ઍક્સેસ"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"માઇકનો ઍક્સેસ"</string>
diff --git a/PermissionController/res/values-hi/strings.xml b/PermissionController/res/values-hi/strings.xml
index 74cb8f6f6..432774c27 100644
--- a/PermissionController/res/values-hi/strings.xml
+++ b/PermissionController/res/values-hi/strings.xml
@@ -265,7 +265,7 @@
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{इस्तेमाल न होने वाला # ऐप्लिकेशन}one{इस्तेमाल न होने वाला # ऐप्लिकेशन}other{इस्तेमाल न होने वाले # ऐप्लिकेशन}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"ऐप्लिकेशन को दी गई अनुमतियां और डिवाइस पर कुछ समय तक रहने वाली फ़ाइलें हटा दी गई हैं. साथ ही, सूचनाएं रोक दी गई हैं. देखने के लिए टैप करें."</string>
     <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"जिन ऐप्लिकेशन के लिए अनुमतियां हट गई हैं उनकी समीक्षा करें"</string>
-    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"आपने जिन ऐप्लिकेशन का काफ़ी समय से इस्तेमाल नहीं किया है उनके लिए अनुमतियों और डिवाइस पर कुछ समय के लिए सेव की गई फ़ाइलों को हटा दिया गया है. साथ ही, उनसे जुड़ी सूचनाएं पाने की सुविधा को रोक दिया गया है."</string>
+    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"आपने जिन ऐप्लिकेशन का काफ़ी समय से इस्तेमाल नहीं किया है उनके लिए अनुमतियों और डिवाइस पर कुछ समय के लिए सेव की गई फ़ाइलों को हटा दिया गया है. साथ ही, इनकी सूचनाएं भी रोक दी गई हैं."</string>
     <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"इस्तेमाल न किए जाने वाले ऐप्लिकेशन की समीक्षा करें"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"हाल ही में दी गई अनुमतियां देखें"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"आपने गाड़ी चलाते समय, <xliff:g id="APP">%1$s</xliff:g> को <xliff:g id="PERMISSION">%2$s</xliff:g> का ऐक्सेस दिया था"</string>
diff --git a/PermissionController/res/values-hr-v33/strings.xml b/PermissionController/res/values-hr-v33/strings.xml
index f135da1a0..d2ddea586 100644
--- a/PermissionController/res/values-hr-v33/strings.xml
+++ b/PermissionController/res/values-hr-v33/strings.xml
@@ -40,7 +40,7 @@
     <string name="safety_center_qs_privacy_control" msgid="1160682635058529673">"Prebaci. <xliff:g id="PRIVACY_CONTROL_TITLE">%1$s</xliff:g>. <xliff:g id="PRIVACY_CONTROL_STATUS">%2$s</xliff:g>"</string>
     <string name="safety_center_qs_toggle_action" msgid="5920465736488119255">"Promijeni"</string>
     <string name="safety_center_qs_open_action" msgid="2760200829912423728">"Otvori"</string>
-    <string name="safety_center_review_settings_button" msgid="938981137942443930">"Pregledaj postavke"</string>
+    <string name="safety_center_review_settings_button" msgid="938981137942443930">"Pregledajte postavke"</string>
     <string name="safety_center_gear_label" msgid="5175877094379694098">"Postavke"</string>
     <string name="safety_center_info_label" msgid="8993181584061825412">"Podatak"</string>
 </resources>
diff --git a/PermissionController/res/values-it/strings.xml b/PermissionController/res/values-it/strings.xml
index d23d5cd99..121866710 100644
--- a/PermissionController/res/values-it/strings.xml
+++ b/PermissionController/res/values-it/strings.xml
@@ -264,9 +264,9 @@
     <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"Alcune app non sono state usate per alcuni mesi. Tocca per controllare."</string>
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# app inutilizzata}other{# app inutilizzate}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"Le autorizzazioni e i file temporanei sono stati rimossi; le notifiche sono state interrotte. Tocca per controllare."</string>
-    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"Controlla app di cui sono state rimosse le autorizzazioni"</string>
+    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"Controlla le app di cui sono state rimosse le autorizzazioni"</string>
     <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"Per le app che non usi da un po\' di tempo sono stati rimossi i file temporanei e le autorizzazioni e sono state interrotte le notifiche."</string>
-    <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"Controlla app"</string>
+    <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"Controlla le app"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"Controlla le autorizzazioni recenti"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"Durante la guida, hai consentito all\'app <xliff:g id="APP">%1$s</xliff:g> di accedere a <xliff:g id="PERMISSION">%2$s</xliff:g>"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_2_permissions" msgid="671791184670801301">"Durante la guida, hai consentito all\'app <xliff:g id="APP">%1$s</xliff:g> di accedere a <xliff:g id="PERMISSION_1">%2$s</xliff:g> e <xliff:g id="PERMISSION_2">%3$s</xliff:g>"</string>
diff --git a/PermissionController/res/values-ja/strings.xml b/PermissionController/res/values-ja/strings.xml
index 593907359..200e704fd 100644
--- a/PermissionController/res/values-ja/strings.xml
+++ b/PermissionController/res/values-ja/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"このアプリは常に位置情報にアクセスできます。設定を変更するにはタップしてください。"</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"通知へのアクセス権があるアプリの確認"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> は、通知内のコンテンツの非表示、操作、アクセスを行えます。"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"このアプリは、通知内のコンテンツの非表示、操作、アクセスを行えます。一部のアプリは、正常に動作するにはこのタイプのアクセス権が必要です。"</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"このアプリは、通知内のコンテンツの非表示、操作、アクセスを行えます。一部のアプリは、正常に動作するためにこのタイプのアクセス権が必要です。"</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"アクセス権を削除"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"その他のオプションを表示"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"アクセス権が削除されました"</string>
diff --git a/PermissionController/res/values-ka/strings.xml b/PermissionController/res/values-ka/strings.xml
index 0e61c44e4..d8cce80cb 100644
--- a/PermissionController/res/values-ka/strings.xml
+++ b/PermissionController/res/values-ka/strings.xml
@@ -281,7 +281,7 @@
     <string name="auto_revoke_preference_summary" msgid="5517958331781391481">"ნებართვები ამოიშალა თქვენი კონფიდენციალურობის დასაცავად"</string>
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g>-მა მიიღო თქვენი მდებარეობა ფონურ რეჟიმში"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"ამ აპს ყოველთვის შეუძლია თქვენს მდებარეობაზე წვდომა. შეეხეთ შესაცვლელად."</string>
-    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"გადახედეთ თქვენს შეტყობინებებზე წვდომის მქონე აპებს"</string>
+    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"გადახედეთ თქვენს შეტყობინებებზე წვდომის მქონე აპს"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> აპს შეუძლია კონტენტს-შიდა შეტყობინებების დახურვა, მათზე მოქმედება და წვდომა"</string>
     <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ამ აპს შეუძლია კონტენტს-შიდა შეტყობინებების დახურვა, მათზე მოქმედება და წვდომა ზოგიერთ აპს სჭირდება ამ ტიპის წვდომა გამართულად მუშაობისთვის."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"წვდომის გაუქმება"</string>
diff --git a/PermissionController/res/values-kn/strings.xml b/PermissionController/res/values-kn/strings.xml
index e437e9ee6..fb65900db 100644
--- a/PermissionController/res/values-kn/strings.xml
+++ b/PermissionController/res/values-kn/strings.xml
@@ -281,7 +281,7 @@
     <string name="auto_revoke_preference_summary" msgid="5517958331781391481">"ನಿಮ್ಮ ಗೌಪ್ಯತೆಯನ್ನು ರಕ್ಷಿಸಲು ಅನುಮತಿಗಳನ್ನು ತೆಗೆದುಹಾಕಲಾಗಿದೆ"</string>
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g> ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಹಿನ್ನಲೆಯಲ್ಲಿ ಪಡೆದುಕೊಂಡಿದೆ"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"ಈ ಆ್ಯಪ್‌ ಯಾವಾಗಲೂ ನಿಮ್ಮ ಸ್ಥಳವನ್ನು ಪ್ರವೇಶಿಸಬಹುದು. ಬದಲಾಯಿಸಲು ಟ್ಯಾಪ್ ಮಾಡಿ."</string>
-    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳಿಗೆ ಪ್ರವೇಶ ನೀಡುವ ಮೂಲಕ ಆ್ಯಪ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
+    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳಿಗೆ ಪ್ರವೇಶ ಹೊಂದಿರುವ ಆ್ಯಪ್ ಅನ್ನು ಪರಿಶೀಲಿಸಿ"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾಗೊಳಿಸಬಹುದು, ಕ್ರಮ ಕೈಗೊಳ್ಳಬಹುದು ಹಾಗೂ ಅದರಲ್ಲಿರುವ ವಿಷಯವನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಬಹುದು"</string>
     <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ಈ ಆ್ಯಪ್ ನಿಮ್ಮ ಅಧಿಸೂಚನೆಗಳನ್ನು ವಜಾಗೊಳಿಸಬಹುದು, ಕ್ರಮ ಕೈಗೊಳ್ಳಬಹುದು ಹಾಗೂ ಅದರಲ್ಲಿರುವ ವಿಷಯವನ್ನು ಆ್ಯಕ್ಸೆಸ್ ಮಾಡಬಹುದು. ಕೆಲವು ಆ್ಯಪ್‌ಗಳು ಉದ್ದೇಶಿಸಿದಂತೆ ಕಾರ್ಯನಿರ್ವಹಿಸಲು ಅವುಗಳಿಗೆ ಈ ಆ್ಯಕ್ಸೆಸ್‌ನ ಅಗತ್ಯವಿದೆ."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"ಪ್ರವೇಶವನ್ನು ತೆಗೆದುಹಾಕಿ"</string>
diff --git a/PermissionController/res/values-lv-v33/strings.xml b/PermissionController/res/values-lv-v33/strings.xml
index d65af81bb..96f2e77c4 100644
--- a/PermissionController/res/values-lv-v33/strings.xml
+++ b/PermissionController/res/values-lv-v33/strings.xml
@@ -32,7 +32,7 @@
     <string name="safety_center_issue_card_content_description" msgid="1281390769721765363">"Brīdinājums. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%2$s</xliff:g>"</string>
     <string name="safety_center_issue_card_content_description_with_subtitle" msgid="5504040663935313539">"Brīdinājums. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUBTITLE">%2$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%3$s</xliff:g>"</string>
     <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Darbība ir pabeigta"</string>
-    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Pārbaudiet iestatījumus, kas var palielināt jūsu ierīces aizsardzību"</string>
+    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Pārbaudiet iestatījumus, kas var uzlabot ierīces aizsardzību"</string>
     <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Drošības un konfidencialitātes ātrie iestatījumi"</string>
     <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Aizvērt"</string>
     <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Izvērst un rādīt opcijas"</string>
diff --git a/PermissionController/res/values-lv/strings.xml b/PermissionController/res/values-lv/strings.xml
index 437de5e90..81f20addf 100644
--- a/PermissionController/res/values-lv/strings.xml
+++ b/PermissionController/res/values-lv/strings.xml
@@ -515,7 +515,7 @@
     <string name="blocked_mic_summary" msgid="8960466941528458347">"Mikrofona dati joprojām var tikt kopīgoti, kad zvanīsiet uz ārkārtas numuru."</string>
     <string name="blocked_sensor_button_label" msgid="6742092634984289658">"Mainīt"</string>
     <string name="safety_center_dashboard_page_title" msgid="2810774008694315854">"Drošība un konfidencialitāte"</string>
-    <string name="safety_center_rescan_button" msgid="4517514567809409596">"Meklēt ierīcē"</string>
+    <string name="safety_center_rescan_button" msgid="4517514567809409596">"Skenēt ierīci"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Noraidīt"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"Vai nerādīt šo brīdinājumu?"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Lai pievienotu papildu aizsardzību, jebkurā brīdī varat pārskatīt drošības un konfidencialitātes iestatījumus"</string>
@@ -534,8 +534,8 @@
     <string name="permissions_removed_qs" msgid="8957319130625294572">"Atļauja ir noņemta"</string>
     <string name="camera_usage_qs" msgid="4394233566086665994">"Skatīt nesenos kameras lietojuma datus"</string>
     <string name="microphone_usage_qs" msgid="8527666682168170417">"Skatīt nesenos mikrofona lietojuma datus"</string>
-    <string name="remove_camera_qs" msgid="3649996161066883350">"Noņemt šīs lietotnes atļaujas"</string>
-    <string name="remove_microphone_qs" msgid="1276551965129953198">"Noņemt šīs lietotnes atļaujas"</string>
+    <string name="remove_camera_qs" msgid="3649996161066883350">"Noņemt atļauju šai lietotnei"</string>
+    <string name="remove_microphone_qs" msgid="1276551965129953198">"Noņemt atļauju šai lietotnei"</string>
     <string name="manage_service_qs" msgid="7862555549364153805">"Pārvaldīt pakalpojumu"</string>
     <string name="manage_permissions_qs" msgid="3780541819763475434">"Pārvaldīt atļaujas"</string>
     <string name="active_call_usage_qs" msgid="8559974395932523391">"To izmanto tālruņa zvans"</string>
diff --git a/PermissionController/res/values-ml/strings.xml b/PermissionController/res/values-ml/strings.xml
index 1f03e95d7..8a328b4f6 100644
--- a/PermissionController/res/values-ml/strings.xml
+++ b/PermissionController/res/values-ml/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"ഈ ആപ്പിന് എപ്പോഴും നിങ്ങളുടെ ലൊക്കേഷൻ ആക്‌സസ് ചെയ്യാനാവും. മാറ്റാൻ ടാപ്പ് ചെയ്യുക."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"നിങ്ങളുടെ അറിയിപ്പുകളിലേക്ക് ആക്‌സസുള്ള ആപ്പ് അവലോകനം ചെയ്യൂ"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> എന്ന ആപ്പിന് നിങ്ങളുടെ അറിയിപ്പുകൾക്ക് ഉള്ളിലുള്ള ഉള്ളടക്കം ആക്സസ് ചെയ്യാം, ഡിസ്മിസ് ചെയ്യാം, അതിൽ നടപടിയെടുക്കുകയും ചെയ്യാം"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ഈ ആപ്പിന് നിങ്ങളുടെ അറിയിപ്പുകൾക്ക് ഉള്ളിലുള്ള ഉള്ളടക്കം ആക്സസ് ചെയ്യാം, ഡിസ്മിസ് ചെയ്യാം, അതിൽ നടപടിയെടുക്കുകയും ചെയ്യാം. ഉദ്ദേശിച്ചത് പോലെ പ്രവർത്തിക്കാൻ ചില ആപ്പുകൾക്ക് ഈ ആക്‌സസ് ആവശ്യമാണ്."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ഈ ആപ്പിന് നിങ്ങളുടെ അറിയിപ്പുകൾ ഡിസ്മിസ് ചെയ്യാനും അതിൽ നടപടിയെടുക്കാനും ഉള്ളിലുള്ള ഉള്ളടക്കം ആക്സസ് ചെയ്യാനുമാകും. ഉദ്ദേശിച്ചത് പോലെ പ്രവർത്തിക്കാൻ ചില ആപ്പുകൾക്ക് ഈ ആക്‌സസ് ആവശ്യമാണ്."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"ആക്‌സസ് നീക്കം ചെയ്യുക"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"കൂടുതൽ ഓപ്‌ഷനുകൾ കാണുക"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"ആക്‌സസ് നീക്കം ചെയ്‌തു"</string>
diff --git a/PermissionController/res/values-ms/strings.xml b/PermissionController/res/values-ms/strings.xml
index 880a326d7..71df0dd2d 100644
--- a/PermissionController/res/values-ms/strings.xml
+++ b/PermissionController/res/values-ms/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Apl ini boleh mengakses lokasi anda pada setiap masa. Ketik untuk menukar."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Semak apl yang mempunyai akses kepada pemberitahuan anda"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> boleh mengetepikan, bertindak dan mengakses kandungan dalam pemberitahuan anda"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Apl ini boleh mengetepikan, bertindak dan mengakses kandungan dalam pemberitahuan anda Sesetengah apl memerlukan akses ini untuk berfungsi sewajarnya."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Apl ini boleh mengetepikan, bertindak dan mengakses kandungan dalam pemberitahuan anda. Sesetengah apl memerlukan akses ini untuk berfungsi sewajarnya."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Alih keluar akses"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Lihat lebih banyak pilihan"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Akses dialih keluar"</string>
diff --git a/PermissionController/res/values-my/strings.xml b/PermissionController/res/values-my/strings.xml
index f1e57fafb..bbc0a100e 100644
--- a/PermissionController/res/values-my/strings.xml
+++ b/PermissionController/res/values-my/strings.xml
@@ -265,7 +265,7 @@
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{အသုံးမပြုသောအက်ပ် # ခု}other{အသုံးမပြုသောအက်ပ် # ခု}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"ခွင့်ပြုချက်နှင့် ယာယီဖိုင်များကို ဖယ်ရှားလိုက်ပြီး အကြောင်းကြားချက်များကို ရပ်ထားသည်။ ပြန်ကြည့်ရန် တို့ပါ။"</string>
     <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"ခွင့်ပြုချက်များ ဖယ်ရှားထားသောအက်ပ်များကို စစ်ရန်"</string>
-    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"အက်ပ်များကို လတ်တလော သင်မသုံးပါက ခွင့်ပြုချက်နှင့် ယာယီဖိုင်များကို ဖယ်ရှားပြီး အကြောင်းကြားချက်များကို ရပ်ထားသည်။"</string>
+    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"အချိန်အတန်ကြာ အသုံးမပြုသော အက်ပ်များအတွက် ခွင့်ပြုချက်နှင့် ယာယီဖိုင်များကို ဖယ်ရှားပြီး အကြောင်းကြားချက်များကို ရပ်ထားသည်။"</string>
     <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"အက်ပ်များကို စစ်ရန်"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"လတ်တလောခွင့်ပြုချက်များ စစ်ဆေးခြင်း"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"မောင်းနှင်နေစဉ် <xliff:g id="APP">%1$s</xliff:g> ကို <xliff:g id="PERMISSION">%2$s</xliff:g> သုံးခွင့်ပေးထားသည်"</string>
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"ဤအက်ပ်က သင်၏တည်နေရာကို အမြဲဝင်ကြည့်နိုင်ပါသည်။ ပြောင်းရန် တို့ပါ။"</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"သင့်အကြောင်းကြားချက်များကို ကြည့်နိုင်သည့်အက်ပ်ကို စစ်ဆေးပါ"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> က သင့်အကြောင်းကြားချက်များအတွင်းရှိ အကြောင်းအရာကို ပယ်နိုင်၊ ဆောင်ရွက်နိုင်၊ သုံးနိုင်သည်"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ဤအက်ပ်က သင့်အကြောင်းကြားချက်များအတွင်းရှိ အကြောင်းအရာကို ပယ်နိုင်၊ ဆောင်ရွက်နိုင်၊ သုံးနိုင်သည် အချို့အက်ပ်များက ရည်ရွယ်ထားသလို လုပ်ဆောင်နိုင်ရန် ဤခွင့်ပြုချက်ကို လိုအပ်သည်။"</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ဤအက်ပ်က သင့်အကြောင်းကြားချက်များအတွင်းရှိ အကြောင်းအရာကို ပယ်နိုင်၊ ဆောင်ရွက်နိုင်၊ သုံးနိုင်သည်။ အချို့အက်ပ်များက ရည်ရွယ်ထားသလို လုပ်ဆောင်နိုင်ရန် ဤခွင့်ပြုချက်ကို လိုအပ်သည်။"</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"သုံးခွင့် ဖယ်ရှားရန်"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"နောက်ထပ်ရွေးချယ်စရာများ ကြည့်ရန်"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"သုံးခွင့် ဖယ်ရှားလိုက်ပြီ"</string>
@@ -514,7 +514,7 @@
     <string name="blocked_sensor_summary" msgid="4443707628305027375">"အက်ပ်နှင့် ဝန်ဆောင်မှုများအတွက်"</string>
     <string name="blocked_mic_summary" msgid="8960466941528458347">"အရေးပေါ် နံပါတ်ကို သင်ခေါ်ဆိုချိန်တွင် မိုက်ခရိုဖုန်းဒေတာကို မျှဝေနိုင်သေးသည်။"</string>
     <string name="blocked_sensor_button_label" msgid="6742092634984289658">"ပြောင်းရန်"</string>
-    <string name="safety_center_dashboard_page_title" msgid="2810774008694315854">"လုံခြုံရေး/ကိုယ်ရေးလုံခြုံမှု"</string>
+    <string name="safety_center_dashboard_page_title" msgid="2810774008694315854">"လုံခြုံရေး/အချက်အလက်လုံခြုံမှု"</string>
     <string name="safety_center_rescan_button" msgid="4517514567809409596">"စက်ကိုစစ်ဆေးရန်"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"ပယ်ရန်"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"ဤသတိပေးချက်ကို ပယ်မလား။"</string>
@@ -526,14 +526,14 @@
     <string name="security_settings" msgid="3808106921175271317">"လုံခြုံရေး ဆက်တင်များ"</string>
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"ခွင့်ပြုချက်များ"</string>
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"လုံခြုံရေးနှင့် ကိုယ်ရေးအချက်အလက်လုံခြုံမှု"</string>
-    <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"အခြေအနေ စစ်ဆေးခြင်း"</string>
-    <string name="privacy_controls_qs" msgid="5780144882040591169">"သင်၏ကန့်သတ်ရန်ဆက်တင်များ"</string>
+    <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"အခြေအနေ စစ်ဆေးပါ"</string>
+    <string name="privacy_controls_qs" msgid="5780144882040591169">"အချက်အလက်လုံခြုံမှု ဆက်တင်များ"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"နောက်ထပ်ဆက်တင်များ"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"ကင်မရာသုံးခွင့်"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"မိုက်သုံးခွင့်"</string>
     <string name="permissions_removed_qs" msgid="8957319130625294572">"ခွင့်ပြုချက် ဖယ်ရှားလိုက်သည်"</string>
-    <string name="camera_usage_qs" msgid="4394233566086665994">"လတ်တလော ကင်မရာအသုံးပြုမှုကြည့်ရန်"</string>
-    <string name="microphone_usage_qs" msgid="8527666682168170417">"လတ်တလော မိုက်အသုံးပြုမှုကြည့်ရန်"</string>
+    <string name="camera_usage_qs" msgid="4394233566086665994">"မကြာသေးမီက ကင်မရာအသုံးပြုမှုကြည့်ရန်"</string>
+    <string name="microphone_usage_qs" msgid="8527666682168170417">"မကြာသေးမီက မိုက်အသုံးပြုမှုကြည့်ရန်"</string>
     <string name="remove_camera_qs" msgid="3649996161066883350">"ဤအက်ပ်အတွက်ခွင့်ပြုချက် ဖယ်ရှားရန်"</string>
     <string name="remove_microphone_qs" msgid="1276551965129953198">"ဤအက်ပ်အတွက်ခွင့်ပြုချက် ဖယ်ရှားရန်"</string>
     <string name="manage_service_qs" msgid="7862555549364153805">"ဝန်ဆောင်မှု စီမံခန့်ခွဲရန်"</string>
@@ -567,9 +567,9 @@
     <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"နောက်ခံတွင် တည်နေရာသုံးခွင့်ရှိသောအက်ပ်ကို စစ်ဆေးပါ"</string>
     <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"<xliff:g id="APP_NAME">%s</xliff:g> ကို ပိတ်ထားချိန်၌ပင် ၎င်းက သင့်တည်နေရာကို အမြဲဝင်ကြည့်နိုင်သည်"</string>
     <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"နောက်ခံတွင် တည်နေရာသုံးခွင့်ရှိသောအက်ပ်ကို စစ်ဆေးပါ"</string>
-    <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"ဤအက်ပ်ကို ပိတ်ထားချိန်၌ပင် သင့်တည်နေရာကို အမြဲဝင်ကြည့်နိုင်သည်။"</string>
+    <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"ဤအက်ပ်ကို ပိတ်ထားချိန်၌ပင် ၎င်းသည် သင့်တည်နေရာကို အမြဲဝင်ကြည့်နိုင်သည်။"</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"အသုံးပြုခွင့် ပြောင်းသွားသည်"</string>
-    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"လတ်တလော တည်နေရာအသုံးပြုမှုကို ကြည့်ရန်"</string>
+    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"မကြာသေးမီက တည်နေရာအသုံးပြုမှုကို ကြည့်ရန်"</string>
     <string name="privacy_controls_title" msgid="7605929972256835199">"ကန့်သတ်ရန်ဆက်တင်များ"</string>
     <string name="camera_toggle_title" msgid="1251201397431837666">"ကင်မရာသုံးခွင့်"</string>
     <string name="mic_toggle_title" msgid="2649991093496110162">"မိုက်ခရိုဖုန်းသုံးခွင့်"</string>
diff --git a/PermissionController/res/values-night-v33/themes.xml b/PermissionController/res/values-night-v33/themes.xml
index 0ca31c1b4..315788465 100644
--- a/PermissionController/res/values-night-v33/themes.xml
+++ b/PermissionController/res/values-night-v33/themes.xml
@@ -41,8 +41,8 @@
         <item name="colorScIconNull">@color/gm_grey_600</item>
 
         <!-- Buttons -->
-        <item name="scActionButtonStyle">@style/SafetyCenter.MaterialActionButton</item>
-        <item name="scSecondaryActionButtonStyle">@style/SafetyCenter.MaterialActionButton.Secondary</item>
+        <item name="scActionButtonStyle">@style/SafetyCenterActionButton</item>
+        <item name="scSecondaryActionButtonStyle">@style/SafetyCenterActionButton.Secondary</item>
 
         <item name="colorScShieldAccent">@color/sc_shield_accent</item>
     </style>
@@ -69,8 +69,8 @@
         <item name="colorScIconNull">@color/gm_grey_600</item>
 
         <!-- Buttons -->
-        <item name="scActionButtonStyle">@style/SafetyCenter.MaterialActionButton</item>
-        <item name="scSecondaryActionButtonStyle">@style/SafetyCenter.MaterialActionButton.Secondary</item>
+        <item name="scActionButtonStyle">@style/SafetyCenterActionButton</item>
+        <item name="scSecondaryActionButtonStyle">@style/SafetyCenterActionButton.Secondary</item>
 
         <item name="colorScShieldAccent">@color/sc_shield_accent</item>
     </style>
diff --git a/PermissionController/res/values-pa/strings.xml b/PermissionController/res/values-pa/strings.xml
index f3264edde..60318c9a2 100644
--- a/PermissionController/res/values-pa/strings.xml
+++ b/PermissionController/res/values-pa/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"ਇਹ ਐਪ ਹਮੇਸ਼ਾਂ ਤੁਹਾਡੀ ਟਿਕਾਣਾ ਜਾਣਕਾਰੀ \'ਤੇ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ। ਬਦਲਣ ਲਈ ਟੈਪ ਕਰੋ।"</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"ਤੁਹਾਡੀਆਂ ਸੂਚਨਾਵਾਂ ਤੱਕ ਪਹੁੰਚ ਵਾਲੀ ਐਪ ਦੀ ਸਮੀਖਿਆ ਕਰੋ"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> ਐਪ ਤੁਹਾਡੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇ ਅੰਦਰਲੀ ਸਮੱਗਰੀ ਨੂੰ ਖਾਰਜ ਕਰ ਸਕਦੀ ਹੈ, ਇਸ \'ਤੇ ਕਾਰਵਾਈ ਕਰ ਸਕਦੀ ਹੈ ਅਤੇ ਇਸ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ਇਹ ਐਪ ਤੁਹਾਡੀਆਂ ਸੂਚਨਾਵਾਂ ਦੇ ਅੰਦਰਲੀ ਸਮੱਗਰੀ ਨੂੰ ਖਾਰਜ ਕਰ ਸਕਦੀ ਹੈ, ਇਸ \'ਤੇ ਕਾਰਵਾਈ ਕਰ ਸਕਦੀ ਹੈ ਅਤੇ ਇਸ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ। ਕੁਝ ਐਪਾਂ ਨੂੰ ਨਿਯਤ ਤਰੀਕੇ ਨਾਲ ਕੰਮ ਕਰਨ ਲਈ ਇਸ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ।"</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ਇਹ ਐਪ ਤੁਹਾਡੀਆਂ ਸੂਚਨਾਵਾਂ ਦੀ ਅੰਦਰੂਨੀ ਸਮੱਗਰੀ ਨੂੰ ਖਾਰਜ ਕਰ ਸਕਦੀ ਹੈ, ਉਸ \'ਤੇ ਕਾਰਵਾਈ ਕਰ ਸਕਦੀ ਹੈ ਅਤੇ ਉਸ ਤੱਕ ਪਹੁੰਚ ਕਰ ਸਕਦੀ ਹੈ। ਕੁਝ ਐਪਾਂ ਨੂੰ ਨਿਯਤ ਤਰੀਕੇ ਨਾਲ ਕੰਮ ਕਰਨ ਲਈ ਇਸ ਪਹੁੰਚ ਦੀ ਲੋੜ ਹੈ।"</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"ਪਹੁੰਚ ਹਟਾਓ"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"ਹੋਰ ਵਿਕਲਪ ਦੇਖੋ"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"ਪਹੁੰਚ ਹਟਾਈ ਗਈ"</string>
diff --git a/PermissionController/res/values-pl/strings.xml b/PermissionController/res/values-pl/strings.xml
index 4b189a342..5d5f79fd4 100644
--- a/PermissionController/res/values-pl/strings.xml
+++ b/PermissionController/res/values-pl/strings.xml
@@ -21,7 +21,7 @@
     <string name="permission_search_keyword" msgid="1214451577494730543">"uprawnienia"</string>
     <string name="cancel" msgid="8943320028373963831">"Anuluj"</string>
     <string name="back" msgid="6249950659061523680">"Wstecz"</string>
-    <string name="available" msgid="6007778121920339498">"Dostępny"</string>
+    <string name="available" msgid="6007778121920339498">"Odblokowany"</string>
     <string name="blocked" msgid="9195547604866033708">"Zablokowany"</string>
     <string name="on" msgid="280241003226755921">"Włączono"</string>
     <string name="off" msgid="1438489226422866263">"Wyłącz"</string>
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Ta aplikacja może zawsze uzyskać dostęp do Twojej lokalizacji. Kliknij, by to zmienić."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Zweryfikuj aplikacje z dostępem do powiadomień"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"Aplikacja <xliff:g id="APP_NAME">%s</xliff:g> może odrzucać treści w powiadomieniach, korzystać z nich oraz wykonywać dotyczące ich działania"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Ta aplikacja może odrzucać treści w powiadomieniach, korzystać z nich oraz wykonywać dotyczące ich działania. Niektóre aplikacje wymagają takiego dostępu, aby działać prawidłowo."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Ta aplikacja może odrzucać treści w powiadomieniach, korzystać z nich oraz wykonywać zawarte w nich działania. Niektóre aplikacje wymagają takiego dostępu, aby działać prawidłowo."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Usuń dostęp"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Pokaż więcej opcji"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Dostęp usunięty"</string>
@@ -534,8 +534,8 @@
     <string name="permissions_removed_qs" msgid="8957319130625294572">"Usunięto uprawnienia"</string>
     <string name="camera_usage_qs" msgid="4394233566086665994">"Zobacz ostatnie przypadki użycia aparatu"</string>
     <string name="microphone_usage_qs" msgid="8527666682168170417">"Zobacz ostatnie przypadki użycia mikrofonu"</string>
-    <string name="remove_camera_qs" msgid="3649996161066883350">"Wycofaj uprawnienia tej aplikacji"</string>
-    <string name="remove_microphone_qs" msgid="1276551965129953198">"Wycofaj uprawnienia tej aplikacji"</string>
+    <string name="remove_camera_qs" msgid="3649996161066883350">"Wycofaj uprawnienie tej aplikacji"</string>
+    <string name="remove_microphone_qs" msgid="1276551965129953198">"Wycofaj uprawnienie tej aplikacji"</string>
     <string name="manage_service_qs" msgid="7862555549364153805">"Zarządzaj usługą"</string>
     <string name="manage_permissions_qs" msgid="3780541819763475434">"Zarządzanie uprawnieniami"</string>
     <string name="active_call_usage_qs" msgid="8559974395932523391">"Używane przez rozmowę telefoniczną"</string>
@@ -567,7 +567,7 @@
     <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Zweryfikuj aplikację z dostępem do lokalizacji w tle"</string>
     <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"Aplikacja <xliff:g id="APP_NAME">%s</xliff:g> ma dostęp do Twojej lokalizacji, nawet kiedy jest zamknięta"</string>
     <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Zweryfikuj aplikację z dostępem do lokalizacji w tle"</string>
-    <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"Aplikacja ma dostęp do Twojej lokalizacji, nawet kiedy jest zamknięta"</string>
+    <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"Aplikacja ma dostęp do Twojej lokalizacji nawet wtedy, kiedy jest zamknięta."</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"Uprawnienia dostępu zostały zmienione"</string>
     <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Zobacz ostatnie użycie lokalizacji"</string>
     <string name="privacy_controls_title" msgid="7605929972256835199">"Ustawienia prywatności"</string>
diff --git a/PermissionController/res/values-pt-rBR/strings.xml b/PermissionController/res/values-pt-rBR/strings.xml
index a8633f284..c56e20289 100644
--- a/PermissionController/res/values-pt-rBR/strings.xml
+++ b/PermissionController/res/values-pt-rBR/strings.xml
@@ -285,7 +285,7 @@
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"O app <xliff:g id="APP_NAME">%s</xliff:g> pode dispensar, executar ações e acessar o conteúdo das suas notificações"</string>
     <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Este app pode dispensar, executar ações e acessar o conteúdo das suas notificações. Alguns apps exigem esse acesso para funcionar como o esperado."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Remover acesso"</string>
-    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Veja mais opções"</string>
+    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Ver mais opções"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Acesso removido"</string>
     <string name="accessibility_access_reminder_notification_title" msgid="2971317234668807566">"Revisar app com acesso total ao dispositivo"</string>
     <string name="accessibility_access_reminder_notification_content" msgid="7389454158175306720">"O <xliff:g id="APP_NAME">%s</xliff:g> pode ver sua tela e realizar ações no seu dispositivo. Os apps de acessibilidade precisam desse tipo de acesso para funcionar como o esperado."</string>
@@ -526,7 +526,7 @@
     <string name="security_settings" msgid="3808106921175271317">"Configurações de segurança"</string>
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"Permissões"</string>
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Segurança e privacidade"</string>
-    <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Conferir status"</string>
+    <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Ver status"</string>
     <string name="privacy_controls_qs" msgid="5780144882040591169">"Seus controles de privacidade"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Mais configurações"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Acesso à câmera"</string>
diff --git a/PermissionController/res/values-pt-rPT/strings.xml b/PermissionController/res/values-pt-rPT/strings.xml
index 850ced02f..f16ea80a2 100644
--- a/PermissionController/res/values-pt-rPT/strings.xml
+++ b/PermissionController/res/values-pt-rPT/strings.xml
@@ -103,7 +103,7 @@
     <!-- no translation found for background_access_chooser_dialog_choices:1 (9127301153688725448) -->
     <!-- no translation found for background_access_chooser_dialog_choices:2 (4305536986042401191) -->
     <string name="permission_access_always" msgid="1474641821883823446">"Permitir sempre"</string>
-    <string name="permission_access_only_foreground" msgid="7801170728159326195">"Perm. durante utiliz. app"</string>
+    <string name="permission_access_only_foreground" msgid="7801170728159326195">"Permitir só ao usar app"</string>
     <string name="permission_access_never" msgid="4647014230217936900">"Não permitir"</string>
     <string name="loading" msgid="4789365003890741082">"A carregar…"</string>
     <string name="all_permissions" msgid="6911125611996872522">"Todas as autorizações"</string>
diff --git a/PermissionController/res/values-pt/strings.xml b/PermissionController/res/values-pt/strings.xml
index a8633f284..c56e20289 100644
--- a/PermissionController/res/values-pt/strings.xml
+++ b/PermissionController/res/values-pt/strings.xml
@@ -285,7 +285,7 @@
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"O app <xliff:g id="APP_NAME">%s</xliff:g> pode dispensar, executar ações e acessar o conteúdo das suas notificações"</string>
     <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Este app pode dispensar, executar ações e acessar o conteúdo das suas notificações. Alguns apps exigem esse acesso para funcionar como o esperado."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Remover acesso"</string>
-    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Veja mais opções"</string>
+    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Ver mais opções"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Acesso removido"</string>
     <string name="accessibility_access_reminder_notification_title" msgid="2971317234668807566">"Revisar app com acesso total ao dispositivo"</string>
     <string name="accessibility_access_reminder_notification_content" msgid="7389454158175306720">"O <xliff:g id="APP_NAME">%s</xliff:g> pode ver sua tela e realizar ações no seu dispositivo. Os apps de acessibilidade precisam desse tipo de acesso para funcionar como o esperado."</string>
@@ -526,7 +526,7 @@
     <string name="security_settings" msgid="3808106921175271317">"Configurações de segurança"</string>
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"Permissões"</string>
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Segurança e privacidade"</string>
-    <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Conferir status"</string>
+    <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Ver status"</string>
     <string name="privacy_controls_qs" msgid="5780144882040591169">"Seus controles de privacidade"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Mais configurações"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Acesso à câmera"</string>
diff --git a/PermissionController/res/values-ru/strings.xml b/PermissionController/res/values-ru/strings.xml
index de06ceea1..cf107f854 100644
--- a/PermissionController/res/values-ru/strings.xml
+++ b/PermissionController/res/values-ru/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"У этого приложения есть постоянный доступ к сведениям о вашем местоположении. Нажмите, чтобы изменить настройки."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Проверьте приложение с доступом к уведомлениям"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"Приложение \"<xliff:g id="APP_NAME">%s</xliff:g>\" может взаимодействовать с уведомлениями, в том числе скрывать их и получать к ним доступ."</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Приложение может взаимодействовать с уведомлениями, в том числе скрывать их и получать к ним доступ. Это необходимо для правильной работы приложения."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Это приложение может закрывать уведомления, совершать с ними другие действия и получать доступ к их содержимому. Некоторым приложениям это разрешение требуется для правильной работы."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Запретить доступ"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Показать дополнительные параметры"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Доступ закрыт"</string>
@@ -528,7 +528,7 @@
     <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Защита и конфиденциальность"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Проверьте статус."</string>
     <string name="privacy_controls_qs" msgid="5780144882040591169">"Ваши настройки конфиденциальности"</string>
-    <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Дополнительные настройки"</string>
+    <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Другие настройки"</string>
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Доступ к камере"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Доступ к микрофону"</string>
     <string name="permissions_removed_qs" msgid="8957319130625294572">"Разрешение отозвано"</string>
diff --git a/PermissionController/res/values-sl-v33/strings.xml b/PermissionController/res/values-sl-v33/strings.xml
index 695de43ee..ccc00246f 100644
--- a/PermissionController/res/values-sl-v33/strings.xml
+++ b/PermissionController/res/values-sl-v33/strings.xml
@@ -32,7 +32,7 @@
     <string name="safety_center_issue_card_content_description" msgid="1281390769721765363">"Opozorilo. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%2$s</xliff:g>"</string>
     <string name="safety_center_issue_card_content_description_with_subtitle" msgid="5504040663935313539">"Opozorilo. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUBTITLE">%2$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%3$s</xliff:g>"</string>
     <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Dejanje končano"</string>
-    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Preverite nastavitve, ki lahko izboljšajo varnost naprave"</string>
+    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Preverite nastavitve, ki lahko izboljšajo varnost naprave."</string>
     <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Hitre nastavitve varnosti in zasebnosti"</string>
     <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Zapri"</string>
     <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Razširi in pokaži možnosti"</string>
diff --git a/PermissionController/res/values-sl/strings.xml b/PermissionController/res/values-sl/strings.xml
index 8170385c9..fb8fc505d 100644
--- a/PermissionController/res/values-sl/strings.xml
+++ b/PermissionController/res/values-sl/strings.xml
@@ -264,7 +264,7 @@
     <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"Nekatere aplikacije niso bile uporabljene več mesecev. Dotaknite se za pregled."</string>
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# neuporabljena aplikacija}one{# neuporabljena aplikacija}two{# neuporabljeni aplikaciji}few{# neuporabljene aplikacije}other{# neuporabljenih aplikacij}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"Dovoljenja in začasne datoteke so odstranjeni, obvestila so zaustavljena. Dotaknite se za pregled."</string>
-    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"Pregled aplikacij z odstranjenimi dovoljenji"</string>
+    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"Preglejte aplikacije z odstranjenimi dovoljenji"</string>
     <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"Za aplikacije, ki jih nekaj časa niste uporabljali, so bili dovoljenja in začasne datoteke odstranjeni, obvestila pa so bila ustavljena."</string>
     <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"Preglejte aplikacije"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"Preverite nedavna dovoljenja"</string>
@@ -518,7 +518,7 @@
     <string name="safety_center_rescan_button" msgid="4517514567809409596">"Preglej napravo"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Opusti"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"Želite opustiti to opozorilo?"</string>
-    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Za dodatno zaščito lahko kadar koli pregledate varnostne nastavitve in nastavitve zasebnosti"</string>
+    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Za dodatno zaščito lahko kadar koli pregledate varnostne nastavitve in nastavitve zasebnosti."</string>
     <string name="safety_center_issue_card_confirm_dismiss_button" msgid="5884137843083634556">"Opusti"</string>
     <string name="safety_center_issue_card_cancel_dismiss_button" msgid="2874578798877712346">"Prekliči"</string>
     <string name="safety_center_entries_category_title" msgid="34356964062813115">"Nastavitve"</string>
diff --git a/PermissionController/res/values-sr/strings.xml b/PermissionController/res/values-sr/strings.xml
index 49333101d..5965aed5d 100644
--- a/PermissionController/res/values-sr/strings.xml
+++ b/PermissionController/res/values-sr/strings.xml
@@ -282,8 +282,8 @@
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"<xliff:g id="APP_NAME">%s</xliff:g> има вашу локацију у позадини"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Ова апликација може увек да приступа локацији. Додирните да бисте то променили."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Прегледајте апликацију са приступом обавештењима"</string>
-    <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> може да одбацује садржај у вашим обавештењима, реагује и приступа том садржају"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Ова апликација може да одбацује садржај у вашим обавештењима, реагује и приступа том садржају. Неким апликацијама је потребан овакав тип приступа да би функционисале као што је предвиђено."</string>
+    <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> може да реагује, одбацује и приступа садржају у обавештењима"</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Ова апликација може да реагује, одбацује и приступа садржају у обавештењима. Неким апликацијама је потребан овакав тип приступа да би функционисале као што је предвиђено."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Уклони приступ"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Прикажи још опција"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Приступ је уклоњен"</string>
diff --git a/PermissionController/res/values-ta/strings.xml b/PermissionController/res/values-ta/strings.xml
index 61b57077c..d5c87a0c3 100644
--- a/PermissionController/res/values-ta/strings.xml
+++ b/PermissionController/res/values-ta/strings.xml
@@ -564,9 +564,9 @@
     <string name="media_confirm_dialog_message_q_to_s_aural_deny" msgid="6832087393653561911">"இந்த ஆப்ஸ் Androidன் சமீபத்திய பதிப்பை ஆதரிக்கவில்லை. இந்த ஆப்ஸால் இசை மற்றும் ஆடியோ ஃபைல்களை அணுக முடியாதெனில், படங்கள் மற்றும் வீடியோக்களை அணுகுவதற்கும் இந்த ஆப்ஸ் அனுமதிக்கப்படாது."</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_allow" msgid="3504335060843147760">"இந்த ஆப்ஸ் Androidன் சமீபத்திய பதிப்பை ஆதரிக்கவில்லை. இந்த ஆப்ஸ் படங்களையும் வீடியோக்களையும் அணுகினால், இசை மற்றும் ஆடியோ ஃபைல்களையும் இந்த ஆப்ஸ் அணுக அனுமதிக்கப்படும்."</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_deny" msgid="2145973462806481992">"இந்த ஆப்ஸ் Androidன் சமீபத்திய பதிப்பை ஆதரிக்கவில்லை. இந்த ஆப்ஸால் இசை மற்றும் ஆடியோ ஃபைல்களை அணுக முடியாதெனில், படங்கள் மற்றும் வீடியோக்களை அணுகுவதற்கும் இந்த ஆப்ஸ் அனுமதிக்கப்படாது."</string>
-    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"பின்னணி இருப்பிடத்திற்கான அணுகலுள்ள ஆப்ஸை மதிப்பாய்வு செய்யுங்கள்"</string>
+    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"பின்னணியில் இருப்பிடத்தை அணுகும் ஆப்ஸை மதிப்பாய்வு செய்யுங்கள்"</string>
     <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"<xliff:g id="APP_NAME">%s</xliff:g> ஆப்ஸால் உங்கள் இருப்பிடத்தை எப்போதும் (மூடப்பட்டிருந்தாலும் கூட) அணுக முடியும்"</string>
-    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"பின்னணி இருப்பிடத்திற்கான அணுகலுள்ள ஆப்ஸை மதிப்பாய்வு செய்யுங்கள்"</string>
+    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"பின்னணியில் இருப்பிடத்தை அணுகும் ஆப்ஸை மதிப்பாய்வு செய்யுங்கள்"</string>
     <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"இந்த ஆப்ஸால் இருப்பிடத்தை எப்போதும் (மூடப்பட்டிருந்தாலும் கூட) அணுக முடியும்."</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"அணுகல் மாற்றப்பட்டது"</string>
     <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"சமீபத்திய இருப்பிட உபயோகத்தைக் காட்டு"</string>
diff --git a/PermissionController/res/values-te/strings.xml b/PermissionController/res/values-te/strings.xml
index f22b72d8d..6091a0d62 100644
--- a/PermissionController/res/values-te/strings.xml
+++ b/PermissionController/res/values-te/strings.xml
@@ -264,8 +264,8 @@
     <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"కొన్ని యాప్‌లు గత కొన్ని నెలలుగా వినియోగంలో లేవు. రివ్యూ చేయడానికి ట్యాప్ చేయండి."</string>
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# ఉపయోగించని యాప్}other{# ఉపయోగించని యాప్‌లు}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"అనుమతులు, తాత్కాలిక ఫైళ్లు తీసివేయబడ్డాయి అలాగే నోటిఫికేషన్‌లు ఆపివేయబడ్డాయి. రివ్యూ చేయడానికి ట్యాప్ చేయండి."</string>
-    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"Review apps with permissions removed"</string>
-    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"For apps that you haven’t used in a while, permissions and temporary files were removed and notifications were stopped."</string>
+    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"అనుమతులు తీసివేయబడిన యాప్‌లను రివ్యూ చేయండి"</string>
+    <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"కొంతకాలంగా మీరు ఉపయోగించని యాప్‌లకు సంబంధించిన అనుమతులు, తాత్కాలిక ఫైల్‌లు తొలగించబడ్డాయి, అలాగే నోటిఫికేషన్‌లు నిలిపివేయబడ్డాయి."</string>
     <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"యాప్‌లను రివ్యూ చేయండి"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"ఇటీవలి అనుమతులను చెక్ చేయండి"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"డ్రైవింగ్‌లో ఉన్నప్పుడు, మీరు <xliff:g id="APP">%1$s</xliff:g> యాప్‌నకు <xliff:g id="PERMISSION">%2$s</xliff:g>‌కు యాక్సెస్‌ను ఇచ్చారు"</string>
@@ -281,11 +281,11 @@
     <string name="auto_revoke_preference_summary" msgid="5517958331781391481">"మీ గోప్యతను రక్షించడానికి అనుమతులు తీసివేయబడ్డాయి"</string>
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"మీ లొకేషన్‌ను <xliff:g id="APP_NAME">%s</xliff:g> బ్యాక్‌గ్రౌండ్‌లో ఉపయోగిస్తోంది"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"ఈ యాప్ మీ లొకేషన్‌ను ఎల్లప్పుడూ యాక్సెస్ చేయగలదు. మార్చడానికి ట్యాప్ చేయండి."</string>
-    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Review app with access to your notifications"</string>
+    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"మీ నోటిఫికేషన్‌లకు, యాక్సెస్ ఉన్న యాప్‌ను రివ్యూ చేయండి"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> మీ నోటిఫికేషన్‌లలోని కంటెంట్‌ను తీసివేయగలదు, దాని మీద చర్య తీసుకోగలదు, దానిని యాక్సెస్ చేయగలదు"</string>
     <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"ఈ యాప్ మీ నోటిఫికేషన్‌లలోని కంటెంట్‌ను తీసివేయగలదు, దాని మీద చర్య తీసుకోగలదు, దానిని యాక్సెస్ చేయగలదు. కొన్ని యాప్‌లు ఉద్దేశించిన విధంగా పని చేయడానికి ఈ యాక్సెస్ అవసరం."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"యాక్సెస్‌ను తీసివేయండి"</string>
-    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"మరిన్ని ఎంపికలను చూడండి"</string>
+    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"మరిన్ని ఆప్షన్‌లను చూడండి"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"యాక్సెస్ తీసివేయబడింది"</string>
     <string name="accessibility_access_reminder_notification_title" msgid="2971317234668807566">"Review app with full device access"</string>
     <string name="accessibility_access_reminder_notification_content" msgid="7389454158175306720">"<xliff:g id="APP_NAME">%s</xliff:g> can view your screen and perform actions on your device. Accessibility apps need this type of access to function as intended."</string>
@@ -518,7 +518,7 @@
     <string name="safety_center_rescan_button" msgid="4517514567809409596">"పరికరాన్ని స్కాన్ చేయండి"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"విస్మరించండి"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"ఈ అలర్ట్‌ను విస్మరించాలా?"</string>
-    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"మరింత రక్షణను జోడించడానికి మీ భద్రత, గోప్యతా సెట్టింగ్‌లను ఎప్పుడైనా రివ్యూ చేయండి"</string>
+    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"మరింత రక్షణను జోడించడానికి మీ సెక్యూరిటీ, గోప్యతా సెట్టింగ్‌లను ఎప్పుడైనా సరే రివ్యూ చేయండి"</string>
     <string name="safety_center_issue_card_confirm_dismiss_button" msgid="5884137843083634556">"విస్మరించండి"</string>
     <string name="safety_center_issue_card_cancel_dismiss_button" msgid="2874578798877712346">"రద్దు చేయండి"</string>
     <string name="safety_center_entries_category_title" msgid="34356964062813115">"సెట్టింగ్‌లు"</string>
@@ -537,7 +537,7 @@
     <string name="remove_camera_qs" msgid="3649996161066883350">"ఈ యాప్ కోసం అనుమతిని తీసివేయండి"</string>
     <string name="remove_microphone_qs" msgid="1276551965129953198">"ఈ యాప్ కోసం అనుమతిని తీసివేయండి"</string>
     <string name="manage_service_qs" msgid="7862555549364153805">"సర్వీస్‌ను మేనేజ్ చేయండి"</string>
-    <string name="manage_permissions_qs" msgid="3780541819763475434">"అనుమతులను మేనేజ్ చేయగలరు"</string>
+    <string name="manage_permissions_qs" msgid="3780541819763475434">"అనుమతులను మేనేజ్ చేయండి"</string>
     <string name="active_call_usage_qs" msgid="8559974395932523391">"ఫోన్ కాల్ ద్వారా ఉపయోగించబడుతోంది"</string>
     <string name="recent_call_usage_qs" msgid="743044899599410935">"ఇటీవల ఫోన్ కాల్‌లో ఉపయోగించబడింది"</string>
     <string name="active_app_usage_qs" msgid="4063912870936464727">"<xliff:g id="APP_NAME">%1$s</xliff:g> ద్వారా ఉపయోగించబడుతోంది"</string>
@@ -566,10 +566,10 @@
     <string name="media_confirm_dialog_message_q_to_s_visual_deny" msgid="2145973462806481992">"ఈ యాప్ Android తాజా వెర్షన్‌కు సపోర్ట్ ఇవ్వదు. ఈ యాప్ మ్యూజిక్, ఆడియో ఫైల్స్‌ను యాక్సెస్ చేయలేకపోతే, ఫోటోలు, వీడియోలను యాక్సెస్ చేయడానికి కూడా ఇది అనుమతించబడదు."</string>
     <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Review app with background location access"</string>
     <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"<xliff:g id="APP_NAME">%s</xliff:g> can always access your location, even when the app is closed"</string>
-    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Review app with background location access"</string>
-    <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"This app can always access your location, even when it’s closed."</string>
+    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"బ్యాక్‌గ్రౌండ్ లొకేషన్‌కు యాక్సెస్‌ను కలిగి ఉన్న యాప్‌ను రివ్యూ చేయండి"</string>
+    <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"ఈ యాప్, మీ లొకేషన్‌ను ఎల్లప్పుడూ యాక్సెస్ చేయగలదు. క్లోజ్ చేసి ఉన్నప్పుడు కూడా."</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"యాక్సెస్‌ మార్చబడింది."</string>
-    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"See recent location usage"</string>
+    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"ఇటీవలి లొకేషన్‌ వినియోగాన్ని చూడండి"</string>
     <string name="privacy_controls_title" msgid="7605929972256835199">"గోప్యతా కంట్రోల్స్"</string>
     <string name="camera_toggle_title" msgid="1251201397431837666">"కెమెరా యాక్సెస్"</string>
     <string name="mic_toggle_title" msgid="2649991093496110162">"మైక్రోఫోన్ యాక్సెస్"</string>
diff --git a/PermissionController/res/values-uk-v33/strings.xml b/PermissionController/res/values-uk-v33/strings.xml
index 05a97b31f..17d1071c6 100644
--- a/PermissionController/res/values-uk-v33/strings.xml
+++ b/PermissionController/res/values-uk-v33/strings.xml
@@ -40,7 +40,7 @@
     <string name="safety_center_qs_privacy_control" msgid="1160682635058529673">"Перемкнути. <xliff:g id="PRIVACY_CONTROL_TITLE">%1$s</xliff:g>. <xliff:g id="PRIVACY_CONTROL_STATUS">%2$s</xliff:g>"</string>
     <string name="safety_center_qs_toggle_action" msgid="5920465736488119255">"Змінити"</string>
     <string name="safety_center_qs_open_action" msgid="2760200829912423728">"Відкрити"</string>
-    <string name="safety_center_review_settings_button" msgid="938981137942443930">"Переглянути налаштування"</string>
+    <string name="safety_center_review_settings_button" msgid="938981137942443930">"Перевірити налаштування"</string>
     <string name="safety_center_gear_label" msgid="5175877094379694098">"Налаштування"</string>
     <string name="safety_center_info_label" msgid="8993181584061825412">"Інформація"</string>
 </resources>
diff --git a/PermissionController/res/values-uk/strings.xml b/PermissionController/res/values-uk/strings.xml
index 368bb938c..a0af72ff8 100644
--- a/PermissionController/res/values-uk/strings.xml
+++ b/PermissionController/res/values-uk/strings.xml
@@ -281,13 +281,13 @@
     <string name="auto_revoke_preference_summary" msgid="5517958331781391481">"Дозволи відкликано, щоб захистити вашу конфіденційність"</string>
     <string name="background_location_access_reminder_notification_title" msgid="1140797924301941262">"Додаток <xliff:g id="APP_NAME">%s</xliff:g> визначив ваше місцезнаходження у фоновому режимі"</string>
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Цей додаток завжди має доступ до геоданих пристрою. Торкніться, щоб змінити це."</string>
-    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Перегляньте додаток із доступом до ваших сповіщень"</string>
+    <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Перевірте додаток із доступом до ваших сповіщень"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"Додаток <xliff:g id="APP_NAME">%s</xliff:g> може закривати ваші сповіщення, реагувати на них і отримувати доступ до їх вмісту"</string>
     <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Цей додаток може закривати ваші сповіщення, реагувати на них і отримувати доступ до їх вмісту. Деяким додаткам такий доступ потрібен для належної роботи."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Заборонити доступ"</string>
-    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Перегляньте інші варіанти"</string>
+    <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Переглянути інші варіанти"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Доступ заборонено"</string>
-    <string name="accessibility_access_reminder_notification_title" msgid="2971317234668807566">"Перегляньте додаток із повним доступом до пристрою"</string>
+    <string name="accessibility_access_reminder_notification_title" msgid="2971317234668807566">"Перевірте додаток із повним доступом до пристрою"</string>
     <string name="accessibility_access_reminder_notification_content" msgid="7389454158175306720">"Додаток <xliff:g id="APP_NAME">%s</xliff:g> може бачити ваш екран і виконувати дії на пристрої. Додаткам зі спеціальними можливостями потрібен доступ цього типу для належної роботи."</string>
     <string name="accessibility_access_warning_card_content" msgid="4370327190293217358">"Цей додаток може бачити ваш екран і виконувати дії на пристрої. Додаткам зі спеціальними можливостями потрібен доступ цього типу для належної роботи. Однак спершу перевірте, чи додаток надійний."</string>
     <string name="accessibility_remove_access_button_label" msgid="44145801526711640">"Заборонити доступ"</string>
@@ -532,8 +532,8 @@
     <string name="camera_toggle_label_qs" msgid="3880261453066157285">"Доступ до камери"</string>
     <string name="microphone_toggle_label_qs" msgid="8132912469813396552">"Доступ до мікрофона"</string>
     <string name="permissions_removed_qs" msgid="8957319130625294572">"Дозвіл вилучено"</string>
-    <string name="camera_usage_qs" msgid="4394233566086665994">"Переглянути дані про останнє використання камери"</string>
-    <string name="microphone_usage_qs" msgid="8527666682168170417">"Переглянути останнє використання мікрофона"</string>
+    <string name="camera_usage_qs" msgid="4394233566086665994">"Відомості про нещодавній доступ до камери"</string>
+    <string name="microphone_usage_qs" msgid="8527666682168170417">"Відомості про нещодавній доступ до мікрофона"</string>
     <string name="remove_camera_qs" msgid="3649996161066883350">"Вилучити дозвіл для цього додатка"</string>
     <string name="remove_microphone_qs" msgid="1276551965129953198">"Вилучити дозвіл для цього додатка"</string>
     <string name="manage_service_qs" msgid="7862555549364153805">"Керувати сервісом"</string>
@@ -564,12 +564,12 @@
     <string name="media_confirm_dialog_message_q_to_s_aural_deny" msgid="6832087393653561911">"Цей додаток не підтримує найновішу версію Android. Якщо він не має доступу до музики й аудіофайлів, то не зможе також отримувати доступ до фотографій і відео."</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_allow" msgid="3504335060843147760">"Цей додаток не підтримує найновішу версію Android. Якщо він має доступ до фотографій і відео, то зможе також отримувати доступ до музики й аудіофайлів."</string>
     <string name="media_confirm_dialog_message_q_to_s_visual_deny" msgid="2145973462806481992">"Цей додаток не підтримує найновішу версію Android. Якщо він не має доступу до музики й аудіофайлів, то не зможе також отримувати доступ до фотографій і відео."</string>
-    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Перегляньте додаток із доступом до геоданих у фоновому режимі"</string>
+    <string name="safety_center_background_location_access_notification_title" msgid="8933610618810588237">"Перевірте додаток із доступом до геоданих у фоновому режимі"</string>
     <string name="safety_center_background_location_access_reminder_notification_content" msgid="4066560182507301022">"Додаток <xliff:g id="APP_NAME">%s</xliff:g> може отримувати доступ до ваших геоданих, навіть коли не відкритий"</string>
-    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Перегляньте додаток із доступом до геоданих у фоновому режимі"</string>
+    <string name="safety_center_background_location_access_reminder_title" msgid="5477847038103863843">"Перевірте додаток із доступом до геоданих у фоновому режимі"</string>
     <string name="safety_center_background_location_access_reminder_summary" msgid="8276755741395332974">"Цей додаток завжди має доступ до геоданих пристрою, навіть коли не відкритий."</string>
     <string name="safety_center_background_location_access_revoked" msgid="6972274943343442213">"Дозвіл на доступ змінено"</string>
-    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Переглянути останнє використання геоданих"</string>
+    <string name="safety_center_view_recent_location_access" msgid="3524391299490678243">"Відомості про нещодавній доступ до геоданих"</string>
     <string name="privacy_controls_title" msgid="7605929972256835199">"Налаштування конфіденційності"</string>
     <string name="camera_toggle_title" msgid="1251201397431837666">"Доступ до камери"</string>
     <string name="mic_toggle_title" msgid="2649991093496110162">"Доступ до мікрофона"</string>
diff --git a/PermissionController/res/values-uz/strings.xml b/PermissionController/res/values-uz/strings.xml
index 5fdb432e6..f084beaaf 100644
--- a/PermissionController/res/values-uz/strings.xml
+++ b/PermissionController/res/values-uz/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"Bu ilova joylashuv axborotingizdan foydalana oladi. Oʻzgartirish uchun bosing."</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"Bildirishnomalaringizga ruxsati bor ilovani tekshiring"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> ilovasining bildirishnomalar ichidagi kontentni ochish va yopishga ruxsati bor"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Bu ilovaning bildirishnomalar ichidagi kontentni ochish va yopishga ruxsati bor Bu uning xatosiz ishlashi uchun kerak."</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"Bu ilovaning bildirishnomalar ichidagi kontentni ochishi va yopishiga ruxsat berilgan. Bu uning xatosiz ishlashi uchun zarur."</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"Ruxsatni olib tashlash"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"Boshqa variantlarni tanlash"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"Ruxsat olib tashlandi"</string>
@@ -518,7 +518,7 @@
     <string name="safety_center_rescan_button" msgid="4517514567809409596">"Qurilmani tekshirish"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Yopish"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"Bu ogohlantirish yopilsinmi?"</string>
-    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Himoyani oshirish uchun xavfsizlik va maxfiylik sozlamalarini istalgan vaqt tekshiring"</string>
+    <string name="safety_center_issue_card_dismiss_confirmation_message" msgid="3775418736671093563">"Himoyani kuchaytirish uchun xavfsizlik va maxfiylik sozlamalarini istalgan vaqt tekshiring"</string>
     <string name="safety_center_issue_card_confirm_dismiss_button" msgid="5884137843083634556">"Yopish"</string>
     <string name="safety_center_issue_card_cancel_dismiss_button" msgid="2874578798877712346">"Bekor qilish"</string>
     <string name="safety_center_entries_category_title" msgid="34356964062813115">"Sozlamalar"</string>
diff --git a/PermissionController/res/values-v33/dimens.xml b/PermissionController/res/values-v33/dimens.xml
index 5aea1d709..9bf2fd918 100644
--- a/PermissionController/res/values-v33/dimens.xml
+++ b/PermissionController/res/values-v33/dimens.xml
@@ -15,17 +15,32 @@
   -->
 
 <resources>
-    <dimen name="safety_center_card_margin">2dp</dimen>
-    <dimen name="safety_center_list_margin">16dp</dimen>
-    <dimen name="safety_center_action_button_list_margin">16dp</dimen>
-    <dimen name="safety_center_indicator_card_icon_margin">28dp</dimen>
-    <dimen name="safety_center_indicator_expand_button_background">24dp</dimen>
-    <dimen name="safety_center_top_action_button_margin">24dp</dimen>
-    <dimen name="safety_center_icon_button_touch_target_size">48dp</dimen>
-    <dimen name="safety_center_entry_padding_end">24dp</dimen>
-    <dimen name="safety_center_group_header_expanded_padding_top">24dp</dimen>
-    <dimen name="safety_center_group_header_expanded_padding_bottom">8dp</dimen>
-    <dimen name="safety_center_group_header_collapsed_padding_top">20dp</dimen>
-    <dimen name="safety_center_group_header_collapsed_padding_bottom">20dp</dimen>
-    <dimen name="safety_center_card_margin_bottom">24dp</dimen>
+
+    <dimen name="sc_spacing_xxxsmall">2dp</dimen>
+    <dimen name="sc_spacing_xxsmall">4dp</dimen>
+    <dimen name="sc_spacing_xsmall">8dp</dimen>
+    <dimen name="sc_spacing_small">12dp</dimen>
+    <dimen name="sc_spacing_medium">14dp</dimen>
+    <dimen name="sc_spacing_large">16dp</dimen>
+    <dimen name="sc_spacing_xlarge">18dp</dimen>
+    <dimen name="sc_spacing_xxlarge">20dp</dimen>
+    <dimen name="sc_spacing_xxxlarge">24dp</dimen>
+
+    <dimen name="sc_card_margin">@dimen/sc_spacing_xxxsmall</dimen>
+    <dimen name="sc_list_margin">@dimen/sc_spacing_large</dimen>
+    <dimen name="sc_action_button_list_margin">@dimen/sc_spacing_large</dimen>
+    <dimen name="sc_top_action_button_margin">@dimen/sc_spacing_xxxlarge</dimen>
+    <dimen name="sc_entry_padding_end">@dimen/sc_spacing_xxxlarge</dimen>
+    <dimen name="sc_entry_group_expanded_padding_top">@dimen/sc_spacing_xxxlarge</dimen>
+    <dimen name="sc_entry_group_expanded_padding_bottom">@dimen/sc_spacing_xsmall</dimen>
+    <dimen name="sc_entry_group_collapsed_padding_top">@dimen/sc_spacing_xxlarge</dimen>
+    <dimen name="sc_entry_group_collapsed_padding_bottom">@dimen/sc_spacing_xxlarge</dimen>
+    <dimen name="sc_card_margin_bottom">@dimen/sc_spacing_xxxlarge</dimen>
+
+    <dimen name="sc_icon_button_touch_target_size">48dp</dimen>
+    <dimen name="sc_indicator_expand_button_background">24dp</dimen>
+    <dimen name="sc_button_corner_radius">12dp</dimen>
+    <dimen name="sc_card_corner_radius_large">28dp</dimen>
+    <dimen name="sc_card_corner_radius_medium">20dp</dimen>
+    <dimen name="sc_card_corner_radius_xsmall">4dp</dimen>
 </resources>
\ No newline at end of file
diff --git a/PermissionController/res/values-v33/styles.xml b/PermissionController/res/values-v33/styles.xml
index 9a7bb81c9..bd487463a 100644
--- a/PermissionController/res/values-v33/styles.xml
+++ b/PermissionController/res/values-v33/styles.xml
@@ -36,25 +36,22 @@
         <item name="android:layout_width">24dp</item>
         <item name="android:layout_height">24dp</item>
         <item name="android:layout_gravity">start</item>
-        <item name="android:layout_marginBottom">24dp</item>
-        <item name="android:layout_marginStart">@dimen/safety_center_list_margin</item>
-        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:layout_marginBottom">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:layout_marginStart">@dimen/sc_list_margin</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxxlarge</item>
         <item name="android:tint">?android:attr/textColorPrimary</item>
     </style>
 
-    <style name="TextAppearance.SafetyCenter.Medium"
-           parent="@android:style/TextAppearance.DeviceDefault.Medium">
-        <item name="android:textAlignment">viewStart</item>
-    </style>
-
     <style name="SafetyCenterQsSectionTitle" >
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:textSize">16sp</item>
-        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxlarge</item>
         <item name="android:textColor">?attr/colorAccentPrimary</item>
-        <item name="android:paddingStart">@dimen/safety_center_list_margin</item>
-        <item name="android:paddingEnd">@dimen/safety_center_list_margin</item>
+        <item name="android:paddingStart">@dimen/sc_list_margin</item>
+        <item name="android:paddingEnd">@dimen/sc_list_margin</item>
+        <item name="android:textSize">16sp</item>
+        <item name="android:lineHeight">24sp</item>
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Medium</item>
     </style>
 
@@ -62,8 +59,8 @@
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:paddingStart">@dimen/safety_center_list_margin</item>
-        <item name="android:paddingEnd">@dimen/safety_center_list_margin</item>
+        <item name="android:paddingStart">@dimen/sc_list_margin</item>
+        <item name="android:paddingEnd">@dimen/sc_list_margin</item>
     </style>
 
     <style name="SafetyCenterQsPreferences">
@@ -76,21 +73,21 @@
         <item name="android:layout_height">fill_parent</item>
         <item name="android:gravity">center_horizontal</item>
         <item name="android:orientation">horizontal</item>
-        <item name="android:layout_marginStart">@dimen/safety_center_list_margin</item>
-        <item name="android:layout_marginEnd">@dimen/safety_center_list_margin</item>
-        <item name="android:paddingStart">@dimen/safety_center_list_margin</item>
-        <item name="android:paddingEnd">@dimen/safety_center_list_margin</item>
+        <item name="android:layout_marginStart">@dimen/sc_list_margin</item>
+        <item name="android:layout_marginEnd">@dimen/sc_list_margin</item>
+        <item name="android:paddingStart">@dimen/sc_list_margin</item>
+        <item name="android:paddingEnd">@dimen/sc_list_margin</item>
     </style>
 
     <style name="SafetyCenterQsToggleContainer.Top">
-        <item name="android:layout_marginTop">16dp</item>
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:paddingBottom">8dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_large</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_large</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_xsmall</item>
     </style>
 
     <style name="SafetyCenterQsToggleContainer.Bottom">
-        <item name="android:paddingBottom">16dp</item>
-        <item name="android:layout_marginBottom">16dp</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_large</item>
+        <item name="android:layout_marginBottom">@dimen/sc_spacing_large</item>
     </style>
 
     <style name="SafetyCenterQsToggleButton">
@@ -103,11 +100,11 @@
     </style>
 
     <style name="SafetyCenterQsToggleButton.Start">
-        <item name="android:layout_marginEnd">4dp</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_xxsmall</item>
     </style>
 
     <style name="SafetyCenterQsToggleButton.End">
-        <item name="android:layout_marginStart">4dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_xxsmall</item>
     </style>
 
     <style name="SafetyCenterQsToggleTextContainer">
@@ -129,9 +126,7 @@
         <item name="android:focusableInTouchMode">false</item>
         <item name="android:scrollHorizontally">true</item>
         <item name="android:singleLine">true</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:lineHeight">20sp</item>
-        <item name="android:layout_marginEnd">16dp</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_large</item>
         <item name="android:textAlignment">viewStart</item>
     </style>
 
@@ -150,13 +145,13 @@
         <item name="android:layout_height">20dp</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_gravity">end|center_vertical</item>
-        <item name="android:layout_marginEnd">12dp</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_small</item>
     </style>
 
     <style name="SafetyCenterQsToggleIcon">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_large</item>
         <item name="android:layout_marginEnd">10dp</item>
         <item name="android:layout_gravity">start|center_vertical</item>
         <item name="android:adjustViewBounds">true</item>
@@ -168,10 +163,10 @@
     <style name="SafetyCenterIndicatorCardView">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="app:cardCornerRadius">24dp</item>
+        <item name="app:cardCornerRadius">@dimen/sc_card_corner_radius_large</item>
         <item name="app:cardElevation">0dp</item>
         <item name="app:cardBackgroundColor">?attr/colorSurface</item>
-        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_large</item>
         <item name="android:clickable">true</item>
         <item name="android:foreground">?android:attr/selectableItemBackground</item>
     </style>
@@ -179,30 +174,25 @@
     <style name="SafetyCenterIndicatorImageView">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">24dp</item>
-        <item name="android:layout_marginTop">28dp</item>
-        <item name="android:layout_marginBottom">28dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_xxxlarge</item>
         <item name="android:layout_centerVertical">true</item>
         <item name="android:clickable">false</item>
     </style>
 
     <style name="SafetyCenterIndicatorTitleText">
         <item name="android:layout_width">0dp</item>
-        <item name="android:layout_marginStart">16dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_large</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">23dp</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:lineHeight">20sp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Medium</item>
     </style>
 
     <style name="SafetyCenterIndicatorLabelText">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginTop">2dp</item>
-        <item name="android:layout_marginBottom">23dp</item>
-        <item name="android:textSize">14sp</item>
-        <item name="android:lineHeight">20sp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxxsmall</item>
+        <item name="android:layout_marginBottom">@dimen/sc_spacing_xxxlarge</item>
         <item name="android:textAlignment">viewStart</item>
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Body</item>
     </style>
@@ -210,19 +200,16 @@
     <style name="SafetyCenterIndicatorExpandView">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginEnd">24dp</item>
-        <item name="android:layout_marginTop">32dp</item>
-        <item name="android:layout_marginBottom">32dp</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_xxxlarge</item>
     </style>
 
     <style name="SafetyCenterIndicatorActionButton"
            parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">24dp</item>
-        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_xxxlarge</item>
         <item name="android:textColor">?android:attr/textColorPrimary</item>
-        <item name="android:textSize">14sp</item>
         <item name="android:paddingTop">18dp</item>
         <item name="android:paddingBottom">18dp</item>
         <item name="android:paddingStart">24dp</item>
@@ -239,8 +226,8 @@
 
     <style name="SafetyCenterIndicatorSecondaryActionButton"
            parent="@style/SafetyCenterIndicatorActionButton">
-        <item name="android:layout_marginBottom">24dp</item>
-        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:layout_marginBottom">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_large</item>
     </style>
 
     <style name="SafetyCenterIndicatorForeground">
@@ -275,56 +262,53 @@
         <item name="android:textColor">?android:attr/textColorSecondary</item>
     </style>
 
-    <style name="TextAppearance.SafetyCenter.ActionButton"
+    <style name="TextAppearance.SafetyCenter.Medium"
         parent="@android:style/TextAppearance.DeviceDefault.Medium">
-        <item name="android:capitalize">sentences</item>
         <item name="android:textSize">14sp</item>
         <item name="android:lineHeight">20sp</item>
     </style>
 
+    <style name="TextAppearance.SafetyCenter.ActionButton"
+        parent="TextAppearance.SafetyCenter.Medium">
+        <item name="android:capitalize">sentences</item>
+    </style>
+
     <style name="TextAppearance.SafetyCenter.ActionButton.Secondary">
         <item name="android:textColor">?attr/textColorScSecondaryActionButton</item>
     </style>
 
     <style name="SafetyCenterCard"
         parent="android:Widget.DeviceDefault">
-        <item name="android:paddingStart">24dp</item>
-        <item name="android:paddingEnd">24dp</item>
-        <item name="android:paddingTop">24dp</item>
-        <item name="android:paddingBottom">@dimen/safety_center_card_margin_bottom</item>
-        <item name="android:layout_marginStart">16dp</item>
-        <item name="android:layout_marginEnd">16dp</item>
-        <item name="android:layout_marginTop">8dp</item>
-        <item name="android:layout_marginBottom">8dp</item>
+        <item name="android:paddingStart">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingEnd">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingBottom">@dimen/sc_card_margin_bottom</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_large</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_large</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xsmall</item>
+        <item name="android:layout_marginBottom">@dimen/sc_spacing_xsmall</item>
         <item name="android:background">@drawable/safety_center_card_background</item>
     </style>
 
-    <style name="SafetyCenter.ActionButton"
-        parent="android:Widget.DeviceDefault.Button.Colored">
-        <item name="android:background">@drawable/safety_center_issue_action_button</item>
-        <item name="android:height">56dp</item>
-        <item name="android:textColor">?attr/textColorScActionButton</item>
-    </style>
-
-    <style name="SafetyCenter.MaterialActionButton"
+    <style name="SafetyCenterActionButton"
            parent="@style/Widget.MaterialComponents.Button.UnelevatedButton">
         <item name="android:theme">@style/Theme.MaterialComponents</item>
         <item name="android:minHeight">56dp</item>
-        <item name="android:paddingStart">24dp</item>
-        <item name="android:paddingEnd">24dp</item>
-        <item name="android:paddingTop">18dp</item>
-        <item name="android:paddingBottom">18dp</item>
+        <item name="android:paddingStart">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingEnd">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_xlarge</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_xlarge</item>
         <item name="android:insetTop">0dp</item>
         <item name="android:insetBottom">0dp</item>
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.ActionButton</item>
         <item name="android:textColor">?attr/textColorScActionButton</item>
         <item name="android:maxLines">3</item>
         <item name="android:ellipsize">end</item>
-        <item name="cornerRadius">12dp</item>
+        <item name="cornerRadius">@dimen/sc_button_corner_radius</item>
         <item name="rippleColor">?android:colorControlHighlight</item>
     </style>
 
-    <style name="SafetyCenter.MaterialActionButton.Secondary"
+    <style name="SafetyCenterActionButton.Secondary"
            parent="@style/Widget.MaterialComponents.Button.OutlinedButton">
         <item name="android:theme">@style/Theme.MaterialComponents</item>
         <item name="android:height">56dp</item>
@@ -334,7 +318,7 @@
             @style/TextAppearance.SafetyCenter.ActionButton.Secondary
         </item>
         <item name="android:textColor">?attr/textColorScSecondaryActionButton</item>
-        <item name="cornerRadius">12dp</item>
+        <item name="cornerRadius">@dimen/sc_button_corner_radius</item>
         <item name="rippleColor">?android:colorControlHighlight</item>
     </style>
 
@@ -358,21 +342,14 @@
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:layout_marginTop">4dp</item>
-        <item name="android:layout_marginStart">16dp</item>
-        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxsmall</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_large</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_xxxlarge</item>
         <item name="app:layout_constraintStart_toEndOf">@id/status_image</item>
         <item name="app:layout_constraintEnd_toEndOf">parent</item>
         <item name="app:layout_constraintTop_toTopOf">parent</item>
     </style>
 
-    <style name="TextAppearance.SafetyStatusTitle"
-        parent="@android:style/TextAppearance.DeviceDefault.Headline">
-        <item name="android:textSize">22sp</item>
-        <item name="android:lineHeight">28sp</item>
-        <item name="android:textColor">?android:attr/textColorPrimary</item>
-    </style>
-
     <style name="SafetyCenterStatusTitle" parent="android:Widget.DeviceDefault">
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -386,14 +363,14 @@
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Body</item>
     </style>
 
-    <style name="SafetyCenterStatusButton" parent="SafetyCenter.MaterialActionButton" />
+    <style name="SafetyCenterStatusButton" parent="SafetyCenterActionButton" />
 
     <style name="SafetyCenterStatusButton.ReviewSettings">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="app:layout_constraintTop_toBottomOf">@id/status_title_and_summary</item>
         <item name="app:layout_constraintStart_toStartOf">parent</item>
-        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxxlarge</item>
         <item name="app:backgroundTint">@color/safety_center_button_info</item>
     </style>
 
@@ -402,7 +379,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="app:layout_constraintTop_toBottomOf">@id/review_settings_button</item>
         <item name="app:layout_constraintStart_toStartOf">parent</item>
-        <item name="android:layout_marginTop">24dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxxlarge</item>
         <item name="app:backgroundTint">@color/safety_center_button_info</item>
     </style>
 
@@ -411,7 +388,7 @@
         <item name="android:layout_height">wrap_content</item>
         <item name="app:layout_constraintTop_toBottomOf">@id/review_settings_button</item>
         <item name="app:layout_constraintStart_toStartOf">parent</item>
-        <item name="android:layout_marginTop">@dimen/safety_center_action_button_list_margin</item>
+        <item name="android:layout_marginTop">@dimen/sc_action_button_list_margin</item>
         <item name="app:backgroundTint">@color/sc_surface_dark</item>
         <item name="app:strokeWidth">@dimen/mtrl_btn_stroke_size</item>
         <item name="app:strokeColor">@color/safety_center_button_info</item>
@@ -425,8 +402,8 @@
         <item name="app:layout_constraintStart_toStartOf">parent</item>
         <item name="app:layout_constraintEnd_toEndOf">parent</item>
         <item name="android:layout_gravity">center</item>
-        <item name="android:paddingTop">20dp</item>
-        <item name="android:paddingBottom">20dp</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_xxlarge</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_xxlarge</item>
     </style>
     <!-- END SAFETY STATUS CARD -->
 
@@ -449,7 +426,7 @@
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Headline.Issue</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginEnd">24dp</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_xxxlarge</item>
         <item name="app:layout_constraintHorizontal_bias">0</item>
         <item name="app:layout_goneMarginEnd">0dp</item>
         <item name="app:layout_constraintTop_toTopOf">parent</item>
@@ -459,7 +436,7 @@
 
     <style name="SafetyCenterIssueSubtitle">
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Body</item>
-        <item name="android:layout_marginTop">4dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxsmall</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="app:layout_constraintStart_toStartOf">@id/issue_card_title</item>
@@ -468,7 +445,7 @@
 
     <style name="SafetyCenterIssueSummary">
         <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Body</item>
-        <item name="android:layout_marginTop">16dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_large</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="app:layout_constraintStart_toStartOf">@id/issue_card_title</item>
@@ -477,7 +454,7 @@
 
     <style name="SafetyCenterIssueActionButtonList"
         parent="android:Widget.DeviceDefault">
-        <item name="android:layout_marginTop">20dp</item>
+        <item name="android:layout_marginTop">@dimen/sc_spacing_xxlarge</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:orientation">vertical</item>
@@ -493,8 +470,8 @@
         <item name="app:layout_constraintTop_toBottomOf">@id/issue_card_action_button_list</item>
         <item name="app:layout_constraintStart_toStartOf">parent</item>
         <item name="app:layout_constraintEnd_toEndOf">parent</item>
-        <item name="android:paddingTop">20dp</item>
-        <item name="android:paddingBottom">20dp</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_xxlarge</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_xxlarge</item>
     </style>
 
     <style name="SafetyCenterIssueCardResolvedImage" parent="android:Widget.DeviceDefault">
@@ -514,13 +491,12 @@
         <item name="app:layout_constraintVertical_chainStyle">packed</item>
     </style>
 
-    <style name="SafetyCenterIssueCardResolvedTitle"
-           parent="@android:style/TextAppearance.DeviceDefault.Medium">
-<!--     TODO extract this   -->
+    <style name="SafetyCenterIssueCardResolvedTitle">
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:textSize">16sp</item>
         <item name="android:lineHeight">24sp</item>
-        <item name="android:paddingTop">16dp</item>
+        <item name="android:textAppearance">@style/TextAppearance.SafetyCenter.Medium</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_large</item>
         <item name="android:gravity">center</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">wrap_content</item>
@@ -532,8 +508,8 @@
 
     <style name="SafetyCenterMoreIssues"
            parent="SafetyCenterCard.Issue">
-        <item name="android:paddingTop">14dp</item>
-        <item name="android:paddingBottom">14dp</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_medium</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_medium</item>
         <item name="android:background">@drawable/safety_center_more_issues_card_background</item>
     </style>
 
@@ -542,8 +518,8 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">0dp</item>
-        <item name="android:layout_marginStart">20dp</item>
-        <item name="android:layout_marginEnd">20dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_xxlarge</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_xxlarge</item>
         <item name="android:maxLines">2</item>
         <item name="android:ellipsize">end</item>
         <item name="app:layout_constraintTop_toTopOf">parent</item>
@@ -579,8 +555,8 @@
         <item name="android:layout_height">28dp</item>
         <item name="android:layout_width">wrap_content</item>
         <item name="android:orientation">vertical</item>
-        <item name="android:paddingStart">8dp</item>
-        <item name="android:paddingEnd">8dp</item>
+        <item name="android:paddingStart">@dimen/sc_spacing_xsmall</item>
+        <item name="android:paddingEnd">@dimen/sc_spacing_xsmall</item>
         <item name="android:background">@drawable/safety_center_card_widget_background</item>
     </style>
 
@@ -589,7 +565,7 @@
         <item name="android:textColor">?android:attr/textColorPrimary</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_width">wrap_content</item>
-        <item name="android:layout_marginEnd">2dp</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_xxxsmall</item>
         <item name="android:maxLines">1</item>
         <item name="app:layout_constraintTop_toTopOf">parent</item>
         <item name="app:layout_constraintBottom_toBottomOf">parent</item>
@@ -613,11 +589,11 @@
            parent="android:Widget.DeviceDefault">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">16dp</item>
-        <item name="android:layout_marginEnd">16dp</item>
-        <item name="android:paddingEnd">@dimen/safety_center_entry_padding_end</item>
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:paddingBottom">16dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_large</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_large</item>
+        <item name="android:paddingEnd">@dimen/sc_entry_padding_end</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_large</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_large</item>
         <item name="android:baselineAligned">false</item>
         <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
         <item name="android:gravity">center_vertical</item>
@@ -641,10 +617,10 @@
 
     <style name="SafetyCenterEntryIconFrame"
            parent="android:Widget.DeviceDefault">
-        <item name="android:layout_width">64dp</item>
+        <item name="android:layout_width">wrap_content</item>
         <item name="android:layout_height">match_parent</item>
-        <item name="android:paddingStart">24dp</item>
-        <item name="android:paddingEnd">20dp</item>
+        <item name="android:paddingStart">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingEnd">@dimen/sc_spacing_xxlarge</item>
     </style>
 
     <style name="SafetyCenterEntryIcon"
@@ -656,7 +632,7 @@
 
     <style name="SafetyCenterEntryEmptySpace"
            parent="android:Widget.DeviceDefault">
-        <item name="android:layout_width">24dp</item>
+        <item name="android:layout_width">@dimen/sc_spacing_xxxlarge</item>
         <item name="android:layout_height">match_parent</item>
     </style>
 
@@ -691,8 +667,8 @@
         <item name="android:layout_width">68dp</item>
         <item name="android:layout_height">match_parent</item>
         <item name="android:layout_gravity">center</item>
-        <item name="android:paddingStart">20dp</item>
-        <item name="android:paddingEnd">@dimen/safety_center_entry_padding_end</item>
+        <item name="android:paddingStart">@dimen/sc_spacing_xxlarge</item>
+        <item name="android:paddingEnd">@dimen/sc_entry_padding_end</item>
         <item name="android:background">@drawable/safety_entry_icon_action_background</item>
     </style>
 
@@ -700,8 +676,8 @@
         parent="android:Widget.DeviceDefault">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:layout_marginStart">16dp</item>
-        <item name="android:layout_marginEnd">16dp</item>
+        <item name="android:layout_marginStart">@dimen/sc_spacing_large</item>
+        <item name="android:layout_marginEnd">@dimen/sc_spacing_large</item>
         <item name="android:baselineAligned">false</item>
         <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
         <item name="android:gravity">center_vertical</item>
@@ -710,7 +686,7 @@
 
     <style name="SafetyCenterGroupHeader"
            parent="android:Widget.DeviceDefault">
-        <item name="android:paddingEnd">24dp</item>
+        <item name="android:paddingEnd">@dimen/sc_spacing_xxxlarge</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:baselineAligned">false</item>
@@ -729,7 +705,7 @@
 
     <style name="SafetyCenterExpandedGroupHeader"
         parent="android:Widget.DeviceDefault">
-        <item name="android:paddingStart">24dp</item>
+        <item name="android:paddingStart">@dimen/sc_spacing_xxxlarge</item>
         <item name="android:layout_width">0dp</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:layout_weight">1</item>
@@ -749,7 +725,7 @@
 
     <style name="SafetyCenterGroupEntries"
         parent="android:Widget.DeviceDefault">
-        <item name="android:paddingBottom">14dp</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_medium</item>
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
         <item name="android:orientation">vertical</item>
@@ -779,9 +755,9 @@
         parent="android:Widget.DeviceDefault">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingEnd">@dimen/safety_center_entry_padding_end</item>
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:paddingBottom">16dp</item>
+        <item name="android:paddingEnd">@dimen/sc_entry_padding_end</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_large</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_large</item>
         <item name="android:baselineAligned">false</item>
         <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
         <item name="android:gravity">center_vertical</item>
@@ -792,10 +768,10 @@
         parent="android:Widget.DeviceDefault">
         <item name="android:layout_width">match_parent</item>
         <item name="android:layout_height">wrap_content</item>
-        <item name="android:paddingStart">24dp</item>
-        <item name="android:paddingEnd">24dp</item>
-        <item name="android:paddingTop">16dp</item>
-        <item name="android:paddingBottom">16dp</item>
+        <item name="android:paddingStart">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingEnd">@dimen/sc_spacing_xxxlarge</item>
+        <item name="android:paddingTop">@dimen/sc_spacing_large</item>
+        <item name="android:paddingBottom">@dimen/sc_spacing_large</item>
         <item name="android:minHeight">?android:attr/listPreferredItemHeight</item>
         <item name="android:gravity">center_vertical</item>
         <item name="android:orientation">vertical</item>
diff --git a/PermissionController/res/values-v33/themes.xml b/PermissionController/res/values-v33/themes.xml
index 96eb49afe..eae3bdd54 100644
--- a/PermissionController/res/values-v33/themes.xml
+++ b/PermissionController/res/values-v33/themes.xml
@@ -41,8 +41,9 @@
         <item name="colorScIconNull">@color/gm_grey_600</item>
 
         <!-- Buttons -->
-        <item name="scActionButtonStyle">@style/SafetyCenter.MaterialActionButton</item>
-        <item name="scSecondaryActionButtonStyle">@style/SafetyCenter.MaterialActionButton.Secondary</item>
+        <!-- TODO: make the action button theme a theme value -->
+        <item name="scActionButtonStyle">@style/SafetyCenterActionButton</item>
+        <item name="scSecondaryActionButtonStyle">@style/SafetyCenterActionButton.Secondary</item>
 
         <item name="colorScShieldAccent">@color/sc_shield_accent</item>
     </style>
@@ -69,8 +70,8 @@
         <item name="colorScIconNull">@color/gm_grey_600</item>
 
         <!-- Buttons -->
-        <item name="scActionButtonStyle">@style/SafetyCenter.MaterialActionButton</item>
-        <item name="scSecondaryActionButtonStyle">@style/SafetyCenter.MaterialActionButton.Secondary</item>
+        <item name="scActionButtonStyle">@style/SafetyCenterActionButton</item>
+        <item name="scSecondaryActionButtonStyle">@style/SafetyCenterActionButton.Secondary</item>
 
         <item name="colorScShieldAccent">@color/sc_shield_accent</item>
     </style>
diff --git a/PermissionController/res/values-vi-v33/strings.xml b/PermissionController/res/values-vi-v33/strings.xml
index de296799d..00648cdbc 100644
--- a/PermissionController/res/values-vi-v33/strings.xml
+++ b/PermissionController/res/values-vi-v33/strings.xml
@@ -32,7 +32,7 @@
     <string name="safety_center_issue_card_content_description" msgid="1281390769721765363">"Cảnh báo. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%2$s</xliff:g>"</string>
     <string name="safety_center_issue_card_content_description_with_subtitle" msgid="5504040663935313539">"Cảnh báo. <xliff:g id="ISSUE_CARD_TITLE">%1$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUBTITLE">%2$s</xliff:g>. <xliff:g id="ISSUE_CARD_SUMMARY">%3$s</xliff:g>"</string>
     <string name="safety_center_resolved_issue_fallback" msgid="8548932070610766651">"Hoàn tất hành động"</string>
-    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Kiểm tra các cài đặt tăng cường bảo vệ cho thiết bị của bạn"</string>
+    <string name="safety_center_qs_status_summary" msgid="5193925895830451177">"Kiểm tra các chế độ cài đặt có thể giúp tăng cường bảo vệ cho thiết bị của bạn"</string>
     <string name="safety_center_qs_page_landing" msgid="1717368301679228128">"Các tùy chọn cài đặt nhanh về bảo mật và quyền riêng tư"</string>
     <string name="safety_center_qs_close_button" msgid="1352313308176244599">"Đóng"</string>
     <string name="safety_center_qs_expand_action" msgid="2193190557696484169">"Mở rộng và hiển thị các tùy chọn"</string>
diff --git a/PermissionController/res/values-vi/strings.xml b/PermissionController/res/values-vi/strings.xml
index ffa8d0306..ab0340562 100644
--- a/PermissionController/res/values-vi/strings.xml
+++ b/PermissionController/res/values-vi/strings.xml
@@ -514,7 +514,7 @@
     <string name="blocked_sensor_summary" msgid="4443707628305027375">"Đối với các ứng dụng và dịch vụ"</string>
     <string name="blocked_mic_summary" msgid="8960466941528458347">"Dữ liệu thu được qua micrô vẫn có thể được chia sẻ khi bạn gọi đến số khẩn cấp."</string>
     <string name="blocked_sensor_button_label" msgid="6742092634984289658">"Thay đổi"</string>
-    <string name="safety_center_dashboard_page_title" msgid="2810774008694315854">"Tính bảo mật &amp; quyền riêng tư"</string>
+    <string name="safety_center_dashboard_page_title" msgid="2810774008694315854">"Bảo mật và quyền riêng tư"</string>
     <string name="safety_center_rescan_button" msgid="4517514567809409596">"Quét thiết bị"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"Đóng"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"Đóng cảnh báo này?"</string>
@@ -525,7 +525,7 @@
     <string name="safety_status_preference_title_and_summary_content_description" msgid="3511373256505058464">"Trạng thái bảo mật và quyền riêng tư. <xliff:g id="OVERALL_SAFETY_STATUS">%1$s</xliff:g>. <xliff:g id="SUMMARY_OF_DEVICE_STATUS">%2$s</xliff:g>"</string>
     <string name="security_settings" msgid="3808106921175271317">"Cài đặt bảo mật"</string>
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"Quyền truy cập"</string>
-    <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Tính bảo mật &amp; quyền riêng tư"</string>
+    <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"Bảo mật và quyền riêng tư"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"Kiểm tra trạng thái"</string>
     <string name="privacy_controls_qs" msgid="5780144882040591169">"Các chế độ kiểm soát quyền riêng tư"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"Tùy chọn cài đặt khác"</string>
diff --git a/PermissionController/res/values-zh-rCN-v33/strings.xml b/PermissionController/res/values-zh-rCN-v33/strings.xml
index 63a2efb82..7d01f05f1 100644
--- a/PermissionController/res/values-zh-rCN-v33/strings.xml
+++ b/PermissionController/res/values-zh-rCN-v33/strings.xml
@@ -40,7 +40,7 @@
     <string name="safety_center_qs_privacy_control" msgid="1160682635058529673">"开关。<xliff:g id="PRIVACY_CONTROL_TITLE">%1$s</xliff:g>。<xliff:g id="PRIVACY_CONTROL_STATUS">%2$s</xliff:g>"</string>
     <string name="safety_center_qs_toggle_action" msgid="5920465736488119255">"切换"</string>
     <string name="safety_center_qs_open_action" msgid="2760200829912423728">"打开"</string>
-    <string name="safety_center_review_settings_button" msgid="938981137942443930">"查看设置"</string>
+    <string name="safety_center_review_settings_button" msgid="938981137942443930">"检查设置"</string>
     <string name="safety_center_gear_label" msgid="5175877094379694098">"设置"</string>
     <string name="safety_center_info_label" msgid="8993181584061825412">"信息"</string>
 </resources>
diff --git a/PermissionController/res/values-zh-rCN/strings.xml b/PermissionController/res/values-zh-rCN/strings.xml
index 3db33f7a2..d61473ebc 100644
--- a/PermissionController/res/values-zh-rCN/strings.xml
+++ b/PermissionController/res/values-zh-rCN/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"此应用随时可以使用您的位置信息。点按即可更改。"</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"查看具有通知访问权限的应用"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g>可以不显示您通知中的内容，也可以处理和访问它们"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"此应用可以不显示您通知中的内容，也可以处理和访问它们部分应用需要此类权限才能正常运行。"</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"此应用可以不显示您通知中的内容，也可以处理和访问它们。有些应用需要此类权限才能正常运行。"</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"撤消访问权限"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"查看更多选项"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"已撤消访问权限"</string>
@@ -514,7 +514,7 @@
     <string name="blocked_sensor_summary" msgid="4443707628305027375">"针对应用和服务"</string>
     <string name="blocked_mic_summary" msgid="8960466941528458347">"当您拨打紧急电话号码时，系统可能仍会分享麦克风数据。"</string>
     <string name="blocked_sensor_button_label" msgid="6742092634984289658">"更改"</string>
-    <string name="safety_center_dashboard_page_title" msgid="2810774008694315854">"安全性和隐私权"</string>
+    <string name="safety_center_dashboard_page_title" msgid="2810774008694315854">"安全和隐私"</string>
     <string name="safety_center_rescan_button" msgid="4517514567809409596">"扫描设备"</string>
     <string name="safety_center_issue_card_dismiss_button" msgid="5113965506144222402">"关闭"</string>
     <string name="safety_center_issue_card_dismiss_confirmation_title" msgid="2734809473425036382">"要忽略此提醒吗？"</string>
@@ -525,7 +525,7 @@
     <string name="safety_status_preference_title_and_summary_content_description" msgid="3511373256505058464">"安全和隐私状态。<xliff:g id="OVERALL_SAFETY_STATUS">%1$s</xliff:g>。<xliff:g id="SUMMARY_OF_DEVICE_STATUS">%2$s</xliff:g>"</string>
     <string name="security_settings" msgid="3808106921175271317">"安全设置"</string>
     <string name="sensor_permissions_qs" msgid="1022267900031317472">"权限"</string>
-    <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"安全性和隐私权"</string>
+    <string name="safety_privacy_qs_tile_title" msgid="727301867710374052">"安全和隐私"</string>
     <string name="safety_privacy_qs_tile_subtitle" msgid="3621544532041936749">"查看状态"</string>
     <string name="privacy_controls_qs" msgid="5780144882040591169">"您的隐私控制项"</string>
     <string name="security_settings_button_label_qs" msgid="8280343822465962330">"更多设置"</string>
diff --git a/PermissionController/res/values-zh-rHK/strings.xml b/PermissionController/res/values-zh-rHK/strings.xml
index 888d7dbc3..c353200a7 100644
--- a/PermissionController/res/values-zh-rHK/strings.xml
+++ b/PermissionController/res/values-zh-rHK/strings.xml
@@ -283,7 +283,7 @@
     <string name="background_location_access_reminder_notification_content" msgid="7787084707336546245">"此應用程式可隨時存取您的位置資訊。輕按即可變更權限。"</string>
     <string name="notification_listener_reminder_notification_title" msgid="3747210460187479091">"查看擁有通知存取權的應用程式"</string>
     <string name="notification_listener_reminder_notification_content" msgid="831476101108863427">"<xliff:g id="APP_NAME">%s</xliff:g> 可關閉通知內容、對內容採取動作以及存取內容"</string>
-    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"此應用程式可關閉通知內容、對內容採取動作以及存取內容。部分應用程式需要此存取權才能發揮功用。"</string>
+    <string name="notification_listener_warning_card_content" msgid="7840973324284115893">"此應用程式可讓您關閉/存取通知中的內容或執行操作。有些應用程式需要此權限才能正常運作。"</string>
     <string name="notification_listener_remove_access_button_label" msgid="7101898782417817097">"移除存取權"</string>
     <string name="notification_listener_review_app_button_label" msgid="3433073281029143924">"查看更多選項"</string>
     <string name="notification_listener_remove_access_success_label" msgid="2477611529875633107">"已移除存取權"</string>
diff --git a/PermissionController/res/values-zh-rTW/strings.xml b/PermissionController/res/values-zh-rTW/strings.xml
index d7db74ee2..726cb5973 100644
--- a/PermissionController/res/values-zh-rTW/strings.xml
+++ b/PermissionController/res/values-zh-rTW/strings.xml
@@ -264,9 +264,9 @@
     <string name="auto_revoke_permission_notification_content" msgid="5125990886047799375">"某些應用程式已有數個月未使用。輕觸即可查看。"</string>
     <string name="unused_apps_notification_title" msgid="4314832015894238019">"{count,plural, =1{# 個未使用的應用程式}other{# 個未使用的應用程式}}"</string>
     <string name="unused_apps_notification_content" msgid="9195026773244581246">"系統已移除權限和暫存檔案，同時也停止通知。輕觸即可查看。"</string>
-    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"檢查系統已移除哪些應用程式的權限"</string>
+    <string name="unused_apps_safety_center_card_title" msgid="5638409355530099149">"查看系統已移除哪些應用程式的權限"</string>
     <string name="unused_apps_safety_center_card_content" msgid="1088557243627427820">"如果應用程式已經一陣子沒有使用，系統會移除權限和暫存檔，並停止顯示通知。"</string>
-    <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"檢查應用程式"</string>
+    <string name="unused_apps_safety_center_action_title" msgid="8865914432518993194">"查看應用程式"</string>
     <string name="post_drive_permission_decision_reminder_title" msgid="1290697371418139976">"查看最近授予的權限"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_1_permission" msgid="670521503734140711">"你已在開車時將<xliff:g id="PERMISSION">%2$s</xliff:g>的存取權授予「<xliff:g id="APP">%1$s</xliff:g>」"</string>
     <string name="post_drive_permission_decision_reminder_summary_1_app_2_permissions" msgid="671791184670801301">"你已在開車時將<xliff:g id="PERMISSION_1">%2$s</xliff:g>和<xliff:g id="PERMISSION_2">%3$s</xliff:g>的存取權授予「<xliff:g id="APP">%1$s</xliff:g>」"</string>
diff --git a/PermissionController/res/values/overlayable.xml b/PermissionController/res/values/overlayable.xml
index 20f40772d..c448d88cf 100644
--- a/PermissionController/res/values/overlayable.xml
+++ b/PermissionController/res/values/overlayable.xml
@@ -305,4 +305,205 @@
 
     </overlayable>
 
+    <overlayable name="SafetyCenterStyles">
+        <policy type="product|system|vendor|odm|oem">
+            <item type="style" name="Theme.SafetyCenterQs" />
+            <item type="style" name="Theme.SafetyCenter" />
+
+            <item type="dimen" name="sc_spacing_xxxsmall" />
+            <item type="dimen" name="sc_spacing_xxsmall" />
+            <item type="dimen" name="sc_spacing_xsmall" />
+            <item type="dimen" name="sc_spacing_small" />
+            <item type="dimen" name="sc_spacing_medium" />
+            <item type="dimen" name="sc_spacing_large" />
+            <item type="dimen" name="sc_spacing_xlarge" />
+            <item type="dimen" name="sc_spacing_xxlarge" />
+            <item type="dimen" name="sc_spacing_xxxlarge" />
+            <item type="dimen" name="sc_card_margin" />
+            <item type="dimen" name="sc_list_margin" />
+            <item type="dimen" name="sc_action_button_list_margin" />
+            <item type="dimen" name="sc_top_action_button_margin" />
+            <item type="dimen" name="sc_entry_padding_end" />
+            <item type="dimen" name="sc_entry_group_expanded_padding_top" />
+            <item type="dimen" name="sc_entry_group_expanded_padding_bottom" />
+            <item type="dimen" name="sc_entry_group_collapsed_padding_top" />
+            <item type="dimen" name="sc_entry_group_collapsed_padding_bottom" />
+            <item type="dimen" name="sc_card_margin_bottom" />
+            <item type="dimen" name="sc_icon_button_touch_target_size" />
+            <item type="dimen" name="sc_indicator_expand_button_background" />
+
+            <item type="color" name="safety_center_button_info" />
+            <item type="color" name="safety_center_button_recommend" />
+            <item type="color" name="safety_center_button_warn" />
+            <item type="color" name="safety_center_outline_button_info" />
+            <item type="color" name="safety_center_outline_button_recommend" />
+            <item type="color" name="safety_center_outline_button_warn" />
+            <item type="color" name="sc_surface_light" />
+            <item type="color" name="sc_surface_dark" />
+            <item type="color" name="sc_surface_variant_light" />
+            <item type="color" name="sc_surface_variant_dark" />
+            <item type="color" name="sc_accent_primary_light" />
+            <item type="color" name="sc_accent_primary_dark" />
+            <item type="color" name="sc_shield_accent" />
+            <item type="color" name="safety_center_info" />
+            <item type="color" name="safety_center_recommend" />
+            <item type="color" name="safety_center_warn" />
+
+            <item type="drawable" name="ic_check" />
+            <item type="drawable" name="ic_chevron_right" />
+            <item type="drawable" name="ic_expand_less" />
+            <item type="drawable" name="ic_expand_more" />
+            <item type="drawable" name="ic_privacy" />
+            <item type="drawable" name="ic_safety_center_shield" />
+            <item type="drawable" name="ic_safety_empty" /> <!-- rename -->
+            <item type="drawable" name="ic_safety_group_collapse" />
+            <item type="drawable" name="ic_safety_group_expand" />
+            <item type="drawable" name="ic_safety_info" />
+            <item type="drawable" name="ic_safety_issue_dismiss" />
+            <item type="drawable" name="ic_safety_null_state" />
+            <item type="drawable" name="ic_safety_recommendation" />
+            <item type="drawable" name="ic_safety_warn" />
+            <item type="drawable" name="ic_settings_gear" />
+            <item type="drawable" name="ic_settings_info" />
+            <item type="drawable" name="indicator_background_circle" />
+            <item type="drawable" name="safety_center_card_background" />
+            <item type="drawable" name="safety_center_card_widget_background" />
+            <item type="drawable" name="safety_center_group_collapse_anim" />
+            <item type="drawable" name="safety_center_group_expand_anim" />
+            <item type="drawable" name="safety_center_issue_resolved_avd" />
+            <item type="drawable" name="safety_center_more_issues_card_background" />
+            <item type="drawable" name="safety_entity_top_flat_bottom_flat_background" />
+            <item type="drawable" name="safety_entity_top_flat_bottom_large_background" />
+            <item type="drawable" name="safety_entity_top_flat_bottom_small_background" />
+            <item type="drawable" name="safety_entity_top_large_bottom_flat_background" />
+            <item type="drawable" name="safety_entity_top_large_bottom_large_background" />
+            <item type="drawable" name="safety_entity_top_large_bottom_small_background" />
+            <item type="drawable" name="safety_entity_top_small_bottom_flat_background" />
+            <item type="drawable" name="safety_entity_top_small_bottom_large_background" />
+            <item type="drawable" name="safety_entity_top_small_bottom_small_background" />
+            <item type="drawable" name="safety_entry_icon_action_background" />
+            <item type="drawable" name="safety_group_entry_background" />
+            <item type="drawable" name="safety_status_info" />
+            <item type="drawable" name="safety_status_info_to_info_anim" />
+            <item type="drawable" name="safety_status_recommend_to_info_anim" />
+            <item type="drawable" name="safety_status_recommendation" />
+            <item type="drawable" name="safety_status_small_info_to_info_anim" />
+            <item type="drawable" name="safety_status_small_info_to_recommendation_anim" />
+            <item type="drawable" name="safety_status_small_info_to_warn_anim" />
+            <item type="drawable" name="safety_status_small_recommendation_to_info_anim" />
+            <item type="drawable" name="safety_status_small_recommendation_to_recommendation_anim" />
+            <item type="drawable" name="safety_status_small_recommendation_to_warn_anim" />
+            <item type="drawable" name="safety_status_small_warn_to_info_anim" />
+            <item type="drawable" name="safety_status_small_warn_to_recommendation_anim" />
+            <item type="drawable" name="safety_status_small_warn_to_warn_anim" />
+            <item type="drawable" name="safety_status_warn" />
+            <item type="drawable" name="safety_status_warn_to_info_anim" />
+            <item type="drawable" name="safety_status_warn_to_recommend_anim" />
+            <item type="drawable" name="status_info_to_scanning_anim" />
+            <item type="drawable" name="status_recommend_to_scanning_anim" />
+            <item type="drawable" name="status_scanning_anim_info" />
+            <item type="drawable" name="status_scanning_anim_recommend" />
+            <item type="drawable" name="status_scanning_anim_warn" />
+            <item type="drawable" name="status_scanning_end_anim_info_to_info" />
+            <item type="drawable" name="status_scanning_end_anim_info_to_recommend" />
+            <item type="drawable" name="status_scanning_end_anim_info_to_warn" />
+            <item type="drawable" name="status_scanning_end_anim_recommend_to_info" />
+            <item type="drawable" name="status_scanning_end_anim_recommend_to_recommend" />
+            <item type="drawable" name="status_scanning_end_anim_recommend_to_warn" />
+            <item type="drawable" name="status_scanning_end_anim_warn_to_info" />
+            <item type="drawable" name="status_scanning_end_anim_warn_to_recommend" />
+            <item type="drawable" name="status_scanning_end_anim_warn_to_warn" />
+            <item type="drawable" name="status_warn_to_scanning_anim" />
+
+            <item type="style" name="TextAppearance.SafetyCenter.Headline" />
+            <item type="style" name="TextAppearance.SafetyCenter.Headline.Status" />
+            <item type="style" name="TextAppearance.SafetyCenter.Headline.Issue" />
+            <item type="style" name="TextAppearance.SafetyCenter.Headline.Entry" />
+            <item type="style" name="TextAppearance.SafetyCenter.Body" />
+            <item type="style" name="TextAppearance.SafetyCenter.Medium" />
+            <item type="style" name="TextAppearance.SafetyCenter.ActionButton" />
+            <item type="style" name="TextAppearance.SafetyCenter.ActionButton.Secondary" />
+
+            <item type="style" name="SafetyCenterCard" />
+            <item type="style" name="SafetyCenterActionButton" />
+            <item type="style" name="SafetyCenterActionButton.Secondary" />
+            <item type="style" name="SafetyCenterCard.Status" />
+            <item type="style" name="SafetyCenterStatusImage" />
+            <item type="style" name="SafetyCenterStatusTitleAndSummaryContainer" />
+            <item type="style" name="SafetyCenterStatusTitle" />
+            <item type="style" name="SafetyCenterStatusSummary" />
+            <item type="style" name="SafetyCenterStatusButton" />
+            <item type="style" name="SafetyCenterStatusButton.ReviewSettings" />
+            <item type="style" name="SafetyCenterStatusButton.Rescan" />
+            <item type="style" name="SafetyCenterStatusButton.PendingActionsRescan" />
+            <item type="style" name="SafetyCenterStatusSafetyProtectionView" />
+            <item type="style" name="SafetyCenterCard.Issue" />
+            <item type="style" name="SafetyCenterIssueDismiss" />
+            <item type="style" name="SafetyCenterIssueTitle" />
+            <item type="style" name="SafetyCenterIssueSubtitle" />
+            <item type="style" name="SafetyCenterIssueSummary" />
+            <item type="style" name="SafetyCenterIssueActionButtonList" />
+            <item type="style" name="SafetyCenterIssueSafetyProtectionSection" />
+            <item type="style" name="SafetyCenterIssueCardResolvedImage" />
+            <item type="style" name="SafetyCenterIssueCardResolvedTitle" />
+            <item type="style" name="SafetyCenterMoreIssues" />
+            <item type="style" name="SafetyCenterMoreIssuesTitle" />
+            <item type="style" name="SafetyCenterMoreIssuesIcon" />
+            <item type="style" name="SafetyCenterMoreIssuesWidgetFrame" />
+            <item type="style" name="SafetyCenterMoreIssuesWidget" />
+            <item type="style" name="SafetyCenterMoreIssuesWidgetTitle" />
+            <item type="style" name="SafetyCenterMoreIssuesWidgetIcon" />
+            <item type="style" name="SafetyCenterEntry" />
+            <item type="style" name="SafetyCenterEntryDivider" />
+            <item type="style" name="SafetyCenterEntryWidgetFrame" />
+            <item type="style" name="SafetyCenterEntryIconFrame" />
+            <item type="style" name="SafetyCenterEntryIcon" />
+            <item type="style" name="SafetyCenterEntryEmptySpace" />
+            <item type="style" name="SafetyCenterEntryTextContainer" />
+            <item type="style" name="SafetyCenterEntryTitle" />
+            <item type="style" name="SafetyCenterEntrySummary" />
+            <item type="style" name="SafetyCenterEntryIconAction" />
+            <item type="style" name="SafetyCenterGroup" />
+            <item type="style" name="SafetyCenterGroupHeader" />
+            <item type="style" name="SafetyCenterCollapsedGroupHeader" />
+            <item type="style" name="SafetyCenterExpandedGroupHeader" />
+            <item type="style" name="SafetyCenterExpandedGroupTitle" />
+            <item type="style" name="SafetyCenterGroupEntries" />
+            <item type="style" name="SafetyCenterGroupWidgetFrame" />
+            <item type="style" name="SafetyCenterExpandedGroupIcon" />
+            <item type="style" name="SafetyCenterNoLabelPreferenceCategory" />
+            <item type="style" name="SafetyCenterGroupEntry" />
+            <item type="style" name="SafetyCenterStaticEntry" />
+            <item type="style" name="SafetyCenterStaticEntryTitle" />
+            <item type="style" name="SafetyCenterStaticEntrySummary" />
+
+            <item type="style" name="SafetyCenterQsContainer" />
+            <item type="style" name="SafetyCenterLinkText" />
+            <item type="style" name="SafetyCenterQsCloseButton" />
+            <item type="style" name="SafetyCenterQsSectionTitle" />
+            <item type="style" name="SafetyCenterQsPermissionUsage" />
+            <item type="style" name="SafetyCenterQsPreferences" />
+            <item type="style" name="SafetyCenterQsToggleContainer" />
+            <item type="style" name="SafetyCenterQsToggleContainer.Top" />
+            <item type="style" name="SafetyCenterQsToggleContainer.Bottom" />
+            <item type="style" name="SafetyCenterQsToggleButton" />
+            <item type="style" name="SafetyCenterQsToggleButton.Start" />
+            <item type="style" name="SafetyCenterQsToggleButton.End" />
+            <item type="style" name="SafetyCenterQsToggleTextContainer" />
+            <item type="style" name="SafetyCenterQsToggleText" />
+            <item type="style" name="SafetyCenterQsToggleText.Title" />
+            <item type="style" name="SafetyCenterQsToggleText.Subtitle" />
+            <item type="style" name="SafetyCenterQsToggleArrow" />
+            <item type="style" name="SafetyCenterQsToggleIcon" />
+            <item type="style" name="SafetyCenterIndicatorCardView" />
+            <item type="style" name="SafetyCenterIndicatorImageView" />
+            <item type="style" name="SafetyCenterIndicatorTitleText" />
+            <item type="style" name="SafetyCenterIndicatorLabelText" />
+            <item type="style" name="SafetyCenterIndicatorExpandView" />
+            <item type="style" name="SafetyCenterIndicatorActionButton" />
+            <item type="style" name="SafetyCenterIndicatorSecondaryActionButton" />
+            <item type="style" name="SafetyCenterIndicatorForeground" />
+        </policy>
+    </overlayable>
+
 </resources>
diff --git a/PermissionController/res/xml/privacy_controls.xml b/PermissionController/res/xml/privacy_controls.xml
index 0672901e0..48dc8f180 100644
--- a/PermissionController/res/xml/privacy_controls.xml
+++ b/PermissionController/res/xml/privacy_controls.xml
@@ -20,18 +20,6 @@
     android:key="privacy_controls_page"
     android:title="@string/privacy_controls_title">
 
-    <!-- Clipboard access notifications toggle -->
-    <com.android.permissioncontroller.safetycenter.ui.ClickableDisabledSwitchPreference
-        android:key="show_clip_access_notification"
-        android:title="@string/show_clip_access_notification_title"
-        android:summary="@string/show_clip_access_notification_summary" />
-
-    <!-- Show password toggle-->
-    <com.android.permissioncontroller.safetycenter.ui.ClickableDisabledSwitchPreference
-        android:key="show_password"
-        android:title="@string/show_password_title"
-        android:summary="@string/show_password_summary"/>
-
     <!-- Camera toggle -->
     <com.android.permissioncontroller.safetycenter.ui.ClickableDisabledSwitchPreference
         android:key="privacy_camera_toggle"
@@ -44,6 +32,18 @@
         android:title="@string/mic_toggle_title"
         android:summary="@string/mic_toggle_description"/>
 
+    <!-- Clipboard access notifications toggle -->
+    <com.android.permissioncontroller.safetycenter.ui.ClickableDisabledSwitchPreference
+        android:key="show_clip_access_notification"
+        android:title="@string/show_clip_access_notification_title"
+        android:summary="@string/show_clip_access_notification_summary" />
+
+    <!-- Show password toggle-->
+    <com.android.permissioncontroller.safetycenter.ui.ClickableDisabledSwitchPreference
+        android:key="show_password"
+        android:title="@string/show_password_title"
+        android:summary="@string/show_password_summary"/>
+
     <!-- Location link -->
     <Preference
         android:key="privacy_location_access"
diff --git a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java
index 2aeb92636..ba6887559 100644
--- a/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java
+++ b/PermissionController/src/com/android/permissioncontroller/permission/ui/ManagePermissionsActivity.java
@@ -41,6 +41,7 @@ import android.os.UserHandle;
 import android.permission.PermissionManager;
 import android.safetycenter.SafetyCenterManager;
 import android.safetycenter.SafetyEvent;
+import android.safetycenter.SafetySourceData;
 import android.util.Log;
 import android.view.MenuItem;
 
@@ -384,16 +385,18 @@ public final class ManagePermissionsActivity extends SettingsActivity {
                 if (SdkLevel.isAtLeastT()) {
                     SafetyCenterManager safetyCenterManager =
                             getSystemService(SafetyCenterManager.class);
-                    if (safetyCenterManager.isSafetyCenterEnabled()
-                            && !safetyCenterManager.getSafetySourceData(
-                                    UNUSED_APPS_SAFETY_CENTER_SOURCE_ID).getIssues().isEmpty()) {
-                        // Clear source data as user has reviewed their unused apps
-                        HibernationPolicyKt.setUnusedAppsReviewNeeded(this, false);
-                        HibernationPolicyKt.rescanAndPushDataToSafetyCenter(this, sessionId,
-                                new SafetyEvent.Builder(
-                                        SafetyEvent.SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED)
-                                        .build());
-                        HibernationPolicyKt.cancelUnusedAppsNotification(this);
+                    if (safetyCenterManager.isSafetyCenterEnabled()) {
+                        SafetySourceData data = safetyCenterManager.getSafetySourceData(
+                                UNUSED_APPS_SAFETY_CENTER_SOURCE_ID);
+                        if (data != null && !data.getIssues().isEmpty()) {
+                            // Clear source data as user has reviewed their unused apps
+                            HibernationPolicyKt.setUnusedAppsReviewNeeded(this, false);
+                            HibernationPolicyKt.rescanAndPushDataToSafetyCenter(this, sessionId,
+                                    new SafetyEvent.Builder(
+                                            SafetyEvent.SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED)
+                                            .build());
+                            HibernationPolicyKt.cancelUnusedAppsNotification(this);
+                        }
                     }
                 }
 
diff --git a/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt b/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
index 5f1fa1ab6..e8d98cd53 100644
--- a/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
+++ b/PermissionController/src/com/android/permissioncontroller/privacysources/AccessibilitySourceService.kt
@@ -641,7 +641,7 @@ class AccessibilitySourceService(
             SafetyEvent.SAFETY_EVENT_TYPE_SOURCE_STATE_CHANGED).build()
 
         /** lock for processing a job */
-        private val lock = Mutex()
+        internal val lock = Mutex()
 
         /** lock for shared preferences writes */
         private val sharedPrefsLock = Mutex()
@@ -777,28 +777,32 @@ class AccessibilityRemoveAccessHandler : BroadcastReceiver() {
             if (DEBUG) {
                 Log.v(LOG_TAG, "disabling a11y service ${a11yService.flattenToShortString()}")
             }
-            val accessibilityService = AccessibilitySourceService(context)
-            var a11yEnabledServices = accessibilityService.getEnabledAccessibilityServices()
-            val builder = try {
-                AccessibilitySettingsUtil.disableAccessibilityService(context, a11yService)
-                accessibilityService.removeFromNotifiedServices(a11yService)
-                a11yEnabledServices = a11yEnabledServices.filter {
-                    it.id != a11yService.flattenToShortString()
+            AccessibilitySourceService.lock.withLock {
+                val accessibilityService = AccessibilitySourceService(context)
+                var a11yEnabledServices = accessibilityService.getEnabledAccessibilityServices()
+                val builder = try {
+                    AccessibilitySettingsUtil.disableAccessibilityService(context, a11yService)
+                    accessibilityService.removeFromNotifiedServices(a11yService)
+                    a11yEnabledServices = a11yEnabledServices.filter {
+                        it.id != a11yService.flattenToShortString()
+                    }
+                    SafetyEvent.Builder(
+                        SafetyEvent.SAFETY_EVENT_TYPE_RESOLVING_ACTION_SUCCEEDED
+                    )
+                } catch (ex: Exception) {
+                    Log.w(LOG_TAG, "error occurred in disabling a11y service.", ex)
+                    SafetyEvent.Builder(
+                        SafetyEvent.SAFETY_EVENT_TYPE_RESOLVING_ACTION_FAILED
+                    )
                 }
-                SafetyEvent.Builder(
-                    SafetyEvent.SAFETY_EVENT_TYPE_RESOLVING_ACTION_SUCCEEDED)
-            } catch (ex: Exception) {
-                Log.w(LOG_TAG, "error occurred in disabling a11y service.", ex)
-                SafetyEvent.Builder(
-                    SafetyEvent.SAFETY_EVENT_TYPE_RESOLVING_ACTION_FAILED)
+                val safetySourceIssueId = intent.getStringExtra(
+                    SafetyCenterManager.EXTRA_SAFETY_SOURCE_ISSUE_ID
+                )
+                val safetyEvent = builder.setSafetySourceIssueId(safetySourceIssueId)
+                    .setSafetySourceIssueActionId(SC_ACCESSIBILITY_REMOVE_ACCESS_ACTION_ID)
+                    .build()
+                accessibilityService.sendIssuesToSafetyCenter(a11yEnabledServices, safetyEvent)
             }
-            val safetySourceIssueId = intent.getStringExtra(
-                SafetyCenterManager.EXTRA_SAFETY_SOURCE_ISSUE_ID)
-            val safetyEvent = builder.setSafetySourceIssueId(safetySourceIssueId)
-                .setSafetySourceIssueActionId(SC_ACCESSIBILITY_REMOVE_ACCESS_ACTION_ID)
-                .build()
-            accessibilityService.sendIssuesToSafetyCenter(a11yEnabledServices, safetyEvent)
-
             if (DEBUG) {
                 Log.v(LOG_TAG, "ISSUE_CARD_INTERACTION CTA1 metric, uid $uid session $sessionId")
             }
@@ -976,14 +980,16 @@ class SafetyCenterAccessibilityListener(val context: Context) :
             if (DEBUG) {
                 Log.v(LOG_TAG, "processing accessibility event")
             }
-            val a11ySourceService = AccessibilitySourceService(context)
-            val a11yEnabledServices = a11ySourceService.getEnabledAccessibilityServices()
-            a11ySourceService.sendIssuesToSafetyCenter(a11yEnabledServices)
-            val enabledComponents = a11yEnabledServices.map { a11yService ->
-                ComponentName.unflattenFromString(a11yService.id)!!.flattenToShortString()
-            }.toSet()
-            a11ySourceService.removeAccessibilityNotification(enabledComponents)
-            a11ySourceService.updateServiceAsNotified(enabledComponents)
+            AccessibilitySourceService.lock.withLock {
+                val a11ySourceService = AccessibilitySourceService(context)
+                val a11yEnabledServices = a11ySourceService.getEnabledAccessibilityServices()
+                a11ySourceService.sendIssuesToSafetyCenter(a11yEnabledServices)
+                val enabledComponents = a11yEnabledServices.map { a11yService ->
+                    ComponentName.unflattenFromString(a11yService.id)!!.flattenToShortString()
+                }.toSet()
+                a11ySourceService.removeAccessibilityNotification(enabledComponents)
+                a11ySourceService.updateServiceAsNotified(enabledComponents)
+            }
         }
     }
 }
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java
index 62fb8ca4e..ce32108d2 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/IssueCardPreference.java
@@ -161,7 +161,7 @@ public class IssueCardPreference extends Preference implements ComparablePrefere
                     holder.itemView.getPaddingEnd(),
                     /* bottom = */ getContext()
                             .getResources()
-                            .getDimensionPixelSize(R.dimen.safety_center_card_margin_bottom));
+                            .getDimensionPixelSize(R.dimen.sc_card_margin_bottom));
         } else {
             holder.itemView.setPaddingRelative(
                     holder.itemView.getPaddingStart(),
@@ -189,7 +189,7 @@ public class IssueCardPreference extends Preference implements ComparablePrefere
             dismissButton.setVisibility(View.VISIBLE);
 
             SafetyCenterTouchTarget.configureSize(
-                    dismissButton, R.dimen.safety_center_icon_button_touch_target_size);
+                    dismissButton, R.dimen.sc_icon_button_touch_target_size);
         } else {
             dismissButton.setVisibility(View.GONE);
         }
@@ -320,8 +320,7 @@ public class IssueCardPreference extends Preference implements ComparablePrefere
                         getSecondaryButtonStrokeColorFromSeverity(mIssue.getSeverityLevel())));
 
         int margin =
-                context.getResources()
-                        .getDimensionPixelSize(R.dimen.safety_center_action_button_list_margin);
+                context.getResources().getDimensionPixelSize(R.dimen.sc_action_button_list_margin);
         ViewGroup.MarginLayoutParams layoutParams =
                 new ViewGroup.MarginLayoutParams(MATCH_PARENT, WRAP_CONTENT);
         layoutParams.setMargins(0, margin, 0, 0);
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/PositionInCardList.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/PositionInCardList.kt
index 29834d3c1..98848aa74 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/PositionInCardList.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/PositionInCardList.kt
@@ -52,9 +52,9 @@ internal enum class PositionInCardList(val backgroundDrawableResId: Int) {
     fun getTopMargin(context: Context): Int =
         when (this) {
             CARD_START, CARD_START_END, CARD_START_LIST_END ->
-                context.resources.getDimensionPixelSize(R.dimen.safety_center_card_margin)
+                context.resources.getDimensionPixelSize(R.dimen.sc_card_margin)
             LIST_START, LIST_START_CARD_END, LIST_START_END ->
-                context.resources.getDimensionPixelSize(R.dimen.safety_center_list_margin)
+                context.resources.getDimensionPixelSize(R.dimen.sc_list_margin)
             else -> 0
         }
 
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java
index 9e8637a29..ea3146ca7 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterQsFragment.java
@@ -155,7 +155,6 @@ public class SafetyCenterQsFragment extends Fragment {
         mRootView = root;
         if (mPermGroupUsages.isEmpty()) {
             mRootView.setVisibility(View.VISIBLE);
-            setSensorToggleState(new ArrayMap<>(), mRootView);
         } else {
             mRootView.setVisibility(View.GONE);
         }
@@ -163,7 +162,7 @@ public class SafetyCenterQsFragment extends Fragment {
         View closeButton = root.findViewById(R.id.close_button);
         closeButton.setOnClickListener((v) -> requireActivity().finish());
         SafetyCenterTouchTarget.configureSize(
-                closeButton, R.dimen.safety_center_icon_button_touch_target_size);
+                closeButton, R.dimen.sc_icon_button_touch_target_size);
 
         mSafetyCenterViewModel =
                 new ViewModelProvider(
@@ -210,7 +209,6 @@ public class SafetyCenterQsFragment extends Fragment {
     private void onPermissionGroupsLoaded(boolean initialized) {
         if (initialized) {
             mRootView.setVisibility(View.VISIBLE);
-            setSensorToggleState(new ArrayMap<>(), mRootView);
             addPermissionUsageInformation(mRootView);
         }
     }
@@ -570,6 +568,10 @@ public class SafetyCenterQsFragment extends Fragment {
             }
         }
 
+        if (sensorState == null) {
+            sensorState = new ArrayMap<>();
+        }
+
         for (int i = 0; i < sToggleButtons.size(); i++) {
             View toggle = rootView.findViewById(sToggleButtons.valueAt(i));
             String groupName = sToggleButtons.keyAt(i);
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt
index 55e190fe9..0e368291e 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyCenterTouchTarget.kt
@@ -18,7 +18,6 @@ package com.android.permissioncontroller.safetycenter.ui
 
 import android.graphics.Rect
 import android.os.Build
-import android.util.Log
 import android.view.TouchDelegate
 import android.view.View
 import androidx.annotation.DimenRes
@@ -28,38 +27,18 @@ import androidx.annotation.RequiresApi
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
 object SafetyCenterTouchTarget {
     /**
-     * Overload that resizes the touch target of views by delegating to the parent component.
+     * Resizes the touch target of views by delegating to the parent component.
      * @param view component that will be expanded
      * @param minTouchTargetSizeResource required minimum touch target size
      */
     @JvmStatic
     fun configureSize(view: View, @DimenRes minTouchTargetSizeResource: Int) {
-        val parent = view.parent as? View
-        configureSize(view, minTouchTargetSizeResource, parent)
-    }
-
-    /**
-     * Resizes the touch target of views by delegating to the ancestor component.
-     * @param view component that will be expanded
-     * @param minTouchTargetSizeResource required minimum touch target size
-     * @param ancestor component that handles touches as the delegate
-     */
-    @JvmStatic
-    fun configureSize(
-        view: View,
-        @DimenRes minTouchTargetSizeResource: Int,
-        ancestor: View?
-    ) {
-        if (ancestor == null) {
-            Log.w("SafetyCenterTouchTarget", "ancestor is null")
-            return
-        }
-
+        val parent = view.parent as View
         val res = view.context.resources
         val minTouchTargetSize = res.getDimensionPixelSize(minTouchTargetSizeResource)
 
-        // Defer getHitRect so that it's called after the ancestor's children are laid out.
-        ancestor.post {
+        // Defer getHitRect so that it's called after the parent's children are laid out.
+        parent.post {
             val hitRect = Rect()
             view.getHitRect(hitRect)
             val currentTouchTargetWidth = hitRect.width()
@@ -69,7 +48,7 @@ object SafetyCenterTouchTarget {
 
                 // Inset adjustment is applied to top, bottom, left, right
                 hitRect.inset(-adjustInsetBy, -adjustInsetBy)
-                ancestor.touchDelegate = TouchDelegate(hitRect, view)
+                parent.touchDelegate = TouchDelegate(hitRect, view)
             }
         }
     }
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java
index b07e3eb4c..f081017b4 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/SafetyStatusPreference.java
@@ -152,7 +152,7 @@ public class SafetyStatusPreference extends Preference implements ComparablePref
                     holder.itemView.getPaddingEnd(),
                     /* bottom = */ getContext()
                             .getResources()
-                            .getDimensionPixelSize(R.dimen.safety_center_card_margin_bottom));
+                            .getDimensionPixelSize(R.dimen.sc_card_margin_bottom));
         } else {
             holder.itemView.setPaddingRelative(
                     holder.itemView.getPaddingStart(),
@@ -416,6 +416,7 @@ public class SafetyStatusPreference extends Preference implements ComparablePref
     private boolean shouldShowRescanButton() {
         int severityLevel = mStatus.getSeverityLevel();
         return !mHasIssues
+                && !mHasPendingActions // hides the second button in QS to keep the UI clean
                 && (severityLevel == OVERALL_SEVERITY_LEVEL_OK
                         || severityLevel == OVERALL_SEVERITY_LEVEL_UNKNOWN);
     }
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryGroupView.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryGroupView.kt
index 6eade6ae3..2e4741e4f 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryGroupView.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryGroupView.kt
@@ -37,7 +37,6 @@ import androidx.transition.AutoTransition
 import androidx.transition.TransitionManager
 import com.android.permissioncontroller.R
 import com.android.permissioncontroller.safetycenter.ui.PositionInCardList
-import com.android.permissioncontroller.safetycenter.ui.SafetyCenterTouchTarget
 import com.android.permissioncontroller.safetycenter.ui.model.SafetyCenterViewModel
 
 @RequiresApi(Build.VERSION_CODES.TIRAMISU)
@@ -144,28 +143,21 @@ internal class SafetyEntryGroupView @JvmOverloads constructor(
                     R.drawable.ic_safety_group_expand
             )
         }
-        isExpanded = shouldBeExpanded
 
-        // Using the ancestor i.e. parent's parent as the touch delegate since the parent is not
-        // large enough to handle the expanded touch target size.
-        val ancestor = chevronIconView?.parent?.parent as? View
-        chevronIconView?.let {
-            SafetyCenterTouchTarget.configureSize(
-                it, R.dimen.safety_center_icon_button_touch_target_size, ancestor)
-        }
+        isExpanded = shouldBeExpanded
 
         val newPaddingTop = context.resources.getDimensionPixelSize(
-                when {
-                    shouldBeExpanded -> R.dimen.safety_center_group_header_expanded_padding_top
-                    else -> R.dimen.safety_center_group_header_collapsed_padding_top
-                }
-        )
+                if (shouldBeExpanded) {
+                    R.dimen.sc_entry_group_expanded_padding_top
+                } else {
+                    R.dimen.sc_entry_group_collapsed_padding_top
+                })
         val newPaddingBottom = context.resources.getDimensionPixelSize(
-                when {
-                    shouldBeExpanded -> R.dimen.safety_center_group_header_expanded_padding_bottom
-                    else -> R.dimen.safety_center_group_header_collapsed_padding_bottom
-                }
-        )
+                if (shouldBeExpanded) {
+                    R.dimen.sc_entry_group_expanded_padding_bottom
+                } else {
+                    R.dimen.sc_entry_group_collapsed_padding_bottom
+                })
         setPaddingRelative(paddingStart, newPaddingTop, paddingEnd, newPaddingBottom)
 
         // accessibility attributes depend on the expanded state
@@ -257,4 +249,4 @@ internal class SafetyEntryGroupView @JvmOverloads constructor(
             onGroupCollapsed(group.id)
         }
     }
-}
\ No newline at end of file
+}
diff --git a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt
index 5da9391b4..853d8f85c 100644
--- a/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt
+++ b/PermissionController/src/com/android/permissioncontroller/safetycenter/ui/view/SafetyEntryView.kt
@@ -153,7 +153,7 @@ internal class SafetyEntryView @JvmOverloads constructor(
                     paddingTop,
                     context
                             .resources
-                            .getDimensionPixelSize(R.dimen.safety_center_entry_padding_end),
+                            .getDimensionPixelSize(R.dimen.sc_entry_padding_end),
                     paddingBottom)
         }
     }
diff --git a/SafetyCenter/Resources/res/values-af/strings.xml b/SafetyCenter/Resources/res/values-af/strings.xml
index 2f4fce16a..82b42f3ec 100644
--- a/SafetyCenter/Resources/res/values-af/strings.xml
+++ b/SafetyCenter/Resources/res/values-af/strings.xml
@@ -31,7 +31,7 @@
     <string name="permission_usage_summary" msgid="5323079206029964468">"Wys watter programme onlangs toestemmings gebruik het"</string>
     <string name="permission_usage_search_terms" msgid="3852343592870257104">"Privaatheid, Privaatheidkontroleskerm"</string>
     <string name="permission_manager_title" msgid="5277347862821255015">"Toestemmingbestuurder"</string>
-    <string name="permission_manager_summary" msgid="8099852107340970790">"Beheer programtoegang tot jou data"</string>
+    <string name="permission_manager_summary" msgid="8099852107340970790">"Beheer apptoegang tot jou data"</string>
     <string name="permission_manager_search_terms" msgid="2895147613099694722">"Toestemmings, Toestemmingsbestuurder"</string>
     <string name="privacy_controls_title" msgid="5322875777945432395">"Privaatheidkontroles"</string>
     <string name="privacy_controls_summary" msgid="2402066941190435424">"Beheer toesteltoegang tot mikrofoon, kamera en meer"</string>
diff --git a/SafetyCenter/Resources/res/values-b+sr+Latn/strings.xml b/SafetyCenter/Resources/res/values-b+sr+Latn/strings.xml
index 66486fd7a..97dcc18f4 100644
--- a/SafetyCenter/Resources/res/values-b+sr+Latn/strings.xml
+++ b/SafetyCenter/Resources/res/values-b+sr+Latn/strings.xml
@@ -43,6 +43,6 @@
     <string name="advanced_privacy_title" msgid="1117725225706176643">"Još podešavanja privatnosti"</string>
     <string name="advanced_privacy_summary" msgid="2281203390575069543">"Automatsko popunjavanje, kontrole aktivnosti i drugo"</string>
     <string name="advanced_privacy_search_terms" msgid="5044404599789175222"></string>
-    <string name="overall_severity_level_account_recommendation_title" msgid="6524855037045765671">"Nalog može da bude ugrožen"</string>
+    <string name="overall_severity_level_account_recommendation_title" msgid="6524855037045765671">"Nalog je možda ugrožen"</string>
     <string name="overall_severity_level_critical_account_warning_title" msgid="3294187096461368277">"Nalog je ugrožen"</string>
 </resources>
diff --git a/SafetyCenter/Resources/res/values-es-rUS/strings.xml b/SafetyCenter/Resources/res/values-es-rUS/strings.xml
index c32ca247a..7a67f9288 100644
--- a/SafetyCenter/Resources/res/values-es-rUS/strings.xml
+++ b/SafetyCenter/Resources/res/values-es-rUS/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="safetyCenterResourcesAppLabel" msgid="4043334186295695930">"Recursos del Centro de seguridad"</string>
-    <string name="lock_screen_sources_title" msgid="3317906280484627707">"Bloqueo de dispositivos"</string>
+    <string name="lock_screen_sources_title" msgid="3317906280484627707">"Bloqueo de dispositivo"</string>
     <string name="lock_screen_sources_summary" msgid="7220439741282516496"></string>
     <string name="lock_screen_title" msgid="4069104894527169877">"Bloqueo de pantalla"</string>
     <string name="lock_screen_summary_disabled" msgid="354071230916616692">"Aún no hay información"</string>
diff --git a/SafetyCenter/Resources/res/values-fi/strings.xml b/SafetyCenter/Resources/res/values-fi/strings.xml
index 5b03bbb0e..159f9794f 100644
--- a/SafetyCenter/Resources/res/values-fi/strings.xml
+++ b/SafetyCenter/Resources/res/values-fi/strings.xml
@@ -33,7 +33,7 @@
     <string name="permission_manager_title" msgid="5277347862821255015">"Lupien ylläpito"</string>
     <string name="permission_manager_summary" msgid="8099852107340970790">"Päätä sovelluksen pääsystä dataasi"</string>
     <string name="permission_manager_search_terms" msgid="2895147613099694722">"Luvat, lupien hallinta"</string>
-    <string name="privacy_controls_title" msgid="5322875777945432395">"Tietosuojahallinta"</string>
+    <string name="privacy_controls_title" msgid="5322875777945432395">"Yksityisyysasetukset"</string>
     <string name="privacy_controls_summary" msgid="2402066941190435424">"Hallinnoi laitteiden pääsyä mikrofoniin, kameraan ja muihin"</string>
     <string name="privacy_controls_search_terms" msgid="3774472175934304165">"Yksityisyys, yksityisyysasetukset"</string>
     <string name="advanced_title" msgid="8745436380690561172">"Lisää asetuksia"</string>
diff --git a/SafetyCenter/Resources/res/values-fr/strings.xml b/SafetyCenter/Resources/res/values-fr/strings.xml
index 0ef49b767..e30fabbb8 100644
--- a/SafetyCenter/Resources/res/values-fr/strings.xml
+++ b/SafetyCenter/Resources/res/values-fr/strings.xml
@@ -43,6 +43,6 @@
     <string name="advanced_privacy_title" msgid="1117725225706176643">"Autres paramètres de confidentialité"</string>
     <string name="advanced_privacy_summary" msgid="2281203390575069543">"Saisie automatique, commandes relatives à l\'activité et bien plus"</string>
     <string name="advanced_privacy_search_terms" msgid="5044404599789175222"></string>
-    <string name="overall_severity_level_account_recommendation_title" msgid="6524855037045765671">"Compte potentiellement à risque"</string>
-    <string name="overall_severity_level_critical_account_warning_title" msgid="3294187096461368277">"Compte à risque"</string>
+    <string name="overall_severity_level_account_recommendation_title" msgid="6524855037045765671">"Risque potentiel sur le compte"</string>
+    <string name="overall_severity_level_critical_account_warning_title" msgid="3294187096461368277">"Risque sur le compte"</string>
 </resources>
diff --git a/SafetyCenter/Resources/res/values-iw/strings.xml b/SafetyCenter/Resources/res/values-iw/strings.xml
index c4bb38b63..eac31aca9 100644
--- a/SafetyCenter/Resources/res/values-iw/strings.xml
+++ b/SafetyCenter/Resources/res/values-iw/strings.xml
@@ -27,11 +27,11 @@
     <string name="biometrics_search_terms" msgid="6040319118762671981">"טביעת אצבע, אצבע, הוספת טביעת אצבע, פתיחה ע\"י זיהוי הפנים, זיהוי פנים, פנים"</string>
     <string name="privacy_sources_title" msgid="4061110826457365957">"פרטיות"</string>
     <string name="privacy_sources_summary" msgid="4089719981155120864">"מרכז הבקרה, הרשאות, אמצעי בקרה"</string>
-    <string name="permission_usage_title" msgid="3633779688945350407">"מרכז הבקרה להגדרת הפרטיות"</string>
+    <string name="permission_usage_title" msgid="3633779688945350407">"מרכז הבקרה להגדרות הפרטיות"</string>
     <string name="permission_usage_summary" msgid="5323079206029964468">"אלו אפליקציות השתמשו בהרשאות לאחרונה"</string>
     <string name="permission_usage_search_terms" msgid="3852343592870257104">"פרטיות, מרכז הבקרה להגדרת הפרטיות, מרכז בקרת הפרטיות"</string>
     <string name="permission_manager_title" msgid="5277347862821255015">"מנהל ההרשאות"</string>
-    <string name="permission_manager_summary" msgid="8099852107340970790">"שליטה בגישה של האפליקציה לנתונים שלך"</string>
+    <string name="permission_manager_summary" msgid="8099852107340970790">"שליטה בגישה של האפליקציות לנתונים שלך"</string>
     <string name="permission_manager_search_terms" msgid="2895147613099694722">"הרשאות, מנהל ההרשאות, מנהל הרשאות"</string>
     <string name="privacy_controls_title" msgid="5322875777945432395">"אמצעי בקרה על פרטיות"</string>
     <string name="privacy_controls_summary" msgid="2402066941190435424">"שליטה בגישה של המכשיר למיקרופון, למצלמה ועוד"</string>
diff --git a/SafetyCenter/Resources/res/values-nl/strings.xml b/SafetyCenter/Resources/res/values-nl/strings.xml
index c188b2263..15771091d 100644
--- a/SafetyCenter/Resources/res/values-nl/strings.xml
+++ b/SafetyCenter/Resources/res/values-nl/strings.xml
@@ -28,13 +28,13 @@
     <string name="privacy_sources_title" msgid="4061110826457365957">"Privacy"</string>
     <string name="privacy_sources_summary" msgid="4089719981155120864">"Dashboard, rechten, bedieningselementen"</string>
     <string name="permission_usage_title" msgid="3633779688945350407">"Privacydashboard"</string>
-    <string name="permission_usage_summary" msgid="5323079206029964468">"Tonen welke apps onlangs rechten hebben gebruikt"</string>
+    <string name="permission_usage_summary" msgid="5323079206029964468">"Toon welke apps onlangs rechten hebben gebruikt"</string>
     <string name="permission_usage_search_terms" msgid="3852343592870257104">"Privacy, Privacydashboard"</string>
     <string name="permission_manager_title" msgid="5277347862821255015">"Rechtenbeheer"</string>
-    <string name="permission_manager_summary" msgid="8099852107340970790">"App-toegang tot je gegevens beheren"</string>
+    <string name="permission_manager_summary" msgid="8099852107340970790">"Beheer de toegang van apps tot je gegevens"</string>
     <string name="permission_manager_search_terms" msgid="2895147613099694722">"Rechten, Rechtenbeheer"</string>
     <string name="privacy_controls_title" msgid="5322875777945432395">"Privacyopties"</string>
-    <string name="privacy_controls_summary" msgid="2402066941190435424">"Apparaattoegang tot de microfoon, camera en meer beheren"</string>
+    <string name="privacy_controls_summary" msgid="2402066941190435424">"Beheer apparaattoegang tot de microfoon, camera en meer"</string>
     <string name="privacy_controls_search_terms" msgid="3774472175934304165">"Privacy, Privacyopties"</string>
     <string name="advanced_title" msgid="8745436380690561172">"Meer instellingen"</string>
     <string name="advanced_security_title" msgid="1126833338772188155">"Meer beveiligingsinstellingen"</string>
diff --git a/SafetyCenter/Resources/res/values-sr/strings.xml b/SafetyCenter/Resources/res/values-sr/strings.xml
index e90d9448f..28c11b624 100644
--- a/SafetyCenter/Resources/res/values-sr/strings.xml
+++ b/SafetyCenter/Resources/res/values-sr/strings.xml
@@ -43,6 +43,6 @@
     <string name="advanced_privacy_title" msgid="1117725225706176643">"Још подешавања приватности"</string>
     <string name="advanced_privacy_summary" msgid="2281203390575069543">"Аутоматско попуњавање, контроле активности и друго"</string>
     <string name="advanced_privacy_search_terms" msgid="5044404599789175222"></string>
-    <string name="overall_severity_level_account_recommendation_title" msgid="6524855037045765671">"Налог може да буде угрожен"</string>
+    <string name="overall_severity_level_account_recommendation_title" msgid="6524855037045765671">"Налог је можда угрожен"</string>
     <string name="overall_severity_level_critical_account_warning_title" msgid="3294187096461368277">"Налог је угрожен"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-af/strings.xml b/SafetyCenter/Resources/shared_res/values-af/strings.xml
index c3a603636..94eec6f00 100644
--- a/SafetyCenter/Resources/shared_res/values-af/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-af/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Kon nie bladsy oopmaak nie"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Kon nie opletberig afhandel nie"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Kon nie instellings herlaai nie"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Kon nie {count,plural, =1{instelling}other{instellings}} nagaan nie"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Kon nie instelling nagaan nie}other{Kon nie instellings nagaan nie}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Werkprofiel is onderbreek"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Nog geen inligting nie"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-am/strings.xml b/SafetyCenter/Resources/shared_res/values-am/strings.xml
index 1346ece40..bfd09e0f6 100644
--- a/SafetyCenter/Resources/shared_res/values-am/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-am/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"ገጹን መከፈት አልተቻለም"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"ማንቂያን መፍታት አልተቻለም"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ቅንብሮችን ማደስ አልተቻለም"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ቅንብር}one{ቅንብር}other{ቅንብሮች}}ን መፈተሽ አልተቻለም"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"የስራ መገለጫ ባለበት ቆሟል"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ገና ምንም መረጃ የለም"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ar/strings.xml b/SafetyCenter/Resources/shared_res/values-ar/strings.xml
index 683845895..80b1fc752 100644
--- a/SafetyCenter/Resources/shared_res/values-ar/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ar/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"تعذَّر فتح الصفحة"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"تعذَّر التعامل بشكل نهائي مع التنبيه"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"تعذّر تحديث الإعدادات"</string>
-    <string name="refresh_error" msgid="255412333381376201">"تعذَّر التحقق من {count,plural, =1{إعداد واحد}zero{إعداد}two{إعدادين}few{إعدادات}many{إعدادًا}other{إعداد}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"تم إيقاف الملف الشخصي للعمل مؤقتًا"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ما مِن معلومات بعد."</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-as/strings.xml b/SafetyCenter/Resources/shared_res/values-as/strings.xml
index aec0e941b..131e1abbd 100644
--- a/SafetyCenter/Resources/shared_res/values-as/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-as/strings.xml
@@ -23,7 +23,7 @@
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"কোনো সমস্যা পোৱা নগ’ল"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"ছেটিং পৰ্যালোচনা কৰক"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"ছেটিঙৰ সূচী পৰীক্ষা কৰক"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"ডিভাইচটো অৱস্থা অসুৰক্ষিত হ’ব পাৰে"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"ডিভাইচটোৰ বিপদাশংকা থাকিব পাৰে"</string>
     <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"ডিভাইচটো অসুৰক্ষিত অৱস্থাত আছে"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"আপুনি আশংকাত থাকিব পাৰে"</string>
     <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"আপুনি আশংকাত আছে"</string>
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"পৃষ্ঠাখন খুলিব পৰা নগ’ল"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"সতৰ্কবাৰ্তা সমাধান কৰিব পৰা নগ’ল"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ছেটিং ৰিফ্ৰেশ্ব কৰিব পৰা নগ’ল"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ টা ছেটিং}one{ টা ছেটিং}other{ টা ছেটিং}} পৰীক্ষা কৰিব পৰা নগ’ল"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"কৰ্মস্থানৰ প্ৰ’ফাইলটো পজ কৰা আছে"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"এতিয়ালৈকে কোনো তথ্য নাই"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-az/strings.xml b/SafetyCenter/Resources/shared_res/values-az/strings.xml
index 43f5749bd..2bc5973da 100644
--- a/SafetyCenter/Resources/shared_res/values-az/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-az/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Səhifəni açmaq mümkün olmadı"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Siqnalı həll etmək mümkün olmadı"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Ayarları yeniləmək mümkün olmadı"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ayarı}other{ayarı}} yoxlamaq alınmadı"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"İş profili durdurulub"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Hələ ki, məlumat yoxdur"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-b+sr+Latn/strings.xml b/SafetyCenter/Resources/shared_res/values-b+sr+Latn/strings.xml
index 00bddf5b9..3dd82b5ca 100644
--- a/SafetyCenter/Resources/shared_res/values-b+sr+Latn/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-b+sr+Latn/strings.xml
@@ -23,7 +23,7 @@
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"Nije pronađen nijedan problem"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Pregledajte podešavanja"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"Proverite listu podešavanja"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Uređaj može da bude ugrožen"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Uređaj je možda ugrožen"</string>
     <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"Uređaj je ugrožen"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"Možda ste ugroženi"</string>
     <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"Ugroženi ste"</string>
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Otvaranje stranice nije uspelo"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Rešavanje obaveštenja nije uspelo"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Osvežavanje podešavanja nije uspelo"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Neuspešna provera {count,plural, =1{podeš.}one{podeš.}few{podeš.}other{podeš.}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Poslovni profil je pauziran"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Još nema informacija"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-be/strings.xml b/SafetyCenter/Resources/shared_res/values-be/strings.xml
index 107ef75e4..8b1877a06 100644
--- a/SafetyCenter/Resources/shared_res/values-be/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-be/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Не ўдалося адкрыць старонку"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Не ўдалося вырашыць праблему"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Не ўдалося абнавіць налады"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Збой праверкі {count,plural, =1{налады}one{налады}few{налад}many{налад}other{налады}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Працоўны профіль прыпынены"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Пакуль няма інфармацыі"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-bg/strings.xml b/SafetyCenter/Resources/shared_res/values-bg/strings.xml
index 570036b95..054ccd85f 100644
--- a/SafetyCenter/Resources/shared_res/values-bg/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-bg/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Страницата не се отвори"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Сигналът не се отстрани"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Настройките не бяха опреснени"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Неуспешна проверка на {count,plural, =1{настройка}other{настройки}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Служебният потребителски профил е поставен на пауза"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Още няма информация"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-bn/strings.xml b/SafetyCenter/Resources/shared_res/values-bn/strings.xml
index 0a783f8f2..2ee0bfcef 100644
--- a/SafetyCenter/Resources/shared_res/values-bn/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-bn/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"পৃষ্ঠা খোলা যায়নি"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"সতর্কতার সমাধান করা যায়নি"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"সেটিংস রিফ্রেশ করা যায়নি"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{সেটিং}one{সেটিংস}other{সেটিংস}} চেক করা যায়নি"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{সেটিং চেক করা যায়নি}one{সেটিংস চেক করা যায়নি}other{সেটিংস চেক করা যায়নি}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"অফিস প্রোফাইল পজ করা আছে"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"এখনও কোনও তথ্য নেই"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-bs/strings.xml b/SafetyCenter/Resources/shared_res/values-bs/strings.xml
index 7cf84d531..b536be61c 100644
--- a/SafetyCenter/Resources/shared_res/values-bs/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-bs/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Otvaranje stranice nije uspjelo"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Rješavanje upozorenja nije uspjelo"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Osvježavanje postavki nije uspjelo"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nije moguće provjeriti {count,plural, =1{postavku}one{postavku}few{postavke}other{postavki}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Radni profil je pauziran"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Još uvijek nema informacija"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ca/strings.xml b/SafetyCenter/Resources/shared_res/values-ca/strings.xml
index 2b41283c7..ea03fd5d6 100644
--- a/SafetyCenter/Resources/shared_res/values-ca/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ca/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"No s\'ha pogut obrir la pàgina"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"No s\'ha pogut resoldre l\'alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"No s\'ha pogut actualitzar la configuració"</string>
-    <string name="refresh_error" msgid="255412333381376201">"No s\'ha pogut comprovar {count,plural, =1{config.}other{config.}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"El perfil de treball s\'ha posat en pausa"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Encara no hi ha informació"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-cs/strings.xml b/SafetyCenter/Resources/shared_res/values-cs/strings.xml
index 6755c2361..ce3c1d8da 100644
--- a/SafetyCenter/Resources/shared_res/values-cs/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-cs/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Stránku nelze otevřít"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Upozornění se nepodařilo vyřešit"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nastavení se nepodařilo obnovit"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nepodařilo se zkontrolovat {count,plural, =1{nastavení}few{nastavení}many{nastavení}other{nastavení}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Pracovní profil je pozastaven"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Zatím žádné údaje"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-da/strings.xml b/SafetyCenter/Resources/shared_res/values-da/strings.xml
index fbf113f1b..f51361607 100644
--- a/SafetyCenter/Resources/shared_res/values-da/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-da/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Siden kunne ikke åbnes"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Underretningen kunne ikke behandles"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Indstillingerne kunne ikke opdateres"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Det lykkedes ikke at tjekke {count,plural, =1{indstilling}one{indstilling}other{indstillinger}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Arbejdsprofilen er sat på pause"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Der er ingen oplysninger endnu"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-de/strings.xml b/SafetyCenter/Resources/shared_res/values-de/strings.xml
index df2cf2a46..2047e8885 100644
--- a/SafetyCenter/Resources/shared_res/values-de/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-de/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Seite konnte nicht geöffnet werden"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Ursache konnte nicht behoben werden"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Einstellungen konnten nicht aktualisiert werden"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{Einstellung konnte}other{Einstellungen konnten}} geprüft werden"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Einstellung konnte nicht überprüft werden}other{Einstellungen konnten nicht überprüft werden}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Arbeitsprofil pausiert"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Noch keine Angaben vorhanden"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-el/strings.xml b/SafetyCenter/Resources/shared_res/values-el/strings.xml
index ddd2e2d1b..6abf4193a 100644
--- a/SafetyCenter/Resources/shared_res/values-el/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-el/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Δεν ήταν δυνατό το άνοιγμα της σελίδας"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Δεν ήταν δυνατή η επίλυση της ειδοποίησης"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Δεν ήταν δυνατή η ανανέωση των ρυθμίσεων"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Αδύνατος ο έλεγχος {count,plural, =1{της ρύθμισης}other{των ρυθμίσεων}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Δεν ήταν δυνατός ο έλεγχος της ρύθμισης}other{Δεν ήταν δυνατός ο έλεγχος των ρυθμίσεων}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Το προφίλ εργασίας έχει τεθεί σε παύση"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Δεν υπάρχουν ακόμα πληροφορίες"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-en-rAU/strings.xml b/SafetyCenter/Resources/shared_res/values-en-rAU/strings.xml
index 0d05d88a5..77e1a271e 100644
--- a/SafetyCenter/Resources/shared_res/values-en-rAU/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-en-rAU/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Couldn\'t open page"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Couldn\'t resolve alert"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Couldn\'t refresh settings"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Couldn\'t check {count,plural, =1{setting}other{settings}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Work profile is paused"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"No info yet"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-en-rCA/strings.xml b/SafetyCenter/Resources/shared_res/values-en-rCA/strings.xml
index 0d05d88a5..77e1a271e 100644
--- a/SafetyCenter/Resources/shared_res/values-en-rCA/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-en-rCA/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Couldn\'t open page"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Couldn\'t resolve alert"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Couldn\'t refresh settings"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Couldn\'t check {count,plural, =1{setting}other{settings}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Work profile is paused"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"No info yet"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-en-rGB/strings.xml b/SafetyCenter/Resources/shared_res/values-en-rGB/strings.xml
index 0d05d88a5..77e1a271e 100644
--- a/SafetyCenter/Resources/shared_res/values-en-rGB/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-en-rGB/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Couldn\'t open page"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Couldn\'t resolve alert"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Couldn\'t refresh settings"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Couldn\'t check {count,plural, =1{setting}other{settings}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Work profile is paused"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"No info yet"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-en-rIN/strings.xml b/SafetyCenter/Resources/shared_res/values-en-rIN/strings.xml
index 0d05d88a5..77e1a271e 100644
--- a/SafetyCenter/Resources/shared_res/values-en-rIN/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-en-rIN/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Couldn\'t open page"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Couldn\'t resolve alert"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Couldn\'t refresh settings"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Couldn\'t check {count,plural, =1{setting}other{settings}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Work profile is paused"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"No info yet"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-en-rXC/strings.xml b/SafetyCenter/Resources/shared_res/values-en-rXC/strings.xml
index 54a965784..831bcaf9b 100644
--- a/SafetyCenter/Resources/shared_res/values-en-rXC/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-en-rXC/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‏‎‎‎‏‎‎‎‎‏‏‏‏‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‎‎‏‏‏‎‎‏‏‎‎‏‏‏‎‎‏‎‎Couldnt open page‎‏‎‎‏‎"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‏‏‎‏‎‎‏‎‏‎‎‏‎‏‏‏‏‏‏‏‏‎‏‏‏‎‏‏‎‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‎‎‎‏‏‏‏‎‏‎‏‎‎‏‏‏‎Couldnt resolve alert‎‏‎‎‏‎"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‎‏‏‏‏‏‏‎‎‏‎‏‎‏‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‏‏‏‎‏‏‏‎‎‎Couldnt refresh settings‎‏‎‎‏‎"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Couldnt check {count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎setting‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‎‏‎‏‏‏‎‎‎‏‎‏‏‎‏‏‎‏‎‎‎‎‎‏‎‏‎‎‏‏‏‏‏‏‎‏‎‎‏‏‏‎‎‏‏‎‏‎‏‏‎‎‎‏‏‎‎‏‎‎‏‎settings‎‏‎‎‏‎}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎Couldnt check setting‎‏‎‎‏‎}other{‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‎‎‏‎‎‏‎‎‎‏‏‎‏‎‏‏‎‎‏‏‎‏‎‎‎‎‎‏‏‏‏‎‏‎‎‎‏‏‎‎‏‏‎‏‎‎‏‏‏‎‎‏‎‎‎‏‏‎‎‎‎‏‎Couldnt check settings‎‏‎‎‏‎}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‏‎‏‏‏‏‏‎‏‎‎‎‎‎‎‏‏‎‏‎‏‏‏‎‏‏‏‎‎‏‏‎‏‎‏‏‏‎Work profile is paused‎‏‎‎‏‎"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‎‏‏‏‏‏‏‏‏‏‎‎‎‎‎‎‏‏‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‏‎‎‎‏‎‏‏‏‏‏‏‎‎‏‏‎‏‏‎‏‏‎‎‏‎‎‎‎‏‎‏‎‎‏‎No info yet‎‏‎‎‏‎"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-es-rUS/strings.xml b/SafetyCenter/Resources/shared_res/values-es-rUS/strings.xml
index 615ec8d95..c6b1d6826 100644
--- a/SafetyCenter/Resources/shared_res/values-es-rUS/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-es-rUS/strings.xml
@@ -23,7 +23,7 @@
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"No se encontraron problemas"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Revisar la configuración"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"Verifica la lista de configuración"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Dispositivo podría estar en riesgo"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"El dispositivo podría estar en riesgo"</string>
     <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"El dispositivo está en riesgo"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"Es posible que estés en peligro"</string>
     <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"Estás en peligro"</string>
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"No se pudo abrir la página"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"No se pudo resolver la alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"No se pudo actualizar la configuración"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Error al revisar {count,plural, =1{parámetro}other{parámetros}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{No se pudo revisar el parámetro de configuración}other{No se pudieron revisar los parámetros de configuración}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"El perfil de trabajo está en pausa"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Aún no hay información"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-es/strings.xml b/SafetyCenter/Resources/shared_res/values-es/strings.xml
index c7e2cc313..893a58287 100644
--- a/SafetyCenter/Resources/shared_res/values-es/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-es/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"No se ha podido abrir la página"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"No se ha podido resolver la alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"No se han podido actualizar los ajustes"</string>
-    <string name="refresh_error" msgid="255412333381376201">"No se ha podido comprobar {count,plural, =1{ajuste}other{ajustes}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"El perfil de trabajo está en pausa"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Aún no hay información"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-et/strings.xml b/SafetyCenter/Resources/shared_res/values-et/strings.xml
index 14a799b85..e9a01ae32 100644
--- a/SafetyCenter/Resources/shared_res/values-et/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-et/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Lehte ei saanud avada"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Hoiatusega seotud probleemi ei saanud lahendada"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Seadeid ei saanud värskendada"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{seadet}other{seadet}} ei saanud kontrollida"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Tööprofiil on peatatud"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Teavet ei ole veel"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-eu/strings.xml b/SafetyCenter/Resources/shared_res/values-eu/strings.xml
index 8655aef1c..4197cc307 100644
--- a/SafetyCenter/Resources/shared_res/values-eu/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-eu/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Ezin da ireki orria"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Ezin izan da ebatzi alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Ezin izan dira freskatu ezarpenak"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Ezin izan {count,plural, =1{da egiaztatu ezarpena}other{dira egiaztatu ezarpenak}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Laneko profila pausatuta dago"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ez dago informaziorik oraindik"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-fa/strings.xml b/SafetyCenter/Resources/shared_res/values-fa/strings.xml
index 567180a2d..66d13ee2b 100644
--- a/SafetyCenter/Resources/shared_res/values-fa/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-fa/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"صفحه باز نشد"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"هشدار رفع نشد"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"تنظیمات بازآوری نشد"</string>
-    <string name="refresh_error" msgid="255412333381376201">"نمی‌توان {count,plural, =1{تنظیم}one{تنظیمات}other{تنظیمات}} را بررسی کرد"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"نمایه کاری موقتاً متوقف شده است"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"هنوز اطلاعاتی دردسترس نیست"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-fi/strings.xml b/SafetyCenter/Resources/shared_res/values-fi/strings.xml
index b9f8aa4ce..f0728d64e 100644
--- a/SafetyCenter/Resources/shared_res/values-fi/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-fi/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Sivun avaaminen epäonnistui"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Hälytyksen ratkaiseminen epäonnistui"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Asetuksia ei voitu päivittää"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Ei voitu tarkistaa {count,plural, =1{asetusta}other{asetuksia}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Työprofiilin käyttö on keskeytetty"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ei vielä tietoa"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-fr-rCA/strings.xml b/SafetyCenter/Resources/shared_res/values-fr-rCA/strings.xml
index 50d922afa..9a4680b14 100644
--- a/SafetyCenter/Resources/shared_res/values-fr-rCA/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-fr-rCA/strings.xml
@@ -23,15 +23,15 @@
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"Aucun problème trouvé"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Vérifier les paramètres"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"Vérifiez la liste des paramètres"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"L\'appareil pourrait être compromis"</string>
-    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"L\'appareil est compromis"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"L\'appareil pourrait être en danger"</string>
+    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"L\'appareil est en danger"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"Vous pourriez être en danger"</string>
     <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"Vous êtes en danger"</string>
     <string name="overall_severity_n_alerts_summary" msgid="1105615451561197136">"{count,plural, =1{# alerte}one{# alerte}other{# alertes}}"</string>
     <string name="redirecting_error" msgid="8146983632878233202">"Impossible d\'ouvrir la page"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Impossible de résoudre l\'alerte"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Impossible d\'actualiser les paramètres"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Impossible de vérifier {count,plural, =1{le paramètre}one{les paramètres}other{les paramètres}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Impossible de vérifier le paramètre}one{Impossible de vérifier le paramètre}other{Impossible de vérifier les paramètres}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Le profil professionnel est interrompu"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Aucune donnée pour le moment"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-fr/strings.xml b/SafetyCenter/Resources/shared_res/values-fr/strings.xml
index 702d60449..ec02f5c4a 100644
--- a/SafetyCenter/Resources/shared_res/values-fr/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-fr/strings.xml
@@ -19,19 +19,20 @@
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="scanning_title" msgid="5424849039854311398">"Analyse"</string>
     <string name="loading_summary" msgid="3740846439782713910">"Vérification des paramètres de l\'appareil…"</string>
-    <string name="overall_severity_level_ok_title" msgid="2041250138727564565">"Tout va bien"</string>
+    <string name="overall_severity_level_ok_title" msgid="2041250138727564565">"Tout semble bon"</string>
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"Aucun problème détecté"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Vérifier les paramètres"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"Vérifier la liste des paramètres"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Appareil potentiellement à risque"</string>
-    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"Appareil à risque"</string>
-    <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"Votre sécurité est incertaine"</string>
-    <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"Votre sécurité n\'est pas assurée"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Risque potentiel sur l\'appareil"</string>
+    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"Risque sur l\'appareil"</string>
+    <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"Risque potentiel"</string>
+    <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"Risque de sécurité"</string>
     <string name="overall_severity_n_alerts_summary" msgid="1105615451561197136">"{count,plural, =1{# alerte}one{# alerte}other{# alertes}}"</string>
     <string name="redirecting_error" msgid="8146983632878233202">"Impossible d\'accéder à la page"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Impossible de résoudre l\'alerte"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Impossible d\'actualiser les paramètres"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Impossible vérifier {count,plural, =1{paramètre}one{paramètre}other{paramètres}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Profil professionnel en pause"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Aucune info pour l\'instant"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-gl/strings.xml b/SafetyCenter/Resources/shared_res/values-gl/strings.xml
index 359c55480..36a00ac1e 100644
--- a/SafetyCenter/Resources/shared_res/values-gl/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-gl/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Non se puido abrir a páxina"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Non se puido resolver a alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Non se puido actualizar a configuración"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Sen revisar {count,plural, =1{opción}other{opcións}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"O perfil de traballo está en pausa"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Aínda non hai información"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-gu/strings.xml b/SafetyCenter/Resources/shared_res/values-gu/strings.xml
index b40bf4e45..5e39e09f8 100644
--- a/SafetyCenter/Resources/shared_res/values-gu/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-gu/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"પેજ ખોલી શક્યા નથી"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"અલર્ટનું નિરાકરણ લાવી શક્યા નથી"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"સેટિંગ રિફ્રેશ કરી શકાયા નથી"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{સેટિંગ}one{સેટિંગ}other{સેટિંગ}} ચેક કરી શકાયા નથી"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{સેટિંગ ચેક કરી શકાયું નથી}one{સેટિંગ ચેક કરી શકાયું નથી}other{સેટિંગ ચેક કરી શકાયા નથી}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"ઑફિસની પ્રોફાઇલ થોભાવી છે"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"હજી સુધી કોઈ માહિતી નથી"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-hi/strings.xml b/SafetyCenter/Resources/shared_res/values-hi/strings.xml
index 02f3a2f04..f93f703ae 100644
--- a/SafetyCenter/Resources/shared_res/values-hi/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-hi/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"पेज को खोला नहीं जा सका"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"चेतावनी में बताई गई समस्या को ठीक नहीं किया जा सका"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"सेटिंग को रीफ़्रेश नहीं किया जा सका"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{सेटिंग}one{सेटिंग}other{सेटिंग}} नहीं देखी जा सकीं"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"वर्क प्रोफ़ाइल रोक दी गई है"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"फ़िलहाल, कोई जानकारी मौजूद नहीं है"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-hr/strings.xml b/SafetyCenter/Resources/shared_res/values-hr/strings.xml
index e4d10f4a1..bab01cabd 100644
--- a/SafetyCenter/Resources/shared_res/values-hr/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-hr/strings.xml
@@ -21,7 +21,7 @@
     <string name="loading_summary" msgid="3740846439782713910">"Provjera postavki uređaja…"</string>
     <string name="overall_severity_level_ok_title" msgid="2041250138727564565">"Izgleda dobro"</string>
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"Problemi nisu pronađeni"</string>
-    <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Pregledaj postavke"</string>
+    <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Pregledajte postavke"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"Provjera popisa postavki"</string>
     <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Uređaj je možda ugrožen"</string>
     <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"Uređaj je ugrožen"</string>
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Otvaranje stranice nije uspjelo"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Razrješavanje upozorenja nije uspjelo"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nije bilo moglo osvježiti postavke"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nije moguće provjeriti {count,plural, =1{postavku}one{postavku}few{postavke}other{postavki}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Poslovni profil je pauziran"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Još nema podataka"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-hu/strings.xml b/SafetyCenter/Resources/shared_res/values-hu/strings.xml
index 58bd8c552..37bd40f60 100644
--- a/SafetyCenter/Resources/shared_res/values-hu/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-hu/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Nem sikerült megnyitni az oldalt"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Nem sikerült feloldani a figyelmeztetést"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nem sikerült a beállítások frissítése"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nem ellenőrizhető {count,plural, =1{beállítás}other{beállítás}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"A munkaprofil használata szünetel"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Még nincsenek adatok"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-hy/strings.xml b/SafetyCenter/Resources/shared_res/values-hy/strings.xml
index 0c5b579f7..9f0bb6b70 100644
--- a/SafetyCenter/Resources/shared_res/values-hy/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-hy/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Չհաջողվեց բացել էջը"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Չհաջողվեց լուծել ծանուցումը"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Չհաջողվեց թարմացնել կարգավորումները"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Չհաջողվեց ստուգել {count,plural, =1{կարգավորումը}one{կարգավորումը}other{կարգավորումները}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Չհաջողվեց ստուգել կարգավորումը}one{Չհաջողվեց ստուգել կարգավորումը}other{Չհաջողվեց ստուգել կարգավորումները}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Աշխատանքային պրոֆիլը դադարեցված է"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Տեղեկություններ դեռ չկան"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-in/strings.xml b/SafetyCenter/Resources/shared_res/values-in/strings.xml
index 5206a72fa..5c6e695b2 100644
--- a/SafetyCenter/Resources/shared_res/values-in/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-in/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="scanning_title" msgid="5424849039854311398">"Memindai"</string>
-    <string name="loading_summary" msgid="3740846439782713910">"Memeriksa setelan perangkat …"</string>
+    <string name="loading_summary" msgid="3740846439782713910">"Memeriksa setelan perangkat…"</string>
     <string name="overall_severity_level_ok_title" msgid="2041250138727564565">"Tidak ada masalah"</string>
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"Tidak ditemukan masalah"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Tinjau setelan"</string>
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Tidak dapat membuka halaman"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Tidak dapat menyelesaikan peringatan"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Tidak dapat merefresh setelan"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Tidak dapat memeriksa {count,plural, =1{setelan}other{setelan}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Profil kerja dijeda"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Belum ada info"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-is/strings.xml b/SafetyCenter/Resources/shared_res/values-is/strings.xml
index ee4270a00..ffd5e7f7f 100644
--- a/SafetyCenter/Resources/shared_res/values-is/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-is/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Ekki tókst að opna síðuna"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Ekki tókst að leysa úr viðvöruninni"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Ekki tókst að endurnýja stillingar"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Gat ekki athugað {count,plural, =1{stillingu}one{stillingu}other{stillingar}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Hlé gert á vinnusniði"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Engar upplýsingar ennþá"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-it/strings.xml b/SafetyCenter/Resources/shared_res/values-it/strings.xml
index 218885bfc..f19eb1230 100644
--- a/SafetyCenter/Resources/shared_res/values-it/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-it/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Impossibile aprire la pagina"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Impossibile risolvere l\'avviso"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Impossibile aggiornare le impostazioni"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Impossibile controllare {count,plural, =1{impostazione}other{impostazioni}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Impossibile controllare l\'impostazione}other{Impossibile controllare le impostazioni}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Profilo di lavoro in pausa"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ancora nessuna informazione"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-iw/strings.xml b/SafetyCenter/Resources/shared_res/values-iw/strings.xml
index f4b1048f3..24918848c 100644
--- a/SafetyCenter/Resources/shared_res/values-iw/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-iw/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"לא ניתן היה לפתוח את הדף"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"לא ניתן היה לפתור את הבעיה בהתראה"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"לא ניתן היה לרענן את ההגדרות"</string>
-    <string name="refresh_error" msgid="255412333381376201">"לא ניתן היה לבדוק את ההגדרה {count,plural, =1{}two{הגדרות}many{הגדרות}other{הגדרות}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{לא ניתן היה לבדוק את ההגדרה}two{לא ניתן היה לבדוק את ההגדרות}many{לא ניתן היה לבדוק את ההגדרות}other{לא ניתן היה לבדוק את ההגדרות}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"פרופיל העבודה מושהה"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"אין עדיין פרטים"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ja/strings.xml b/SafetyCenter/Resources/shared_res/values-ja/strings.xml
index 6027d6ea2..5208f9df2 100644
--- a/SafetyCenter/Resources/shared_res/values-ja/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ja/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"ページを開けませんでした"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"アラートを解決できませんでした"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"設定を更新できませんでした"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{設定}other{設定}}を確認できませんでした"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{設定を確認できませんでした}other{設定を確認できませんでした}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"仕事用プロファイルが一時停止しています"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"まだ情報がありません"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ka/strings.xml b/SafetyCenter/Resources/shared_res/values-ka/strings.xml
index 03f0c278c..4ecd5442b 100644
--- a/SafetyCenter/Resources/shared_res/values-ka/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ka/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"გვერდის გახსნა ვერ მოხერხდა"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"გაფრთხილება ვერ გადაიჭრა"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"პარამეტრები ვერ განახლდა"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{პარ.}other{პარ.}} ვერ შემოწმდა"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{პარამეტრის შემოწმება ვერ მოხერხდა}other{პარამეტრების Შემოწმება ვერ მოხერხდა}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"სამსახურის პროფილი დაპაუზებულია"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ინფო ჯერ არ არის"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-kk/strings.xml b/SafetyCenter/Resources/shared_res/values-kk/strings.xml
index 9a4a474a9..ebe9ef9a9 100644
--- a/SafetyCenter/Resources/shared_res/values-kk/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-kk/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Бет ашылмады."</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Хабарландыруда көрсетілген мәселе шешілмеді."</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Параметрлер жаңартылмады."</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{параметр}other{параметр}} тексерілмеді."</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Жұмыс профилі кідіртілді."</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Әзірге мәлімет жоқ."</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-km/strings.xml b/SafetyCenter/Resources/shared_res/values-km/strings.xml
index 638be85a1..fe5616831 100644
--- a/SafetyCenter/Resources/shared_res/values-km/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-km/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"មិនអាច​បើកទំព័រ​បានទេ"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"មិនអាច​ដោះស្រាយការជូនដំណឹងនេះ​បានទេ"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"មិនអាចផ្ទុកការកំណត់ឡើងវិញបានទេ"</string>
-    <string name="refresh_error" msgid="255412333381376201">"មិនអាចពិនិត្យ{count,plural, =1{ការកំណត់}other{ការកំណត់}}បានទេ"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"កម្រងព័ត៌មានការងារត្រូវបាន​ផ្អាក"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"មិន​ទាន់​មាន​ព័ត៌មាន​នៅ​ឡើយ​ទេ"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-kn/strings.xml b/SafetyCenter/Resources/shared_res/values-kn/strings.xml
index 669f8d160..eb1f4c78b 100644
--- a/SafetyCenter/Resources/shared_res/values-kn/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-kn/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"ಪುಟವನ್ನು ತೆರೆಯಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"ಅಲರ್ಟ್ ಅನ್ನು ಬಗೆಹರಿಸಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ಸೆಟ್ಟಿಂಗ್‌ಗಳನ್ನು ರಿಫ್ರೆಶ್ ಮಾಡಲು ಸಾಧ್ಯವಾಗಲಿಲ್ಲ"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ಸೆಟ್ಟಿಂಗ್}one{ಸೆಟ್ಟಿಂಗ್‌ಗಳು}other{ಸೆಟ್ಟಿಂಗ್‌ಗಳು}} ಪರಿಶೀಲಿಸಲು ಸಾಧ್ಯವಿಲ್ಲ"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"ಉದ್ಯೋಗ ಪ್ರೊಫೈಲ್‌ ಅನ್ನು ವಿರಾಮಗೊಳಿಸಲಾಗಿದೆ"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ಇನ್ನೂ ಯಾವುದೇ ಮಾಹಿತಿ ಲಭ್ಯವಿಲ್ಲ"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ko/strings.xml b/SafetyCenter/Resources/shared_res/values-ko/strings.xml
index d7c691002..4468a6c5f 100644
--- a/SafetyCenter/Resources/shared_res/values-ko/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ko/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"페이지를 열 수 없습니다."</string>
     <string name="resolving_action_error" msgid="371968886143262375">"알림을 해결할 수 없습니다."</string>
     <string name="refresh_timeout" msgid="251734999692581852">"설정을 새로고침할 수 없습니다."</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{설정}other{설정}}을 확인할 수 없습니다."</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"직장 프로필이 일시중지됨"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"아직 정보 없음"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ky/strings.xml b/SafetyCenter/Resources/shared_res/values-ky/strings.xml
index 46a7f3455..131ac70dd 100644
--- a/SafetyCenter/Resources/shared_res/values-ky/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ky/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Барак ачылган жок"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Эскертүү чечилген жок"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Параметрлер жаңыртылган жок"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{параметр}other{параметр}} текшерилген жок"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Жумуш профили тындырылды"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Азырынча маалымат жок"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-lo/strings.xml b/SafetyCenter/Resources/shared_res/values-lo/strings.xml
index 0712b8946..55534cbb1 100644
--- a/SafetyCenter/Resources/shared_res/values-lo/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-lo/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"ບໍ່ສາມາດເປີດໜ້າໄດ້"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"ບໍ່ສາມາດແກ້ໄຂແຈ້ງເຕືອນໄດ້"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ບໍ່ສາມາດໂຫຼດການຕັ້ງຄ່າຄືນໃໝ່"</string>
-    <string name="refresh_error" msgid="255412333381376201">"ບໍ່ສາມາດກວດເບິ່ງ {count,plural, =1{ການຕັ້ງຄ່າ}other{ການຕັ້ງຄ່າ}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"ຢຸດໂປຣໄຟລ໌ວຽກໄວ້ຊົ່ວຄາວແລ້ວ"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ບໍ່ມີຂໍ້ມູນເທື່ອ"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-lt/strings.xml b/SafetyCenter/Resources/shared_res/values-lt/strings.xml
index edc72e957..bcf2623bd 100644
--- a/SafetyCenter/Resources/shared_res/values-lt/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-lt/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Nepavyko atidaryti puslapio"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Nepavyko pašalinti įspėjimo"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nepavyko atnaujinti nustatymų"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nepavyko patikrinti {count,plural, =1{nustatymo}one{nustatymo}few{nustatymų}many{nustatymo}other{nustatymų}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Nepavyko patikrinti nustatymo}one{Nepavyko patikrinti nustatymų}few{Nepavyko patikrinti nustatymų}many{Nepavyko patikrinti nustatymų}other{Nepavyko patikrinti nustatymų}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Darbo profilis pristabdytas"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Kol kas informacijos nėra"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-lv/strings.xml b/SafetyCenter/Resources/shared_res/values-lv/strings.xml
index 4ba2ef4e9..09cb1e90d 100644
--- a/SafetyCenter/Resources/shared_res/values-lv/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-lv/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Nevarēja atvērt lapu"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Nevarēja atrisināt ieteikumu vai brīdinājumu"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nevarēja atsvaidzināt iestatījumus"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nevarēja pārbaudīt {count,plural, =1{iestatījumu}zero{iestatījumus}one{iestatījumu}other{iestatījumus}}."</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Darba profila darbība ir apturēta"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Vēl nav informācijas"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-mk/strings.xml b/SafetyCenter/Resources/shared_res/values-mk/strings.xml
index 87afce794..20bd3f082 100644
--- a/SafetyCenter/Resources/shared_res/values-mk/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-mk/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Не можеше да се отвори страницата"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Не можеше да се реши предупредувањето"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Не можеше да се освежат поставките"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Не можеше да се изврши проверка на {count,plural, =1{поставка}one{поставка}other{поставки}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Не може да се провери поставката}one{Не може да се проверат поставките}other{Не може да се проверат поставките}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Работниот профил е паузиран"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Сѐ уште нема податоци"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ml/strings.xml b/SafetyCenter/Resources/shared_res/values-ml/strings.xml
index 1a979f20a..899bcabf0 100644
--- a/SafetyCenter/Resources/shared_res/values-ml/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ml/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"പേജ് തുറക്കാനായില്ല"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"മുന്നറിയിപ്പ് പരിഹരിക്കാനായില്ല"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ക്രമീകരണം റീഫ്രഷ് ചെയ്യാനായില്ല"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ക്രമീകരണം}other{ക്രമീകരണം}} പരിശോധിക്കാനായില്ല"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"ഔദ്യോഗിക പ്രൊഫൈൽ തൽക്കാലം നിർത്തിയിരിക്കുന്നു"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ഇതുവരെ വിവരങ്ങളൊന്നുമില്ല"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-mn/strings.xml b/SafetyCenter/Resources/shared_res/values-mn/strings.xml
index daf2c7d0e..558fd9070 100644
--- a/SafetyCenter/Resources/shared_res/values-mn/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-mn/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Хуудсыг нээж чадсангүй"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Сэрэмжлүүлгийг шийдвэрлэж чадсангүй"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Тохиргоог сэргээж чадсангүй"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{тохиргоо}other{тохиргоо}}-г шалгаж чадсангүй"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Тохиргоог шалгаж чадсангүй}other{Тохиргоог шалгаж чадсангүй}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Ажлын профайлыг түр зогсоосон"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Мэдээлэл хараахан алга"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-mr/strings.xml b/SafetyCenter/Resources/shared_res/values-mr/strings.xml
index ca0ef02ba..59e308c5c 100644
--- a/SafetyCenter/Resources/shared_res/values-mr/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-mr/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"पेज उघडता आले नाही"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"इशाऱ्याचे निराकरण करता आले नाही"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"सेटिंग्ज रिफ्रेश करता आली नाही"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{सेटिंग}other{सेटिंग्ज}} तपासता आली नाहीत"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{सेटिंग तपासता आले नाही}other{सेटिंग्ज तपासता आली नाहीत}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"कार्य प्रोफाइल थांबवली आहे"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"अद्याप कोणतीही माहिती नाही"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ms/strings.xml b/SafetyCenter/Resources/shared_res/values-ms/strings.xml
index 5a68a4c7d..1028c4a2a 100644
--- a/SafetyCenter/Resources/shared_res/values-ms/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ms/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Tidak dapat membuka halaman"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Tidak dapat menyelesaikan amaran"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Tidak dapat menyegar semula tetapan"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Tidak dapat menyemak {count,plural, =1{tetapan}other{tetapan}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Profil kerja dijeda"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Belum ada maklumat lagi"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-my/strings.xml b/SafetyCenter/Resources/shared_res/values-my/strings.xml
index 67ca12815..4156cf4e4 100644
--- a/SafetyCenter/Resources/shared_res/values-my/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-my/strings.xml
@@ -21,8 +21,8 @@
     <string name="loading_summary" msgid="3740846439782713910">"စက်၏ဆက်တင်များကို စစ်ဆေးနေသည်…"</string>
     <string name="overall_severity_level_ok_title" msgid="2041250138727564565">"အဆင်ပြေပါသည်"</string>
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"ပြဿနာမတွေ့ပါ"</string>
-    <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"ဆက်တင်များကို စိစစ်ရန်"</string>
-    <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"ဆက်တင်များစာရင်း စစ်ဆေးရန်"</string>
+    <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"ဆက်တင်များကို စိစစ်ပါ"</string>
+    <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"ဆက်တင်များစာရင်းကို စစ်ဆေးပါ"</string>
     <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"စက်တွင် အန္တရာယ်ရှိနိုင်သည်"</string>
     <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"စက်တွင် အန္တရာယ်ရှိနေသည်"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"သင့်တွင် အန္တရာယ်ရှိနိုင်သည်"</string>
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"စာမျက်နှာကို ဖွင့်၍မရပါ"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"သတိပေးချက်ကို ဖြေရှင်း၍မရပါ"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ဆက်တင်များကို ပြန်လည် စတင်၍မရပါ"</string>
-    <string name="refresh_error" msgid="255412333381376201">"စစ်၍မရပါ {count,plural, =1{ဆက်တင်}other{ဆက်တင်}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{ဆက်တင်ကြည့်၍မရပါ}other{ဆက်တင်များ ကြည့်၍မရပါ}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"အလုပ်ပရိုဖိုင် ခဏရပ်ထားသည်"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"အချက်အလက် မရှိသေးပါ"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-nb/strings.xml b/SafetyCenter/Resources/shared_res/values-nb/strings.xml
index 4bf7e9063..c8abdc2de 100644
--- a/SafetyCenter/Resources/shared_res/values-nb/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-nb/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Kunne ikke åpne siden"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Kunne ikke løse varselet"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Kunne ikke laste inn innstillingene på nytt"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Kunne ikke sjekke {count,plural, =1{innst.}other{innst.}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Jobbprofilen er satt på pause"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ingen informasjon ennå"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ne/strings.xml b/SafetyCenter/Resources/shared_res/values-ne/strings.xml
index 7617ccd5d..c415a7e48 100644
--- a/SafetyCenter/Resources/shared_res/values-ne/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ne/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"पेज खोल्न सकिएन"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"अलर्ट समाधान गर्न सकिएन"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"सेटिङ रिफ्रेस गर्न सकिएन"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{सेटिङ}other{सेटिङ}} जाँच्न सकिएन"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{सेटिङ जाँच गर्न सकिएन}other{सेटिङहरू जाँच गर्न सकिएन}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"कार्य प्रोफाइल पज गरिएको छ"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"कुनै जानकारी उपलब्ध छैन"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-nl/strings.xml b/SafetyCenter/Resources/shared_res/values-nl/strings.xml
index fb0b318cf..25902b975 100644
--- a/SafetyCenter/Resources/shared_res/values-nl/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-nl/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Kan de pagina niet openen"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Kan melding niet oplossen"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Kan instellingen niet vernieuwen"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Kan {count,plural, =1{instelling}other{instellingen}} niet checken"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Kan instelling niet checken}other{Kan instellingen niet checken}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Werkprofiel is onderbroken"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Nog geen informatie"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-or/strings.xml b/SafetyCenter/Resources/shared_res/values-or/strings.xml
index 185dd29c1..8af4ad1b0 100644
--- a/SafetyCenter/Resources/shared_res/values-or/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-or/strings.xml
@@ -23,15 +23,15 @@
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"କୌଣସି ସମସ୍ୟା ମିଳିଲା ନାହିଁ"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"ସେଟିଂସର ସମୀକ୍ଷା କରନ୍ତୁ"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"ସେଟିଂସ ତାଲିକା ଯାଞ୍ଚ କରନ୍ତୁ"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"ଡିଭାଇସଟି ବିପଦରେ ଥାଇପାରେ"</string>
-    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"ଡିଭାଇସଟି ବିପଦରେ ଅଛି"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"ଡିଭାଇସଟି ରିସ୍କରେ ଥାଇପାରେ"</string>
+    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"ଡିଭାଇସଟି ରିସ୍କରେ ଅଛି"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"ଆପଣ ବିପଦରେ ଥାଇପାରନ୍ତି"</string>
     <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"ଆପଣ ବିପଦରେ ଅଛନ୍ତି"</string>
     <string name="overall_severity_n_alerts_summary" msgid="1105615451561197136">"{count,plural, =1{#ଟି ଆଲର୍ଟ}other{#ଟି ଆଲର୍ଟ}}"</string>
     <string name="redirecting_error" msgid="8146983632878233202">"ପୃଷ୍ଠାକୁ ଖୋଲା ଯାଇପାରିଲା ନାହିଁ"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"ଆଲର୍ଟର ସମାଧାନ କରାଯାଇପାରିଲା ନାହିଁ"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ସେଟିଂସ ରିଫ୍ରେସ କରାଯାଇପାରିଲା ନାହିଁ"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ସେଟିଂ}other{ସେଟିଂସ}} ଯାଞ୍ଚ କରିହେଲା ନାହିଁ"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{ସେଟିଂ ଯାଞ୍ଚ କରାଯାଇପାରିଲା ନାହିଁ}other{ସେଟିଂସ ଯାଞ୍ଚ କରାଯାଇପାରିଲା ନାହିଁ}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"ୱାର୍କ ପ୍ରୋଫାଇଲକୁ ବିରତ କରାଯାଇଛି"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ଏପର୍ଯ୍ୟନ୍ତ କୌଣସି ସୂଚନା ନାହିଁ"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-pa/strings.xml b/SafetyCenter/Resources/shared_res/values-pa/strings.xml
index ea59cf153..c8b900c10 100644
--- a/SafetyCenter/Resources/shared_res/values-pa/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-pa/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"ਪੰਨਾ ਖੋਲ੍ਹਿਆ ਨਹੀਂ ਜਾ ਸਕਿਆ"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"ਸੁਚੇਤਨਾ ਦਾ ਹੱਲ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ਸੈਟਿੰਗਾਂ ਨੂੰ ਰਿਫ੍ਰੈਸ਼ ਨਹੀਂ ਕੀਤਾ ਜਾ ਸਕਿਆ"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ਸੈਟਿੰਗ}one{ਸੈਟਿੰਗ}other{ਸੈਟਿੰਗਾਂ}} ਦੀ ਜਾਂਚ ਨਹੀਂ ਕੀਤੀ ਜਾ ਸਕੀ"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"ਕਾਰਜ ਪ੍ਰੋਫਾਈਲ ਨੂੰ ਰੋਕਿਆ ਗਿਆ ਹੈ"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ਅਜੇ ਕੋਈ ਜਾਣਕਾਰੀ ਨਹੀਂ ਹੈ"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-pl/strings.xml b/SafetyCenter/Resources/shared_res/values-pl/strings.xml
index 010f384bf..797b7acf2 100644
--- a/SafetyCenter/Resources/shared_res/values-pl/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-pl/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Nie udało się otworzyć strony"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Nie udało się rozwiązać problemu z alertu"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nie udało się odświeżyć ustawień"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nie można sprawdzić {count,plural, =1{ ustawienia}few{ ustawień}many{ ustawień}other{ ustawienia}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Wstrzymano profil służbowy"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Nie ma jeszcze informacji"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-pt-rBR/strings.xml b/SafetyCenter/Resources/shared_res/values-pt-rBR/strings.xml
index d8256ba0a..a9a03f6c2 100644
--- a/SafetyCenter/Resources/shared_res/values-pt-rBR/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-pt-rBR/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Não foi possível abrir a página"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Não foi possível resolver o alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Não foi possível atualizar as configurações"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Falha ao verificar {count,plural, =1{a configuração}one{a configuração}other{as configurações}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Não foi possível verificar a configuração}one{Não foi possível verificar a configuração}other{Não foi possível verificar as configurações}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"O perfil de trabalho está pausado"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ainda não há informações"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-pt-rPT/strings.xml b/SafetyCenter/Resources/shared_res/values-pt-rPT/strings.xml
index 7cab9978c..8f6486af2 100644
--- a/SafetyCenter/Resources/shared_res/values-pt-rPT/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-pt-rPT/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Não foi possível abrir a página"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Não foi possível resolver o alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Não foi possível atualizar as definições"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Não foi possível verificar {count,plural, =1{definição}other{definições}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Não foi possível verificar a definição}other{Não foi possível verificar as definições}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Perfil de trabalho em pausa"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ainda sem informações"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-pt/strings.xml b/SafetyCenter/Resources/shared_res/values-pt/strings.xml
index d8256ba0a..a9a03f6c2 100644
--- a/SafetyCenter/Resources/shared_res/values-pt/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-pt/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Não foi possível abrir a página"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Não foi possível resolver o alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Não foi possível atualizar as configurações"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Falha ao verificar {count,plural, =1{a configuração}one{a configuração}other{as configurações}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Não foi possível verificar a configuração}one{Não foi possível verificar a configuração}other{Não foi possível verificar as configurações}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"O perfil de trabalho está pausado"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ainda não há informações"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ro/strings.xml b/SafetyCenter/Resources/shared_res/values-ro/strings.xml
index 1378ba313..41b8dd3df 100644
--- a/SafetyCenter/Resources/shared_res/values-ro/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ro/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Pagina nu s-a putut deschide"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Nu s-a putut rezolva alerta"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nu s-au putut actualiza setările"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nu se poate face verificarea {count,plural, =1{setării}few{setărilor}other{setărilor}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Nu s-a putut verifica setarea}few{Nu s-au putut verifica setările}other{Nu s-au putut verifica setările}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Profilul de serviciu este întrerupt"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Nu există informații încă"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ru/strings.xml b/SafetyCenter/Resources/shared_res/values-ru/strings.xml
index cadfc812c..f59af6033 100644
--- a/SafetyCenter/Resources/shared_res/values-ru/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ru/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Не удалось открыть страницу."</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Не удалось устранить проблему."</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Не удалось обновить настройки"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Не удается проверить {count,plural, =1{параметр}one{параметры}few{параметры}many{параметры}other{параметры}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Действие рабочего профиля приостановлено."</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Данных пока нет"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-si/strings.xml b/SafetyCenter/Resources/shared_res/values-si/strings.xml
index 6c6040805..f5b643e16 100644
--- a/SafetyCenter/Resources/shared_res/values-si/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-si/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"පිටුව විවෘත කළ නොහැකි විය"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"ඇඟවීම විසඳිය නොහැකි විය"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"සැකසීම් නැවුම් කිරීමට නොහැකි විය"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{සැකසීම}one{සැකසීම්}other{සැකසීම්}} පරීක්ෂා කළ නොහැකි විය"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"කාර්යාල පැතිකඩ විරාම කර ඇත"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"තවම තතු නැත"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-sk/strings.xml b/SafetyCenter/Resources/shared_res/values-sk/strings.xml
index 66ed9346b..08532190a 100644
--- a/SafetyCenter/Resources/shared_res/values-sk/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-sk/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Stránku sa nepodarilo otvoriť"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Upozornenie sa nepodarilo vyriešiť"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nastavenia sa nepodarilo obnoviť"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Nepodarilo sa skontrolovať {count,plural, =1{nastavenie}few{nastavenia}many{settings}other{nastavení}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Nastavenie sa nepodarilo skontrolovať}few{Nastavenia sa nepodarilo skontrolovať}many{Nastavenia sa nepodarilo skontrolovať}other{Nastavenia sa nepodarilo skontrolovať}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Pracovný profil je pozastavený"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Zatiaľ žiadne informácie"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-sl/strings.xml b/SafetyCenter/Resources/shared_res/values-sl/strings.xml
index 863d6aba9..58c7f08f1 100644
--- a/SafetyCenter/Resources/shared_res/values-sl/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-sl/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Strani ni bilo mogoče odpreti."</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Opozorila ni bilo mogoče odpraviti."</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Nastavitev ni bilo mogoče osvežiti."</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{nastavitve}one{nastavitve}two{nastavitev}few{nastavitev}other{nastavitev}} ni bilo mogoče preveriti."</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Nastavitve ni bilo mogoče preveriti.}one{Nastavitve ni bilo mogoče preveriti.}two{Nastavitev ni bilo mogoče preveriti.}few{Nastavitev ni bilo mogoče preveriti.}other{Nastavitev ni bilo mogoče preveriti.}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Delovni profil je začasno zaustavljen."</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ni še nobenega podatka."</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-sq/strings.xml b/SafetyCenter/Resources/shared_res/values-sq/strings.xml
index 75d071227..1b25b5fa2 100644
--- a/SafetyCenter/Resources/shared_res/values-sq/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-sq/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Faqja nuk mund të hapej"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Sinjalizimi nuk mund të zgjidhej"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Cilësimet nuk mund të rifreskoheshin"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Pa kontroll: {count,plural, =1{cilësim}other{}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Profili i punës është në pauzë"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Nuk ka ende informacione"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-sr/strings.xml b/SafetyCenter/Resources/shared_res/values-sr/strings.xml
index 97f7fd6b5..1698dbb88 100644
--- a/SafetyCenter/Resources/shared_res/values-sr/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-sr/strings.xml
@@ -23,7 +23,7 @@
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"Није пронађен ниједан проблем"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Прегледајте подешавања"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"Проверите листу подешавања"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Уређај може да буде угрожен"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"Уређај је можда угрожен"</string>
     <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"Уређај је угрожен"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"Можда сте угрожени"</string>
     <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"Угрожени сте"</string>
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Отварање странице није успело"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Решавање обавештења није успело"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Освежавање подешавања није успело"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Неуспешна провера {count,plural, =1{подеш.}one{подеш.}few{подеш.}other{подеш.}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Пословни профил је паузиран"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Још нема информација"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-sv/strings.xml b/SafetyCenter/Resources/shared_res/values-sv/strings.xml
index 26f37a0cc..42c506010 100644
--- a/SafetyCenter/Resources/shared_res/values-sv/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-sv/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Det gick inte att öppna sidan"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Det gick inte att åtgärda varningen"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Det gick inte att uppdatera inställningarna"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Det gick inte att kontrollera {count,plural, =1{inställning}other{inställningar}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Det gick inte att kontrollera inställningen}other{Det gick inte att kontrollera inställningarna}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Jobbprofilen är pausad"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Ingen information än"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-sw/strings.xml b/SafetyCenter/Resources/shared_res/values-sw/strings.xml
index dfba207b8..7d02aa650 100644
--- a/SafetyCenter/Resources/shared_res/values-sw/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-sw/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Imeshindwa kufungua ukurasa"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Imeshindwa kutia alama kuwa arifa imeshughulikiwa"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Tumeshindwa kuonyesha upya mipangilio"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Tumeshindwa kukagua mipangilio {count,plural, =1{mipangilio}other{}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Imeshindwa kukagua mipangilio}other{Imeshindwa kukagua mipangilio}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Wasifu wa kazini umesimamishwa"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Bado hakuna maelezo"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ta/strings.xml b/SafetyCenter/Resources/shared_res/values-ta/strings.xml
index dca71c785..e48347362 100644
--- a/SafetyCenter/Resources/shared_res/values-ta/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ta/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"பக்கத்தைத் திறக்க முடியவில்லை"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"எச்சரிக்கையைத் தீர்க்க முடியவில்லை"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"அமைப்புகளைப் புதுப்பிக்க முடியவில்லை"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{அமைப்பைச்}other{அமைப்புகளைச்}} சரிபார்க்க முடியவில்லை"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{அமைப்பைச் சரிபார்க்க முடியவில்லை}other{அமைப்புகளைச் சரிபார்க்க முடியவில்லை}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"பணிக் கணக்கு இடைநிறுத்தப்பட்டது"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"தகவல்கள் எதுவுமில்லை"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-te/strings.xml b/SafetyCenter/Resources/shared_res/values-te/strings.xml
index 9f030851f..9915b2ba2 100644
--- a/SafetyCenter/Resources/shared_res/values-te/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-te/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"పేజీని తెరవడం సాధ్యపడలేదు"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"అలర్ట్‌ను పరిష్కరించడం సాధ్యపడలేదు"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"సెట్టింగ్‌లను రిఫ్రెష్ చేయడం సాధ్యపడలేదు"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{సెట్టింగ్}other{సెట్టింగ్‌లను}} చెక్ చేయడం సాధ్యపడలేదు"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{సెట్టింగ్‌ను చెక్ చేయడం సాధ్యపడలేదు}other{సెట్టింగ్‌లను చెక్ చేయడం సాధ్యపడలేదు}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"వర్క్ ప్రొఫైల్ పాజ్ చేయబడింది"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ఇంకా ఏ సమాచారం లేదు"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-th/strings.xml b/SafetyCenter/Resources/shared_res/values-th/strings.xml
index 983cd51f2..a5dae104c 100644
--- a/SafetyCenter/Resources/shared_res/values-th/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-th/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"เปิดหน้าไม่ได้"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"แก้ไขการแจ้งเตือนไม่ได้"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"รีเฟรชการตั้งค่าไม่ได้"</string>
-    <string name="refresh_error" msgid="255412333381376201">"ไม่สามารถตรวจสอบ {count,plural, =1{การตั้งค่า}other{การตั้งค่า}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{ตรวจสอบการตั้งค่าไม่ได้}other{ตรวจสอบการตั้งค่าไม่ได้}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"โปรไฟล์งานหยุดชั่วคราว"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ยังไม่มีข้อมูล"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-tl/strings.xml b/SafetyCenter/Resources/shared_res/values-tl/strings.xml
index ee24b2d0e..aa7dfbec5 100644
--- a/SafetyCenter/Resources/shared_res/values-tl/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-tl/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Hindi mabuksan ang page"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Hindi ma-resolve ang alerto"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Hindi ma-refresh ang mga setting"</string>
-    <string name="refresh_error" msgid="255412333381376201">"\'Di ma-check ang {count,plural, =1{setting}one{setting}other{na setting}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Naka-pause ang profile sa trabaho"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Wala pang impormasyon"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-tr/strings.xml b/SafetyCenter/Resources/shared_res/values-tr/strings.xml
index 0207ab6b1..28f89be89 100644
--- a/SafetyCenter/Resources/shared_res/values-tr/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-tr/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Sayfa açılamadı"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Uyarı sonlandırılamadı"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Ayarlar yenilenemedi"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ayar}other{ayar}} kontrol edilemedi"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"İş profili duraklatıldı"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Henüz bilgi yok"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-uk/strings.xml b/SafetyCenter/Resources/shared_res/values-uk/strings.xml
index 91b47f0cf..e5465321d 100644
--- a/SafetyCenter/Resources/shared_res/values-uk/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-uk/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Не вдалося відкрити сторінку"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Не вдалося закрити сповіщення"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Не вдалось оновити налаштування"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Не вдалося перевірити {count,plural, =1{налаштування}one{налаштування}few{налаштування}many{налаштувань}other{налаштування}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"Робочий профіль призупинено"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Поки немає інформації"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-ur/strings.xml b/SafetyCenter/Resources/shared_res/values-ur/strings.xml
index 67bf72cb6..ab3938791 100644
--- a/SafetyCenter/Resources/shared_res/values-ur/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-ur/strings.xml
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"صفحہ نہیں کھل سکا"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"الرٹ حل نہیں ہو سکا"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"ترتیبات ریفریش نہیں کی جا سکی"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{ترتیب}other{ترتیبات}} کو چیک نہیں کیا جا سکا"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"دفتری پروفائل روک دی گئی ہے"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"ابھی تک کوئی معلومات نہیں ہے"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-uz/strings.xml b/SafetyCenter/Resources/shared_res/values-uz/strings.xml
index 91b4c2653..2c4010bb9 100644
--- a/SafetyCenter/Resources/shared_res/values-uz/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-uz/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Sahifa ochilmadi"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Ogohlantirish hal qilinmadi"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Sozlamalar yangilanmadi"</string>
-    <string name="refresh_error" msgid="255412333381376201">"{count,plural, =1{Sozlama}other{Sozlamalar}} tekshirilmadi"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Sozlama tekshirilmadi}other{Sozlamalar tekshirilmadi}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Ish profili pauzada"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Hali axborot olinmadi"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-vi/strings.xml b/SafetyCenter/Resources/shared_res/values-vi/strings.xml
index 2f399a723..dfcc286cc 100644
--- a/SafetyCenter/Resources/shared_res/values-vi/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-vi/strings.xml
@@ -18,7 +18,7 @@
 <resources xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:xliff="urn:oasis:names:tc:xliff:document:1.2">
     <string name="scanning_title" msgid="5424849039854311398">"Quét"</string>
-    <string name="loading_summary" msgid="3740846439782713910">"Đang kiểm tra cài đặt thiết bị…"</string>
+    <string name="loading_summary" msgid="3740846439782713910">"Đang kiểm tra chế độ cài đặt của thiết bị…"</string>
     <string name="overall_severity_level_ok_title" msgid="2041250138727564565">"Có vẻ ổn"</string>
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"Không tìm thấy vấn đề nào"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"Xem lại các chế độ cài đặt"</string>
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Không thể mở trang"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Không thể giải quyết vấn đề cảnh báo"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Không thể làm mới cài đặt"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Không thể kiểm tra {count,plural, =1{cài đặt}other{cài đặt}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Không kiểm tra được chế độ cài đặt}other{Không kiểm tra được các chế độ cài đặt}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Hồ sơ công việc của bạn đã bị tạm dừng"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Chưa có thông tin"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-zh-rCN/strings.xml b/SafetyCenter/Resources/shared_res/values-zh-rCN/strings.xml
index e4fdf3e1f..b0a2b5646 100644
--- a/SafetyCenter/Resources/shared_res/values-zh-rCN/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-zh-rCN/strings.xml
@@ -21,7 +21,7 @@
     <string name="loading_summary" msgid="3740846439782713910">"正在检查设备设置…"</string>
     <string name="overall_severity_level_ok_title" msgid="2041250138727564565">"没问题"</string>
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"未发现问题"</string>
-    <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"请检查设置"</string>
+    <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"检查设置"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"请检查设置列表"</string>
     <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"设备可能存在风险"</string>
     <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"设备存在风险"</string>
@@ -31,7 +31,8 @@
     <string name="redirecting_error" msgid="8146983632878233202">"无法打开页面"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"无法解决提醒事项"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"无法刷新设置"</string>
-    <string name="refresh_error" msgid="255412333381376201">"无法检查{count,plural, =1{设置}other{设置}}"</string>
+    <!-- no translation found for refresh_error (656062128422446177) -->
+    <skip />
     <string name="work_profile_paused" msgid="7037400224040869079">"工作资料已被暂停"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"尚无任何信息"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-zh-rHK/strings.xml b/SafetyCenter/Resources/shared_res/values-zh-rHK/strings.xml
index 988943b60..051d3457f 100644
--- a/SafetyCenter/Resources/shared_res/values-zh-rHK/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-zh-rHK/strings.xml
@@ -23,15 +23,15 @@
     <string name="overall_severity_level_ok_summary" msgid="7219520381757200598">"未發現問題"</string>
     <string name="overall_severity_level_ok_review_title" msgid="1494321117696765360">"檢查設定"</string>
     <string name="overall_severity_level_ok_review_summary" msgid="7743619617413076275">"查看設定清單"</string>
-    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"裝置可能面臨風險"</string>
-    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"裝置正面臨風險"</string>
+    <string name="overall_severity_level_device_recommendation_title" msgid="5250040236433061827">"裝置可能存在風險"</string>
+    <string name="overall_severity_level_critical_device_warning_title" msgid="5901771721834272596">"裝置存在風險"</string>
     <string name="overall_severity_level_safety_recommendation_title" msgid="6436208984463981167">"您可能面臨風險"</string>
     <string name="overall_severity_level_critical_safety_warning_title" msgid="1039142045555227172">"您正面臨風險"</string>
     <string name="overall_severity_n_alerts_summary" msgid="1105615451561197136">"{count,plural, =1{# 個警示}other{# 個警示}}"</string>
     <string name="redirecting_error" msgid="8146983632878233202">"無法開啟頁面"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"無法解除警示"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"無法重新整理設定"</string>
-    <string name="refresh_error" msgid="255412333381376201">"無法檢查 {count,plural, =1{ 項設定}other{ 項設定}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{無法檢查設定}other{無法檢查設定}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"工作設定檔已暫停"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"暫時沒有資料"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-zh-rTW/strings.xml b/SafetyCenter/Resources/shared_res/values-zh-rTW/strings.xml
index 0217e4f3d..9b408bb07 100644
--- a/SafetyCenter/Resources/shared_res/values-zh-rTW/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-zh-rTW/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"無法開啟網頁"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"無法解決警示"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"無法重新整理設定"</string>
-    <string name="refresh_error" msgid="255412333381376201">"無法檢查 {count,plural, =1{ 項設定 }other{ 項設定}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{無法檢查設定}other{無法檢查設定}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"工作資料夾已暫停"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"目前還沒有任何資訊"</string>
 </resources>
diff --git a/SafetyCenter/Resources/shared_res/values-zu/strings.xml b/SafetyCenter/Resources/shared_res/values-zu/strings.xml
index 50756b10b..7150779a9 100644
--- a/SafetyCenter/Resources/shared_res/values-zu/strings.xml
+++ b/SafetyCenter/Resources/shared_res/values-zu/strings.xml
@@ -31,7 +31,7 @@
     <string name="redirecting_error" msgid="8146983632878233202">"Ayikwazanga ukuvula ikhasi"</string>
     <string name="resolving_action_error" msgid="371968886143262375">"Ayikwazanga ukuxazulula isexwayiso"</string>
     <string name="refresh_timeout" msgid="251734999692581852">"Ayikwazanga ukuvuselela amasethingi"</string>
-    <string name="refresh_error" msgid="255412333381376201">"Ayikwazanga ukuhlola {count,plural, =1{isethingi}one{amasethingi}other{amasethingi}}"</string>
+    <string name="refresh_error" msgid="656062128422446177">"{count,plural, =1{Ayikwazanga ukuhlola isethingi}one{Ayikwazanga ukuhlola amasethingi}other{Ayikwazanga ukuhlola amasethingi}}"</string>
     <string name="work_profile_paused" msgid="7037400224040869079">"Iphrofayela yomsebenzi iphunyuziwe"</string>
     <string name="group_unknown_summary" msgid="6951386960814105641">"Alukho ulwazi okwamanje"</string>
 </resources>
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagedDeviceTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagedDeviceTest.kt
index 0e76e0d65..852ea3f11 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagedDeviceTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagedDeviceTest.kt
@@ -21,32 +21,39 @@ import android.Manifest.permission.INTERACT_ACROSS_USERS_FULL
 import android.content.Context
 import android.os.UserHandle
 import android.safetycenter.SafetyCenterData
-import android.safetycenter.SafetyCenterEntry
-import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_OK
+import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING
 import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN
-import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON
+import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED
+import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY
 import android.safetycenter.SafetyCenterEntryGroup
 import android.safetycenter.SafetyCenterEntryOrGroup
 import android.safetycenter.SafetyCenterManager
 import android.safetycenter.SafetyCenterStaticEntry
 import android.safetycenter.SafetyCenterStaticEntryGroup
-import android.safetycenter.SafetyCenterStatus
 import android.safetycenter.SafetySourceData
 import android.safetycenter.cts.testing.SafetyCenterActivityLauncher.launchSafetyCenterActivity
 import android.safetycenter.cts.testing.SafetyCenterApisWithShellPermissions.getSafetyCenterDataWithPermission
 import android.safetycenter.cts.testing.SafetyCenterApisWithShellPermissions.getSafetySourceDataWithPermission
 import android.safetycenter.cts.testing.SafetyCenterApisWithShellPermissions.setSafetySourceDataWithPermission
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.COMPLEX_ALL_PROFILE_CONFIG
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_BAREBONE_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_DISABLED_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_GROUP_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_HIDDEN_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.DYNAMIC_IN_RIGID_ID
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_ALL_OPTIONAL_ID
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_ALL_PROFILE_SOURCE_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_BAREBONE_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_IN_RIGID_ID
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_SOURCE_ALL_PROFILE_CONFIG
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.ISSUE_ONLY_SOURCE_CONFIG
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SINGLE_SOURCE_ALL_PROFILE_CONFIG
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SINGLE_SOURCE_ALL_PROFILE_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SINGLE_SOURCE_ALL_PROFILE_INVALID_INTENT_CONFIG
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SINGLE_SOURCE_CONFIG
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SINGLE_SOURCE_GROUP_ID
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.SINGLE_SOURCE_ID
-import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.STATIC_ALL_PROFILE_SOURCES_CONFIG
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.STATIC_ALL_OPTIONAL_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.STATIC_BAREBONE_ID
+import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.STATIC_GROUP_ID
 import android.safetycenter.cts.testing.SafetyCenterCtsConfigs.getWorkPolicyInfoConfig
 import android.safetycenter.cts.testing.SafetyCenterCtsData
 import android.safetycenter.cts.testing.SafetyCenterCtsHelper
@@ -60,6 +67,7 @@ import androidx.test.core.app.ApplicationProvider
 import com.android.bedstead.harrier.BedsteadJUnit4
 import com.android.bedstead.harrier.DeviceState
 import com.android.bedstead.harrier.OptionalBoolean.TRUE
+import com.android.bedstead.harrier.annotations.EnsureHasNoWorkProfile
 import com.android.bedstead.harrier.annotations.EnsureHasSecondaryUser
 import com.android.bedstead.harrier.annotations.EnsureHasWorkProfile
 import com.android.bedstead.harrier.annotations.enterprise.EnsureHasDeviceOwner
@@ -79,7 +87,7 @@ import org.junit.runner.RunWith
 @Ignore
 @RunWith(BedsteadJUnit4::class)
 // TODO(b/234108780): Enable these back when we figure a way to make sure they don't fail due to
-// timeouts with Bedstead. Consider marking them as running only in post-submit in the meantime.
+//  timeouts with Bedstead. Consider marking them as running only in post-submit in the meantime.
 class SafetyCenterManagedDeviceTest {
 
     companion object {
@@ -90,6 +98,7 @@ class SafetyCenterManagedDeviceTest {
     private val safetyCenterResourcesContext = SafetyCenterResourcesContext.forTests(context)
     private val safetyCenterCtsHelper = SafetyCenterCtsHelper(context)
     private val safetySourceCtsData = SafetySourceCtsData(context)
+    private val safetyCenterCtsData = SafetyCenterCtsData(context)
     private val safetyCenterManager = context.getSystemService(SafetyCenterManager::class.java)!!
 
     // JUnit's Assume is not supported in @BeforeClass by the CTS tests runner, so this is used to
@@ -97,40 +106,130 @@ class SafetyCenterManagedDeviceTest {
     private val shouldRunTests = context.deviceSupportsSafetyCenter()
     private var inQuietMode = false
 
-    private val safetyCenterStatusOk =
-        SafetyCenterStatus.Builder(
-                safetyCenterResourcesContext.getStringByName("overall_severity_level_ok_title"),
-                safetyCenterResourcesContext.getStringByName("overall_severity_level_ok_summary"))
-            .setSeverityLevel(SafetyCenterStatus.OVERALL_SEVERITY_LEVEL_OK)
+    private val primaryProfileOnlyIssues =
+        listOf(
+            safetyCenterCtsData.safetyCenterIssueCritical(DYNAMIC_BAREBONE_ID),
+            safetyCenterCtsData.safetyCenterIssueCritical(ISSUE_ONLY_BAREBONE_ID),
+            safetyCenterCtsData.safetyCenterIssueRecommendation(DYNAMIC_DISABLED_ID),
+            safetyCenterCtsData.safetyCenterIssueRecommendation(ISSUE_ONLY_ALL_OPTIONAL_ID),
+            safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_RIGID_ID),
+            safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_RIGID_ID))
+
+    private val dynamicBareboneDefault =
+        safetyCenterCtsData.safetyCenterEntryDefault(DYNAMIC_BAREBONE_ID)
+
+    private val dynamicBareboneUpdated =
+        safetyCenterCtsData.safetyCenterEntryCritical(DYNAMIC_BAREBONE_ID)
+
+    private val dynamicDisabledDefault =
+        safetyCenterCtsData
+            .safetyCenterEntryDefaultBuilder(DYNAMIC_DISABLED_ID)
+            .setPendingIntent(null)
+            .setEnabled(false)
             .build()
-    private val safetyCenterStatusUnknown =
-        SafetyCenterStatus.Builder(
-                safetyCenterResourcesContext.getStringByName(
-                    "overall_severity_level_ok_review_title"),
-                safetyCenterResourcesContext.getStringByName(
-                    "overall_severity_level_ok_review_summary"))
-            .setSeverityLevel(SafetyCenterStatus.OVERALL_SEVERITY_LEVEL_UNKNOWN)
+
+    private val dynamicDisabledUpdated =
+        safetyCenterCtsData.safetyCenterEntryRecommendation(DYNAMIC_DISABLED_ID)
+
+    private val dynamicDisabledForWorkDefaultBuilder
+        get() =
+            safetyCenterCtsData
+                .safetyCenterEntryDefaultBuilder(
+                    DYNAMIC_DISABLED_ID, userId = deviceState.workProfile().id(), title = "Paste")
+                .setPendingIntent(null)
+                .setEnabled(false)
+
+    private val dynamicDisabledForWorkDefault
+        get() = dynamicDisabledForWorkDefaultBuilder.build()
+
+    private val dynamicDisabledForWorkPaused
+        get() =
+            dynamicDisabledForWorkDefaultBuilder
+                // TODO(b/233188021): This needs to use the Enterprise API to override the "work"
+                //  keyword.
+                .setSummary(safetyCenterResourcesContext.getStringByName("work_profile_paused"))
+                .build()
+
+    private val dynamicDisabledForWorkUpdated
+        get() = safetyCenterEntryOkForWork(DYNAMIC_DISABLED_ID, deviceState.workProfile().id())
+
+    private val dynamicHiddenUpdated =
+        safetyCenterCtsData.safetyCenterEntryUnspecified(DYNAMIC_HIDDEN_ID, pendingIntent = null)
+
+    private val dynamicHiddenForWorkUpdated
+        get() = safetyCenterEntryOkForWork(DYNAMIC_HIDDEN_ID, deviceState.workProfile().id())
+
+    private val staticGroupBuilder =
+        SafetyCenterEntryGroup.Builder(SafetyCenterCtsData.entryGroupId(STATIC_GROUP_ID), "OK")
+            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
+            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
+            .setSummary("OK")
+
+    private val staticBarebone =
+        safetyCenterCtsData
+            .safetyCenterEntryDefaultStaticBuilder(STATIC_BAREBONE_ID)
+            .setSummary(null)
             .build()
-    private val staticEntry =
+
+    private val staticAllOptional =
+        safetyCenterCtsData.safetyCenterEntryDefaultStaticBuilder(STATIC_ALL_OPTIONAL_ID).build()
+
+    private val staticAllOptionalForWorkBuilder
+        get() =
+            safetyCenterCtsData
+                .safetyCenterEntryDefaultStaticBuilder(
+                    STATIC_ALL_OPTIONAL_ID,
+                    userId = deviceState.workProfile().id(),
+                    title = "Paste")
+                .setPendingIntent(redirectPendingIntentForWork)
+
+    private val staticAllOptionalForWork
+        get() = staticAllOptionalForWorkBuilder.build()
+
+    private val staticAllOptionalForWorkPaused
+        get() =
+            staticAllOptionalForWorkBuilder
+                // TODO(b/233188021): This needs to use the Enterprise API to override the "work"
+                //  keyword.
+                .setSummary(safetyCenterResourcesContext.getStringByName("work_profile_paused"))
+                .setEnabled(false)
+                .build()
+
+    private val rigidEntry =
         SafetyCenterStaticEntry.Builder("OK")
-            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
             .setSummary("OK")
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
             .build()
-    private val staticEntryForWork
+
+    private val rigidEntryUpdated =
+        SafetyCenterStaticEntry.Builder("Unspecified title")
+            .setSummary("Unspecified summary")
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
+            .build()
+
+    private val rigidEntryForWorkBuilder
         get() =
-            SafetyCenterStaticEntry.Builder("Attention")
+            SafetyCenterStaticEntry.Builder("Paste")
                 .setSummary("OK")
                 .setPendingIntent(redirectPendingIntentForWork)
-                .build()
-    private val staticEntryForWorkQuietMode
+
+    private val rigidEntryForWork
+        get() = rigidEntryForWorkBuilder.build()
+
+    private val rigidEntryForWorkPaused
         get() =
-            SafetyCenterStaticEntry.Builder("Attention")
-                // TODO(b/233188021): This needs to use the Entreprise API to override the "work"
-                // keyword.
+            rigidEntryForWorkBuilder
+                // TODO(b/233188021): This needs to use the Enterprise API to override the "work"
+                //  keyword.
                 .setSummary(safetyCenterResourcesContext.getStringByName("work_profile_paused"))
-                .setPendingIntent(redirectPendingIntentForWork)
                 .build()
 
+    private val rigidEntryForWorkUpdated =
+        SafetyCenterStaticEntry.Builder("Unspecified title for Work")
+            .setSummary("Unspecified summary")
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
+            .build()
+
     private val redirectPendingIntentForWork
         get() =
             callWithShellPermissionIdentity(INTERACT_ACROSS_USERS) {
@@ -138,19 +237,6 @@ class SafetyCenterManagedDeviceTest {
                     getContextForUser(deviceState.workProfile().userHandle()))
             }
 
-    private fun safetyCenterEntryBuilder(id: String) =
-        SafetyCenterEntry.Builder(id, "OK")
-            .setSummary("OK")
-            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
-            .setSeverityUnspecifiedIconType(
-                SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-
-    private fun safetyCenterEntryGroupBuilder(id: String) =
-        SafetyCenterEntryGroup.Builder(SafetyCenterCtsData.entryGroupId(id), "OK")
-            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
-            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON)
-            .setSummary(safetyCenterResourcesContext.getStringByName("group_unknown_summary"))
-
     @Before
     fun assumeDeviceSupportsSafetyCenterToRunTests() {
         assumeTrue(shouldRunTests)
@@ -201,202 +287,242 @@ class SafetyCenterManagedDeviceTest {
 
     @Test
     @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
-    fun getSafetySourceData_withoutInteractAcrossUserPermission_shouldThrowError() {
+    fun getSafetySourceData_withQuietModeEnabled_dataIsNotCleared() {
         safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_ALL_PROFILE_CONFIG)
-        val setDataForWork = safetySourceCtsData.informationForWork
+        val setDataForWork = safetySourceCtsData.informationWithIssueForWork
         val managedSafetyCenterManager =
             getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
         managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
             SINGLE_SOURCE_ALL_PROFILE_ID, setDataForWork)
 
+        setQuietMode(true)
+        val apiSafetySourceDataForWork =
+            managedSafetyCenterManager.getSafetySourceDataWithInteractAcrossUsersPermission(
+                SINGLE_SOURCE_ALL_PROFILE_ID)
+
+        assertThat(apiSafetySourceDataForWork).isEqualTo(setDataForWork)
+    }
+
+    @Test
+    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
+    fun getSafetySourceData_withoutInteractAcrossUserPermission_shouldThrowError() {
+        safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_ALL_PROFILE_CONFIG)
+
+        val managedSafetyCenterManager =
+            getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
         assertFailsWith(SecurityException::class) {
             managedSafetyCenterManager.getSafetySourceData(SINGLE_SOURCE_ALL_PROFILE_ID)
         }
     }
 
     @Test
-    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
-    fun getSafetyCenterData_staticSourceWithWorkProfile_shouldBeAbleToGetData() {
-        safetyCenterCtsHelper.setConfig(STATIC_ALL_PROFILE_SOURCES_CONFIG)
+    @EnsureHasNoWorkProfile
+    fun getSafetyCenterData_withComplexConfigWithoutWorkProfile_returnsPrimaryDataFromConfig() {
+        safetyCenterCtsHelper.setConfig(COMPLEX_ALL_PROFILE_CONFIG)
 
         val apiSafetyCenterData = safetyCenterManager.getSafetyCenterDataWithPermission()
 
-        val safetyCenterStaticData =
+        val safetyCenterDataFromComplexConfig =
             SafetyCenterData(
-                safetyCenterStatusOk,
+                safetyCenterCtsData.safetyCenterStatusUnknown,
                 emptyList(),
-                emptyList(),
-                listOf(SafetyCenterStaticEntryGroup("OK", listOf(staticEntry, staticEntryForWork))))
-        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterStaticData)
-    }
-
-    @Test
-    @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
-    fun getSafetySourceData_withQuietModeEnabled_dataIsNotCleared() {
-        safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_ALL_PROFILE_CONFIG)
-        val setDataForWork = safetySourceCtsData.informationForWork
-        val managedSafetyCenterManager =
-            getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
-        managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
-            SINGLE_SOURCE_ALL_PROFILE_ID, setDataForWork)
-
-        setQuietMode(true)
-        val apiSafetySourceDataForWork =
-            managedSafetyCenterManager.getSafetySourceDataWithInteractAcrossUsersPermission(
-                SINGLE_SOURCE_ALL_PROFILE_ID)
-
-        assertThat(apiSafetySourceDataForWork).isEqualTo(setDataForWork)
+                listOf(
+                    SafetyCenterEntryOrGroup(
+                        SafetyCenterEntryGroup.Builder(
+                                SafetyCenterCtsData.entryGroupId(DYNAMIC_GROUP_ID), "OK")
+                            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
+                            .setSummary(
+                                safetyCenterResourcesContext.getStringByName(
+                                    "group_unknown_summary"))
+                            .setEntries(listOf(dynamicBareboneDefault, dynamicDisabledDefault))
+                            .build()),
+                    SafetyCenterEntryOrGroup(
+                        staticGroupBuilder
+                            .setEntries(listOf(staticBarebone, staticAllOptional))
+                            .build())),
+                listOf(SafetyCenterStaticEntryGroup("OK", listOf(rigidEntry, rigidEntry))))
+        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
     }
 
     @Test
     @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
-    fun getSafetyCenterData_dynamicSourceWithWorkProfile_showsDefaultEntryWhenNoDataIsProvided() {
-        safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_ALL_PROFILE_CONFIG)
+    fun getSafetyCenterData_withComplexConfigWithoutDataProvided_returnsDataFromConfig() {
+        safetyCenterCtsHelper.setConfig(COMPLEX_ALL_PROFILE_CONFIG)
 
         val apiSafetyCenterData = safetyCenterManager.getSafetyCenterDataWithPermission()
 
-        val entry =
-            SafetyCenterEntry.Builder(
-                    SafetyCenterCtsData.entryId(SINGLE_SOURCE_ALL_PROFILE_ID), "OK")
-                .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
-                .setSummary("OK")
-                .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
-                .setSeverityUnspecifiedIconType(
-                    SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-                .build()
-        val managedUserId = deviceState.workProfile().id()
-        val entryForWork =
-            SafetyCenterEntry.Builder(
-                    SafetyCenterCtsData.entryId(SINGLE_SOURCE_ALL_PROFILE_ID, managedUserId),
-                    "Paste")
-                .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
-                .setSummary("OK")
-                .setPendingIntent(redirectPendingIntentForWork)
-                .setSeverityUnspecifiedIconType(
-                    SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-                .build()
-        val entryGroup =
-            SafetyCenterEntryGroup.Builder(
-                    SafetyCenterCtsData.entryGroupId(SINGLE_SOURCE_GROUP_ID), "OK")
-                .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
-                .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON)
-                .setSummary("No info yet")
-                .setEntries(listOf(entry, entryForWork))
-                .build()
-        val safetyCenterData =
+        val safetyCenterDataFromComplexConfig =
             SafetyCenterData(
-                safetyCenterStatusUnknown,
+                safetyCenterCtsData.safetyCenterStatusUnknown,
                 emptyList(),
-                listOf(SafetyCenterEntryOrGroup(entryGroup)),
-                emptyList())
-        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterData)
+                listOf(
+                    SafetyCenterEntryOrGroup(
+                        SafetyCenterEntryGroup.Builder(
+                                SafetyCenterCtsData.entryGroupId(DYNAMIC_GROUP_ID), "OK")
+                            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
+                            .setSummary(
+                                safetyCenterResourcesContext.getStringByName(
+                                    "group_unknown_summary"))
+                            .setEntries(
+                                listOf(
+                                    dynamicBareboneDefault,
+                                    dynamicDisabledDefault,
+                                    dynamicDisabledForWorkDefault))
+                            .build()),
+                    SafetyCenterEntryOrGroup(
+                        staticGroupBuilder
+                            .setEntries(
+                                listOf(staticBarebone, staticAllOptional, staticAllOptionalForWork))
+                            .build())),
+                listOf(
+                    SafetyCenterStaticEntryGroup(
+                        "OK",
+                        listOf(rigidEntry, rigidEntryForWork, rigidEntry, rigidEntryForWork))))
+        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
     }
 
     @Test
     @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
-    fun getSafetyCenterData_staticSourceWithQuietMode_shouldHaveWorkProfilePausedSummary() {
-        safetyCenterCtsHelper.setConfig(STATIC_ALL_PROFILE_SOURCES_CONFIG)
+    fun getSafetyCenterData_withComplexConfigWithPrimaryDataProvided_returnsPrimaryDataProvided() {
+        safetyCenterCtsHelper.setConfig(COMPLEX_ALL_PROFILE_CONFIG)
+        updatePrimaryProfileSources()
 
-        setQuietMode(true)
         val apiSafetyCenterData = safetyCenterManager.getSafetyCenterDataWithPermission()
 
-        val safetyCenterStaticData =
+        val safetyCenterDataFromComplexConfig =
             SafetyCenterData(
-                safetyCenterStatusOk,
-                emptyList(),
-                emptyList(),
+                safetyCenterCtsData.safetyCenterStatusCritical(6),
+                primaryProfileOnlyIssues,
+                listOf(
+                    SafetyCenterEntryOrGroup(
+                        SafetyCenterEntryGroup.Builder(
+                                SafetyCenterCtsData.entryGroupId(DYNAMIC_GROUP_ID), "OK")
+                            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING)
+                            .setSummary("Critical summary")
+                            .setEntries(
+                                listOf(
+                                    dynamicBareboneUpdated,
+                                    dynamicDisabledUpdated,
+                                    dynamicDisabledForWorkDefault,
+                                    dynamicHiddenUpdated))
+                            .build()),
+                    SafetyCenterEntryOrGroup(
+                        staticGroupBuilder
+                            .setEntries(
+                                listOf(staticBarebone, staticAllOptional, staticAllOptionalForWork))
+                            .build())),
                 listOf(
                     SafetyCenterStaticEntryGroup(
-                        "OK", listOf(staticEntry, staticEntryForWorkQuietMode))))
-        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterStaticData)
+                        "OK",
+                        listOf(
+                            rigidEntryUpdated, rigidEntryForWork, rigidEntry, rigidEntryForWork))))
+        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
     }
 
     @Test
     @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
-    fun getSafetySourceCenter_quietModeEnabled_shouldHaveWorkProfilePausedSummary() {
-        safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_ALL_PROFILE_CONFIG)
-        val setData = safetySourceCtsData.information
-        safetyCenterCtsHelper.setData(SINGLE_SOURCE_ALL_PROFILE_ID, setData)
-        val setDataForWork = safetySourceCtsData.informationForWork
-        val managedSafetyCenterManager =
-            getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
-        managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
-            SINGLE_SOURCE_ALL_PROFILE_ID, setDataForWork)
+    fun getSafetyCenterData_withComplexConfigWithAllDataProvided_returnsAllDataProvided() {
+        safetyCenterCtsHelper.setConfig(COMPLEX_ALL_PROFILE_CONFIG)
+        updatePrimaryProfileSources()
+        updateWorkProfileSources()
 
-        setQuietMode(true)
         val apiSafetyCenterData = safetyCenterManager.getSafetyCenterDataWithPermission()
 
-        val entry =
-            SafetyCenterEntry.Builder(
-                    SafetyCenterCtsData.entryId(SINGLE_SOURCE_ALL_PROFILE_ID), "Ok title")
-                .setSeverityLevel(ENTRY_SEVERITY_LEVEL_OK)
-                .setSummary("Ok summary")
-                .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
-                .setSeverityUnspecifiedIconType(
-                    SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-                .build()
         val managedUserId = deviceState.workProfile().id()
-        val entryForWork =
-            SafetyCenterEntry.Builder(
-                    SafetyCenterCtsData.entryId(SINGLE_SOURCE_ALL_PROFILE_ID, managedUserId),
-                    "Paste")
-                .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
-                // TODO(b/233188021): This needs to use the Entreprise API to override the "work"
-                // keyword.
-                .setSummary(safetyCenterResourcesContext.getStringByName("work_profile_paused"))
-                .setPendingIntent(redirectPendingIntentForWork)
-                .setSeverityUnspecifiedIconType(
-                    SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-                .setEnabled(false)
-                .build()
-        val entryGroup =
-            SafetyCenterEntryGroup.Builder(
-                    SafetyCenterCtsData.entryGroupId(SINGLE_SOURCE_GROUP_ID), "OK")
-                .setSeverityLevel(ENTRY_SEVERITY_LEVEL_OK)
-                .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON)
-                .setSummary("OK")
-                .setEntries(listOf(entry, entryForWork))
-                .build()
-        val safetyCenterData =
+        val safetyCenterDataFromComplexConfig =
             SafetyCenterData(
-                safetyCenterStatusOk,
-                emptyList(),
-                listOf(SafetyCenterEntryOrGroup(entryGroup)),
-                emptyList())
-        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterData)
+                safetyCenterCtsData.safetyCenterStatusCritical(11),
+                listOf(
+                    safetyCenterCtsData.safetyCenterIssueCritical(DYNAMIC_BAREBONE_ID),
+                    safetyCenterCtsData.safetyCenterIssueCritical(ISSUE_ONLY_BAREBONE_ID),
+                    safetyCenterCtsData.safetyCenterIssueRecommendation(DYNAMIC_DISABLED_ID),
+                    safetyCenterCtsData.safetyCenterIssueRecommendation(ISSUE_ONLY_ALL_OPTIONAL_ID),
+                    safetyCenterCtsData.safetyCenterIssueInformation(
+                        DYNAMIC_DISABLED_ID, managedUserId),
+                    safetyCenterCtsData.safetyCenterIssueInformation(
+                        DYNAMIC_HIDDEN_ID, managedUserId),
+                    safetyCenterCtsData.safetyCenterIssueInformation(
+                        ISSUE_ONLY_ALL_OPTIONAL_ID, managedUserId),
+                    safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_RIGID_ID),
+                    safetyCenterCtsData.safetyCenterIssueInformation(
+                        DYNAMIC_IN_RIGID_ID, managedUserId),
+                    safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_RIGID_ID),
+                    safetyCenterCtsData.safetyCenterIssueInformation(
+                        ISSUE_ONLY_IN_RIGID_ID, managedUserId)),
+                listOf(
+                    SafetyCenterEntryOrGroup(
+                        SafetyCenterEntryGroup.Builder(
+                                SafetyCenterCtsData.entryGroupId(DYNAMIC_GROUP_ID), "OK")
+                            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING)
+                            .setSummary("Critical summary")
+                            .setEntries(
+                                listOf(
+                                    dynamicBareboneUpdated,
+                                    dynamicDisabledUpdated,
+                                    dynamicDisabledForWorkUpdated,
+                                    dynamicHiddenUpdated,
+                                    dynamicHiddenForWorkUpdated))
+                            .build()),
+                    SafetyCenterEntryOrGroup(
+                        staticGroupBuilder
+                            .setEntries(
+                                listOf(staticBarebone, staticAllOptional, staticAllOptionalForWork))
+                            .build())),
+                listOf(
+                    SafetyCenterStaticEntryGroup(
+                        "OK",
+                        listOf(
+                            rigidEntryUpdated,
+                            rigidEntryForWorkUpdated,
+                            rigidEntry,
+                            rigidEntryForWork))))
+        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
     }
 
     @Test
     @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
-    fun getSafetyCenterData_defaultDataWithInvalidIntent_shouldBeDisabled() {
-        safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_ALL_PROFILE_INVALID_INTENT_CONFIG)
+    fun getSafetyCenterData_withQuietMode_shouldHaveWorkProfilePausedSummaryAndNoWorkIssues() {
+        safetyCenterCtsHelper.setConfig(COMPLEX_ALL_PROFILE_CONFIG)
+        updatePrimaryProfileSources()
+        updateWorkProfileSources()
 
+        setQuietMode(true)
         val apiSafetyCenterData = safetyCenterManager.getSafetyCenterDataWithPermission()
 
-        val entry =
-            safetyCenterEntryBuilder(SafetyCenterCtsData.entryId(SINGLE_SOURCE_ALL_PROFILE_ID))
-                .setEnabled(false)
-                .setPendingIntent(null)
-                .build()
-        val managedUserId = deviceState.workProfile().id()
-        val entryForWork =
-            safetyCenterEntryBuilder(
-                    SafetyCenterCtsData.entryId(SINGLE_SOURCE_ALL_PROFILE_ID, managedUserId))
-                .setTitle("Paste")
-                .setEnabled(false)
-                .setPendingIntent(null)
-                .build()
-        val entryGroup =
-            safetyCenterEntryGroupBuilder(SINGLE_SOURCE_GROUP_ID)
-                .setEntries(listOf(entry, entryForWork))
-                .build()
-        val expectedSafetyCenterData =
+        val safetyCenterDataFromComplexConfig =
             SafetyCenterData(
-                safetyCenterStatusUnknown,
-                emptyList(),
-                listOf(SafetyCenterEntryOrGroup(entryGroup)),
-                emptyList())
-        assertThat(apiSafetyCenterData).isEqualTo(expectedSafetyCenterData)
+                safetyCenterCtsData.safetyCenterStatusCritical(6),
+                primaryProfileOnlyIssues,
+                listOf(
+                    SafetyCenterEntryOrGroup(
+                        SafetyCenterEntryGroup.Builder(
+                                SafetyCenterCtsData.entryGroupId(DYNAMIC_GROUP_ID), "OK")
+                            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING)
+                            .setSummary("Critical summary")
+                            .setEntries(
+                                listOf(
+                                    dynamicBareboneUpdated,
+                                    dynamicDisabledUpdated,
+                                    dynamicDisabledForWorkPaused,
+                                    dynamicHiddenUpdated))
+                            .build()),
+                    SafetyCenterEntryOrGroup(
+                        staticGroupBuilder
+                            .setEntries(
+                                listOf(
+                                    staticBarebone,
+                                    staticAllOptional,
+                                    staticAllOptionalForWorkPaused))
+                            .build())),
+                listOf(
+                    SafetyCenterStaticEntryGroup(
+                        "OK",
+                        listOf(
+                            rigidEntryUpdated,
+                            rigidEntryForWorkPaused,
+                            rigidEntry,
+                            rigidEntryForWorkPaused))))
+        assertThat(apiSafetyCenterData).isEqualTo(safetyCenterDataFromComplexConfig)
     }
 
     @Test
@@ -406,7 +532,8 @@ class SafetyCenterManagedDeviceTest {
 
         val managedSafetyCenterManager =
             getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
-        val setDataForWork = safetySourceCtsData.informationForWork
+        val setDataForWork =
+            SafetySourceCtsData.issuesOnly(safetySourceCtsData.criticalResolvingGeneralIssue)
         assertFailsWith(IllegalArgumentException::class) {
             managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
                 ISSUE_ONLY_ALL_OPTIONAL_ID, setDataForWork)
@@ -417,7 +544,7 @@ class SafetyCenterManagedDeviceTest {
     @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
     fun setSafetySourceData_withoutInteractAcrossUserPermission_shouldThrowError() {
         safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_ALL_PROFILE_CONFIG)
-        val setDataForWork = safetySourceCtsData.informationForWork
+        val setDataForWork = safetySourceCtsData.informationWithIssueForWork
         val managedSafetyCenterManager =
             getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
         managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
@@ -433,24 +560,23 @@ class SafetyCenterManagedDeviceTest {
     @EnsureHasWorkProfile(installInstrumentedApp = TRUE)
     fun setSafetySourceData_issuesOnlySourceWithWorkProfile_shouldBeAbleToSetData() {
         safetyCenterCtsHelper.setConfig(ISSUE_ONLY_SOURCE_ALL_PROFILE_CONFIG)
-        val dataToSet =
-            SafetySourceCtsData.issuesOnly(safetySourceCtsData.recommendationGeneralIssue)
-        safetyCenterCtsHelper.setData(ISSUE_ONLY_ALL_PROFILE_SOURCE_ID, dataToSet)
+
+        val setData = SafetySourceCtsData.issuesOnly(safetySourceCtsData.recommendationGeneralIssue)
+        safetyCenterCtsHelper.setData(ISSUE_ONLY_ALL_PROFILE_SOURCE_ID, setData)
         val managedSafetyCenterManager =
             getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
-        val dataToSetForWork =
+        val setDataForWork =
             SafetySourceCtsData.issuesOnly(safetySourceCtsData.criticalResolvingGeneralIssue)
         managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
-            ISSUE_ONLY_ALL_PROFILE_SOURCE_ID, dataToSetForWork)
+            ISSUE_ONLY_ALL_PROFILE_SOURCE_ID, setDataForWork)
 
         val apiSafetySourceData =
             safetyCenterManager.getSafetySourceDataWithPermission(ISSUE_ONLY_ALL_PROFILE_SOURCE_ID)
         val apiSafetySourceDataForWork =
             managedSafetyCenterManager.getSafetySourceDataWithInteractAcrossUsersPermission(
                 ISSUE_ONLY_ALL_PROFILE_SOURCE_ID)
-
-        assertThat(apiSafetySourceData).isEqualTo(dataToSet)
-        assertThat(apiSafetySourceDataForWork).isEqualTo(dataToSetForWork)
+        assertThat(apiSafetySourceData).isEqualTo(setData)
+        assertThat(apiSafetySourceDataForWork).isEqualTo(setDataForWork)
     }
 
     @Test
@@ -460,7 +586,7 @@ class SafetyCenterManagedDeviceTest {
 
         val managedSafetyCenterManager =
             getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
-        val setDataForWork = safetySourceCtsData.informationForWork
+        val setDataForWork = safetySourceCtsData.informationWithIssueForWork
         assertFailsWith(IllegalArgumentException::class) {
             managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
                 SINGLE_SOURCE_ID, setDataForWork)
@@ -474,7 +600,7 @@ class SafetyCenterManagedDeviceTest {
 
         val setData = safetySourceCtsData.information
         safetyCenterCtsHelper.setData(SINGLE_SOURCE_ALL_PROFILE_ID, setData)
-        val setDataForWork = safetySourceCtsData.informationForWork
+        val setDataForWork = safetySourceCtsData.informationWithIssueForWork
         val managedSafetyCenterManager =
             getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
         managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
@@ -495,21 +621,22 @@ class SafetyCenterManagedDeviceTest {
         safetyCenterCtsHelper.setConfig(SINGLE_SOURCE_CONFIG)
         deviceState.secondaryUser().stop()
 
-        val dataToSet = safetySourceCtsData.unspecified
+        val setData = safetySourceCtsData.unspecified
         val secondaryUserSafetyCenterManager =
             getSafetyCenterManagerForUser(deviceState.secondaryUser().userHandle())
         secondaryUserSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
-            SINGLE_SOURCE_ID, dataToSet)
+            SINGLE_SOURCE_ID, setData)
 
         val apiSafetySourceData =
             secondaryUserSafetyCenterManager.getSafetySourceDataWithInteractAcrossUsersPermission(
                 SINGLE_SOURCE_ID)
-        assertThat(apiSafetySourceData).isEqualTo(dataToSet)
+        assertThat(apiSafetySourceData).isEqualTo(setData)
     }
 
     private fun findWorkPolicyInfo() {
         context.launchSafetyCenterActivity {
-            // TODO(b/233188021): This test will fail if these strings are overridden by OEMS.
+            // TODO(b/233188021): This needs to use the Enterprise API to override the "work"
+            //  keyword.
             waitAllTextDisplayed("Your work policy info", "Settings managed by your IT admin")
         }
     }
@@ -551,4 +678,44 @@ class SafetyCenterManagedDeviceTest {
         }
         setQuietMode(false)
     }
+
+    private fun safetyCenterEntryOkForWork(sourceId: String, managedUserId: Int) =
+        safetyCenterCtsData
+            .safetyCenterEntryOkBuilder(sourceId, managedUserId, title = "Ok title for Work")
+            .build()
+
+    private fun updatePrimaryProfileSources() {
+        safetyCenterCtsHelper.setData(
+            DYNAMIC_BAREBONE_ID, safetySourceCtsData.criticalWithResolvingGeneralIssue)
+        safetyCenterCtsHelper.setData(
+            DYNAMIC_DISABLED_ID, safetySourceCtsData.recommendationWithGeneralIssue)
+        safetyCenterCtsHelper.setData(DYNAMIC_HIDDEN_ID, safetySourceCtsData.unspecified)
+        safetyCenterCtsHelper.setData(
+            ISSUE_ONLY_BAREBONE_ID,
+            SafetySourceCtsData.issuesOnly(safetySourceCtsData.criticalResolvingGeneralIssue))
+        safetyCenterCtsHelper.setData(
+            ISSUE_ONLY_ALL_OPTIONAL_ID,
+            SafetySourceCtsData.issuesOnly(safetySourceCtsData.recommendationGeneralIssue))
+        safetyCenterCtsHelper.setData(DYNAMIC_IN_RIGID_ID, safetySourceCtsData.unspecifiedWithIssue)
+        safetyCenterCtsHelper.setData(
+            ISSUE_ONLY_IN_RIGID_ID,
+            SafetySourceCtsData.issuesOnly(safetySourceCtsData.informationIssue))
+    }
+
+    private fun updateWorkProfileSources() {
+        val managedSafetyCenterManager =
+            getSafetyCenterManagerForUser(deviceState.workProfile().userHandle())
+        managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
+            DYNAMIC_DISABLED_ID, safetySourceCtsData.informationWithIssueForWork)
+        managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
+            DYNAMIC_HIDDEN_ID, safetySourceCtsData.informationWithIssueForWork)
+        managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
+            ISSUE_ONLY_ALL_OPTIONAL_ID,
+            SafetySourceCtsData.issuesOnly(safetySourceCtsData.informationIssue))
+        managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
+            DYNAMIC_IN_RIGID_ID, safetySourceCtsData.unspecifiedWithIssueForWork)
+        managedSafetyCenterManager.setSafetySourceDataWithInteractAcrossUsersPermission(
+            ISSUE_ONLY_IN_RIGID_ID,
+            SafetySourceCtsData.issuesOnly(safetySourceCtsData.informationIssue))
+    }
 }
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
index cd6afaf83..dca48f63b 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/SafetyCenterManagerTest.kt
@@ -16,9 +16,7 @@
 
 package android.safetycenter.cts
 
-import android.app.PendingIntent
 import android.content.Context
-import android.icu.text.MessageFormat
 import android.os.UserHandle.USER_NULL
 import android.safetycenter.SafetyCenterData
 import android.safetycenter.SafetyCenterEntry
@@ -29,15 +27,10 @@ import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN
 import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED
 import android.safetycenter.SafetyCenterEntry.IconAction.ICON_ACTION_TYPE_GEAR
 import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON
-import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION
 import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY
 import android.safetycenter.SafetyCenterEntryGroup
 import android.safetycenter.SafetyCenterEntryOrGroup
 import android.safetycenter.SafetyCenterErrorDetails
-import android.safetycenter.SafetyCenterIssue
-import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING
-import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_OK
-import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_RECOMMENDATION
 import android.safetycenter.SafetyCenterManager
 import android.safetycenter.SafetyCenterManager.OnSafetyCenterDataChangedListener
 import android.safetycenter.SafetyCenterManager.REFRESH_REASON_OTHER
@@ -127,9 +120,7 @@ import android.safetycenter.cts.testing.SafetySourceCtsData
 import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.CRITICAL_ISSUE_ACTION_ID
 import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.CRITICAL_ISSUE_ID
 import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.EVENT_SOURCE_STATE_CHANGED
-import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.INFORMATION_ISSUE_ACTION_ID
 import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.INFORMATION_ISSUE_ID
-import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.RECOMMENDATION_ISSUE_ACTION_ID
 import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.RECOMMENDATION_ISSUE_ID
 import android.safetycenter.cts.testing.SafetySourceReceiver
 import android.safetycenter.cts.testing.SafetySourceReceiver.Companion.SafetySourceDataKey
@@ -141,7 +132,6 @@ import android.safetycenter.cts.testing.SafetySourceReceiver.Companion.dismissSa
 import android.safetycenter.cts.testing.SafetySourceReceiver.Companion.executeSafetyCenterIssueActionWithPermissionAndWait
 import android.safetycenter.cts.testing.SafetySourceReceiver.Companion.refreshSafetySourcesWithReceiverPermissionAndWait
 import android.safetycenter.cts.testing.SafetySourceReceiver.Companion.refreshSafetySourcesWithoutReceiverPermissionAndWait
-import android.util.ArrayMap
 import androidx.test.core.app.ApplicationProvider.getApplicationContext
 import androidx.test.ext.junit.runners.AndroidJUnit4
 import com.android.compatibility.common.preconditions.ScreenLockHelper
@@ -150,7 +140,6 @@ import com.google.common.base.Preconditions.checkState
 import com.google.common.truth.Truth.assertThat
 import com.google.common.util.concurrent.MoreExecutors.directExecutor
 import java.time.Duration
-import java.util.Locale
 import kotlin.test.assertFailsWith
 import kotlinx.coroutines.TimeoutCancellationException
 import org.junit.After
@@ -166,17 +155,9 @@ class SafetyCenterManagerTest {
     private val safetyCenterResourcesContext = SafetyCenterResourcesContext.forTests(context)
     private val safetyCenterCtsHelper = SafetyCenterCtsHelper(context)
     private val safetySourceCtsData = SafetySourceCtsData(context)
+    private val safetyCenterCtsData = SafetyCenterCtsData(context)
     private val safetyCenterManager = context.getSystemService(SafetyCenterManager::class.java)!!
 
-    private val safetyCenterStatusUnknown =
-        SafetyCenterStatus.Builder(
-                safetyCenterResourcesContext.getStringByName(
-                    "overall_severity_level_ok_review_title"),
-                safetyCenterResourcesContext.getStringByName(
-                    "overall_severity_level_ok_review_summary"))
-            .setSeverityLevel(OVERALL_SEVERITY_LEVEL_UNKNOWN)
-            .build()
-
     private val safetyCenterStatusOk =
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName("overall_severity_level_ok_title"),
@@ -195,7 +176,7 @@ class SafetyCenterManagerTest {
     private val safetyCenterStatusOkOneAlert =
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName("overall_severity_level_ok_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_OK)
             .build()
 
@@ -203,7 +184,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_ok_review_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_OK)
             .build()
 
@@ -220,7 +201,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_safety_recommendation_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_RECOMMENDATION)
             .build()
 
@@ -228,7 +209,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_account_recommendation_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_RECOMMENDATION)
             .build()
 
@@ -236,7 +217,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_device_recommendation_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_RECOMMENDATION)
             .build()
 
@@ -244,7 +225,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_critical_safety_warning_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
             .build()
 
@@ -252,7 +233,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_critical_safety_warning_title"),
-                getAlertString(2))
+                safetyCenterCtsData.getAlertString(2))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
             .build()
 
@@ -260,7 +241,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_critical_account_warning_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
             .build()
 
@@ -268,7 +249,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_critical_account_warning_title"),
-                getAlertString(2))
+                safetyCenterCtsData.getAlertString(2))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
             .build()
 
@@ -276,7 +257,7 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_critical_device_warning_title"),
-                getAlertString(1))
+                safetyCenterCtsData.getAlertString(1))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
             .build()
 
@@ -284,23 +265,16 @@ class SafetyCenterManagerTest {
         SafetyCenterStatus.Builder(
                 safetyCenterResourcesContext.getStringByName(
                     "overall_severity_level_critical_device_warning_title"),
-                getAlertString(2))
-            .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
-            .build()
-
-    private val safetyCenterStatusCriticalSixAlerts =
-        SafetyCenterStatus.Builder(
-                safetyCenterResourcesContext.getStringByName(
-                    "overall_severity_level_critical_safety_warning_title"),
-                getAlertString(6))
+                safetyCenterCtsData.getAlertString(2))
             .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
             .build()
 
     private val safetyCenterEntryOrGroupRecommendation =
-        SafetyCenterEntryOrGroup(safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))
+        SafetyCenterEntryOrGroup(
+            safetyCenterCtsData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))
 
     private val safetyCenterEntryOrGroupCritical =
-        SafetyCenterEntryOrGroup(safetyCenterEntryCritical(SINGLE_SOURCE_ID))
+        SafetyCenterEntryOrGroup(safetyCenterCtsData.safetyCenterEntryCritical(SINGLE_SOURCE_ID))
 
     private val safetyCenterEntryGroupMixedFromComplexConfig =
         SafetyCenterEntryOrGroup(
@@ -310,7 +284,7 @@ class SafetyCenterManagerTest {
                 .setSummary(safetyCenterResourcesContext.getStringByName("group_unknown_summary"))
                 .setEntries(
                     listOf(
-                        safetyCenterEntryDefaultBuilder(DYNAMIC_IN_COLLAPSIBLE_ID).build(),
+                        safetyCenterCtsData.safetyCenterEntryDefault(DYNAMIC_IN_COLLAPSIBLE_ID),
                         SafetyCenterEntry.Builder(
                                 SafetyCenterCtsData.entryId(STATIC_IN_COLLAPSIBLE_ID), "OK")
                             .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
@@ -364,30 +338,34 @@ class SafetyCenterManagerTest {
             emptyList(),
             listOf(
                 SafetyCenterEntryOrGroup(
-                    safetyCenterEntryDefaultBuilder(SINGLE_SOURCE_ID).build())),
+                    safetyCenterCtsData.safetyCenterEntryDefault(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataFromConfig =
         SafetyCenterData(
-            safetyCenterStatusUnknown,
+            safetyCenterCtsData.safetyCenterStatusUnknown,
             emptyList(),
             listOf(
                 SafetyCenterEntryOrGroup(
-                    safetyCenterEntryDefaultBuilder(SINGLE_SOURCE_ID).build())),
+                    safetyCenterCtsData.safetyCenterEntryDefault(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataUnspecified =
         SafetyCenterData(
             safetyCenterStatusOk,
             emptyList(),
-            listOf(SafetyCenterEntryOrGroup(safetyCenterEntryUnspecified(SINGLE_SOURCE_ID))),
+            listOf(
+                SafetyCenterEntryOrGroup(
+                    safetyCenterCtsData.safetyCenterEntryUnspecified(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataOk =
         SafetyCenterData(
             safetyCenterStatusOk,
             emptyList(),
-            listOf(SafetyCenterEntryOrGroup(safetyCenterEntryOk(SINGLE_SOURCE_ID))),
+            listOf(
+                SafetyCenterEntryOrGroup(
+                    safetyCenterCtsData.safetyCenterEntryOk(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataOkWithIconAction =
@@ -396,7 +374,8 @@ class SafetyCenterManagerTest {
             emptyList(),
             listOf(
                 SafetyCenterEntryOrGroup(
-                    safetyCenterEntryOkBuilder(SINGLE_SOURCE_ID)
+                    safetyCenterCtsData
+                        .safetyCenterEntryOkBuilder(SINGLE_SOURCE_ID)
                         .setIconAction(
                             ICON_ACTION_TYPE_GEAR, safetySourceCtsData.redirectPendingIntent)
                         .build())),
@@ -404,16 +383,20 @@ class SafetyCenterManagerTest {
 
     private val safetyCenterDataUnknownReviewError =
         SafetyCenterData(
-            safetyCenterStatusUnknown,
+            safetyCenterCtsData.safetyCenterStatusUnknown,
             emptyList(),
-            listOf(SafetyCenterEntryOrGroup(safetyCenterEntryError(SINGLE_SOURCE_ID))),
+            listOf(
+                SafetyCenterEntryOrGroup(
+                    safetyCenterCtsData.safetyCenterEntryError(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataOkOneAlert =
         SafetyCenterData(
             safetyCenterStatusOkOneAlert,
-            listOf(safetyCenterIssueInformation(SINGLE_SOURCE_ID)),
-            listOf(SafetyCenterEntryOrGroup(safetyCenterEntryOk(SINGLE_SOURCE_ID))),
+            listOf(safetyCenterCtsData.safetyCenterIssueInformation(SINGLE_SOURCE_ID)),
+            listOf(
+                SafetyCenterEntryOrGroup(
+                    safetyCenterCtsData.safetyCenterEntryOk(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataOkReviewCriticalEntry =
@@ -433,62 +416,70 @@ class SafetyCenterManagerTest {
     private val safetyCenterDataOkReviewOneAlert =
         SafetyCenterData(
             safetyCenterStatusOkReviewOneAlert,
-            listOf(safetyCenterIssueInformation(SINGLE_SOURCE_ID)),
+            listOf(safetyCenterCtsData.safetyCenterIssueInformation(SINGLE_SOURCE_ID)),
             listOf(safetyCenterEntryOrGroupCritical),
             emptyList())
 
     private val safetyCenterDataGeneralRecommendationOneAlert =
         SafetyCenterData(
             safetyCenterStatusGeneralRecommendationOneAlert,
-            listOf(safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)),
-            listOf(SafetyCenterEntryOrGroup(safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))),
+            listOf(safetyCenterCtsData.safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)),
+            listOf(
+                SafetyCenterEntryOrGroup(
+                    safetyCenterCtsData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataAccountRecommendationOneAlert =
         SafetyCenterData(
             safetyCenterStatusAccountRecommendationOneAlert,
-            listOf(safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)),
-            listOf(SafetyCenterEntryOrGroup(safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))),
+            listOf(safetyCenterCtsData.safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)),
+            listOf(
+                SafetyCenterEntryOrGroup(
+                    safetyCenterCtsData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataDeviceRecommendationOneAlert =
         SafetyCenterData(
             safetyCenterStatusDeviceRecommendationOneAlert,
-            listOf(safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)),
-            listOf(SafetyCenterEntryOrGroup(safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))),
+            listOf(safetyCenterCtsData.safetyCenterIssueRecommendation(SINGLE_SOURCE_ID)),
+            listOf(
+                SafetyCenterEntryOrGroup(
+                    safetyCenterCtsData.safetyCenterEntryRecommendation(SINGLE_SOURCE_ID))),
             emptyList())
 
     private val safetyCenterDataGeneralCriticalOneAlert =
         SafetyCenterData(
             safetyCenterStatusGeneralCriticalOneAlert,
-            listOf(safetyCenterIssueCritical(SINGLE_SOURCE_ID)),
+            listOf(safetyCenterCtsData.safetyCenterIssueCritical(SINGLE_SOURCE_ID)),
             listOf(safetyCenterEntryOrGroupCritical),
             emptyList())
 
     private val safetyCenterDataAccountCriticalOneAlert =
         SafetyCenterData(
             safetyCenterStatusAccountCriticalOneAlert,
-            listOf(safetyCenterIssueCritical(SINGLE_SOURCE_ID)),
+            listOf(safetyCenterCtsData.safetyCenterIssueCritical(SINGLE_SOURCE_ID)),
             listOf(safetyCenterEntryOrGroupCritical),
             emptyList())
 
     private val safetyCenterDataDeviceCriticalOneAlert =
         SafetyCenterData(
             safetyCenterStatusDeviceCriticalOneAlert,
-            listOf(safetyCenterIssueCritical(SINGLE_SOURCE_ID)),
+            listOf(safetyCenterCtsData.safetyCenterIssueCritical(SINGLE_SOURCE_ID)),
             listOf(safetyCenterEntryOrGroupCritical),
             emptyList())
 
     private val safetyCenterDataCriticalOneAlertInFlight =
         SafetyCenterData(
             safetyCenterStatusGeneralCriticalOneAlert,
-            listOf(safetyCenterIssueCritical(SINGLE_SOURCE_ID, isActionInFlight = true)),
+            listOf(
+                safetyCenterCtsData.safetyCenterIssueCritical(
+                    SINGLE_SOURCE_ID, isActionInFlight = true)),
             listOf(safetyCenterEntryOrGroupCritical),
             emptyList())
 
     private val safetyCenterDataFromComplexConfig =
         SafetyCenterData(
-            safetyCenterStatusUnknown,
+            safetyCenterCtsData.safetyCenterStatusUnknown,
             emptyList(),
             listOf(
                 SafetyCenterEntryOrGroup(
@@ -500,15 +491,18 @@ class SafetyCenterManagerTest {
                         .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_PRIVACY)
                         .setEntries(
                             listOf(
-                                safetyCenterEntryDefaultBuilder(DYNAMIC_BAREBONE_ID).build(),
-                                safetyCenterEntryDefaultBuilder(DYNAMIC_ALL_OPTIONAL_ID)
+                                safetyCenterCtsData.safetyCenterEntryDefault(DYNAMIC_BAREBONE_ID),
+                                safetyCenterCtsData
+                                    .safetyCenterEntryDefaultBuilder(DYNAMIC_ALL_OPTIONAL_ID)
                                     .setEnabled(false)
                                     .build(),
-                                safetyCenterEntryDefaultBuilder(DYNAMIC_DISABLED_ID)
+                                safetyCenterCtsData
+                                    .safetyCenterEntryDefaultBuilder(DYNAMIC_DISABLED_ID)
                                     .setPendingIntent(null)
                                     .setEnabled(false)
                                     .build(),
-                                safetyCenterEntryDefaultBuilder(DYNAMIC_OTHER_PACKAGE_ID)
+                                safetyCenterCtsData
+                                    .safetyCenterEntryDefaultBuilder(DYNAMIC_OTHER_PACKAGE_ID)
                                     .setPendingIntent(null)
                                     .setEnabled(false)
                                     .build()))
@@ -520,14 +514,14 @@ class SafetyCenterManagerTest {
 
     private val safetyCenterDataFromComplexConfigUpdated =
         SafetyCenterData(
-            safetyCenterStatusCriticalSixAlerts,
+            safetyCenterCtsData.safetyCenterStatusCritical(6),
             listOf(
-                safetyCenterIssueCritical(DYNAMIC_BAREBONE_ID),
-                safetyCenterIssueCritical(ISSUE_ONLY_BAREBONE_ID),
-                safetyCenterIssueRecommendation(DYNAMIC_DISABLED_ID),
-                safetyCenterIssueRecommendation(ISSUE_ONLY_ALL_OPTIONAL_ID),
-                safetyCenterIssueInformation(DYNAMIC_IN_RIGID_ID),
-                safetyCenterIssueInformation(ISSUE_ONLY_IN_RIGID_ID)),
+                safetyCenterCtsData.safetyCenterIssueCritical(DYNAMIC_BAREBONE_ID),
+                safetyCenterCtsData.safetyCenterIssueCritical(ISSUE_ONLY_BAREBONE_ID),
+                safetyCenterCtsData.safetyCenterIssueRecommendation(DYNAMIC_DISABLED_ID),
+                safetyCenterCtsData.safetyCenterIssueRecommendation(ISSUE_ONLY_ALL_OPTIONAL_ID),
+                safetyCenterCtsData.safetyCenterIssueInformation(DYNAMIC_IN_RIGID_ID),
+                safetyCenterCtsData.safetyCenterIssueInformation(ISSUE_ONLY_IN_RIGID_ID)),
             listOf(
                 SafetyCenterEntryOrGroup(
                     SafetyCenterEntryGroup.Builder(
@@ -537,15 +531,19 @@ class SafetyCenterManagerTest {
                         .setSummary("Critical summary")
                         .setEntries(
                             listOf(
-                                safetyCenterEntryCritical(DYNAMIC_BAREBONE_ID),
-                                safetyCenterEntryDefaultBuilder(DYNAMIC_ALL_OPTIONAL_ID)
+                                safetyCenterCtsData.safetyCenterEntryCritical(DYNAMIC_BAREBONE_ID),
+                                safetyCenterCtsData
+                                    .safetyCenterEntryDefaultBuilder(DYNAMIC_ALL_OPTIONAL_ID)
                                     .setEnabled(false)
                                     .build(),
-                                safetyCenterEntryRecommendation(DYNAMIC_DISABLED_ID),
-                                safetyCenterEntryUnspecified(
+                                safetyCenterCtsData.safetyCenterEntryRecommendation(
+                                    DYNAMIC_DISABLED_ID),
+                                safetyCenterCtsData.safetyCenterEntryUnspecified(
                                     DYNAMIC_HIDDEN_ID, pendingIntent = null),
-                                safetyCenterEntryOk(DYNAMIC_HIDDEN_WITH_SEARCH_ID),
-                                safetyCenterEntryDefaultBuilder(DYNAMIC_OTHER_PACKAGE_ID)
+                                safetyCenterCtsData.safetyCenterEntryOk(
+                                    DYNAMIC_HIDDEN_WITH_SEARCH_ID),
+                                safetyCenterCtsData
+                                    .safetyCenterEntryDefaultBuilder(DYNAMIC_OTHER_PACKAGE_ID)
                                     .setPendingIntent(null)
                                     .setEnabled(false)
                                     .build()))
@@ -2275,7 +2273,7 @@ class SafetyCenterManagerTest {
         val group =
             safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
 
-        assertThat(group.summary).isEqualTo(getRefreshErrorString(2))
+        assertThat(group.summary).isEqualTo(safetyCenterCtsData.getRefreshErrorString(2))
         assertThat(group.severityLevel).isEqualTo(ENTRY_SEVERITY_LEVEL_UNKNOWN)
     }
 
@@ -2306,7 +2304,7 @@ class SafetyCenterManagerTest {
         val group =
             safetyCenterManager.getSafetyCenterDataWithPermission().getGroup(SUMMARY_TEST_GROUP_ID)
 
-        assertThat(group.summary).isEqualTo(getRefreshErrorString(1))
+        assertThat(group.summary).isEqualTo(safetyCenterCtsData.getRefreshErrorString(1))
         assertThat(group.severityLevel).isEqualTo(ENTRY_SEVERITY_LEVEL_UNKNOWN)
     }
 
@@ -2408,11 +2406,12 @@ class SafetyCenterManagerTest {
 
         val expectedSafetyCenterData =
             SafetyCenterData(
-                safetyCenterStatusUnknown,
+                safetyCenterCtsData.safetyCenterStatusUnknown,
                 emptyList(),
                 listOf(
                     SafetyCenterEntryOrGroup(
-                        safetyCenterEntryDefaultBuilder(SINGLE_SOURCE_ID)
+                        safetyCenterCtsData
+                            .safetyCenterEntryDefaultBuilder(SINGLE_SOURCE_ID)
                             .setPendingIntent(null)
                             .setEnabled(false)
                             .build())),
@@ -2434,7 +2433,8 @@ class SafetyCenterManagerTest {
                 emptyList(),
                 listOf(
                     SafetyCenterEntryOrGroup(
-                        safetyCenterEntryOkBuilder(SINGLE_SOURCE_ID)
+                        safetyCenterCtsData
+                            .safetyCenterEntryOkBuilder(SINGLE_SOURCE_ID)
                             .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
                             .setPendingIntent(null)
                             .setEnabled(false)
@@ -3428,122 +3428,6 @@ class SafetyCenterManagerTest {
             .first { it.entryGroup?.id == SafetyCenterCtsData.entryGroupId(groupId) }
             .entryGroup!!
 
-    private fun safetyCenterEntryDefaultBuilder(sourceId: String) =
-        SafetyCenterEntry.Builder(SafetyCenterCtsData.entryId(sourceId), "OK")
-            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
-            .setSummary("OK")
-            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
-            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-
-    private fun safetyCenterEntryError(sourceId: String) =
-        safetyCenterEntryDefaultBuilder(sourceId).setSummary(getRefreshErrorString(1)).build()
-
-    private fun safetyCenterEntryUnspecified(
-        sourceId: String,
-        pendingIntent: PendingIntent? = safetySourceCtsData.redirectPendingIntent
-    ) =
-        SafetyCenterEntry.Builder(SafetyCenterCtsData.entryId(sourceId), "Unspecified title")
-            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
-            .setSummary("Unspecified summary")
-            .setPendingIntent(pendingIntent)
-            .setEnabled(false)
-            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-            .build()
-
-    private fun safetyCenterEntryOkBuilder(sourceId: String) =
-        SafetyCenterEntry.Builder(SafetyCenterCtsData.entryId(sourceId), "Ok title")
-            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_OK)
-            .setSummary("Ok summary")
-            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
-            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-
-    private fun safetyCenterEntryOk(sourceId: String) = safetyCenterEntryOkBuilder(sourceId).build()
-
-    private fun safetyCenterEntryRecommendation(
-        sourceId: String,
-        summary: String = "Recommendation summary"
-    ) =
-        SafetyCenterEntry.Builder(SafetyCenterCtsData.entryId(sourceId), "Recommendation title")
-            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_RECOMMENDATION)
-            .setSummary(summary)
-            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
-            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-            .build()
-
-    private fun safetyCenterEntryCritical(sourceId: String) =
-        SafetyCenterEntry.Builder(SafetyCenterCtsData.entryId(sourceId), "Critical title")
-            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING)
-            .setSummary("Critical summary")
-            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
-            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
-            .build()
-
-    private fun safetyCenterIssueInformation(sourceId: String) =
-        SafetyCenterIssue.Builder(
-                SafetyCenterCtsData.issueId(sourceId, INFORMATION_ISSUE_ID),
-                "Information issue title",
-                "Information issue summary")
-            .setSeverityLevel(ISSUE_SEVERITY_LEVEL_OK)
-            .setShouldConfirmDismissal(false)
-            .setActions(
-                listOf(
-                    SafetyCenterIssue.Action.Builder(
-                            SafetyCenterCtsData.issueActionId(
-                                sourceId, INFORMATION_ISSUE_ID, INFORMATION_ISSUE_ACTION_ID),
-                            "Review",
-                            safetySourceCtsData.redirectPendingIntent)
-                        .build()))
-            .build()
-
-    private fun safetyCenterIssueRecommendation(sourceId: String) =
-        SafetyCenterIssue.Builder(
-                SafetyCenterCtsData.issueId(sourceId, RECOMMENDATION_ISSUE_ID),
-                "Recommendation issue title",
-                "Recommendation issue summary")
-            .setSeverityLevel(ISSUE_SEVERITY_LEVEL_RECOMMENDATION)
-            .setActions(
-                listOf(
-                    SafetyCenterIssue.Action.Builder(
-                            SafetyCenterCtsData.issueActionId(
-                                sourceId, RECOMMENDATION_ISSUE_ID, RECOMMENDATION_ISSUE_ACTION_ID),
-                            "See issue",
-                            safetySourceCtsData.redirectPendingIntent)
-                        .build()))
-            .build()
-
-    private fun safetyCenterIssueCritical(sourceId: String, isActionInFlight: Boolean = false) =
-        SafetyCenterIssue.Builder(
-                SafetyCenterCtsData.issueId(sourceId, CRITICAL_ISSUE_ID),
-                "Critical issue title",
-                "Critical issue summary")
-            .setSeverityLevel(ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING)
-            .setActions(
-                listOf(
-                    SafetyCenterIssue.Action.Builder(
-                            SafetyCenterCtsData.issueActionId(
-                                sourceId, CRITICAL_ISSUE_ID, CRITICAL_ISSUE_ACTION_ID),
-                            "Solve issue",
-                            safetySourceCtsData.criticalIssueActionPendingIntent)
-                        .setWillResolve(true)
-                        .setIsInFlight(isActionInFlight)
-                        .build()))
-            .build()
-
-    private fun getAlertString(numAlerts: Int): String =
-        getIcuPluralsString("overall_severity_n_alerts_summary", numAlerts)
-
-    private fun getRefreshErrorString(numberOfErrorEntries: Int): String =
-        getIcuPluralsString("refresh_error", numberOfErrorEntries)
-
-    private fun getIcuPluralsString(name: String, count: Int, vararg formatArgs: Any): String {
-        val messageFormat =
-            MessageFormat(
-                safetyCenterResourcesContext.getStringByName(name, formatArgs), Locale.getDefault())
-        val arguments = ArrayMap<String, Any>()
-        arguments["count"] = count
-        return messageFormat.format(arguments)
-    }
-
     companion object {
         private val RESURFACE_DELAY = Duration.ofMillis(500)
         // Wait 1.5 times the RESURFACE_DELAY before asserting whether an issue has or has not
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt
index 088bb83cd..8ef82f580 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsConfigs.kt
@@ -125,19 +125,21 @@ object SafetyCenterCtsConfigs {
     /**
      * ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG], containing sources:
      * [DYNAMIC_BAREBONE_ID], [DYNAMIC_ALL_OPTIONAL_ID], [DYNAMIC_DISABLED_ID], [DYNAMIC_HIDDEN_ID],
-     * [DYNAMIC_HIDDEN_WITH_SEARCH_ID], [DYNAMIC_OTHER_PACKAGE_ID].
+     * [DYNAMIC_HIDDEN_WITH_SEARCH_ID], [DYNAMIC_OTHER_PACKAGE_ID]. And provided by
+     * [COMPLEX_ALL_PROFILE_CONFIG], containing sources: [DYNAMIC_BAREBONE_ID],
+     * [DYNAMIC_DISABLED_ID], [DYNAMIC_HIDDEN_ID].
      */
     const val DYNAMIC_GROUP_ID = "dynamic"
 
     /**
-     * ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG], containing sources:
-     * [STATIC_BAREBONE_ID], [STATIC_ALL_OPTIONAL_ID].
+     * ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG],
+     * containing sources: [STATIC_BAREBONE_ID], [STATIC_ALL_OPTIONAL_ID].
      */
     const val STATIC_GROUP_ID = "static"
 
     /**
-     * ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG], containing sources:
-     * [ISSUE_ONLY_BAREBONE_ID], [ISSUE_ONLY_ALL_OPTIONAL_ID].
+     * ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG],
+     * containing sources: [ISSUE_ONLY_BAREBONE_ID], [ISSUE_ONLY_ALL_OPTIONAL_ID].
      */
     const val ISSUE_ONLY_GROUP_ID = "issue_only"
 
@@ -148,14 +150,15 @@ object SafetyCenterCtsConfigs {
     const val MIXED_COLLAPSIBLE_GROUP_ID = "mixed_collapsible"
 
     /**
-     * ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG], containing sources:
-     * [DYNAMIC_IN_RIGID_ID], [STATIC_IN_RIGID_ID].
+     * ID of a [SafetySourcesGroup] provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG],
+     * containing sources: [DYNAMIC_IN_RIGID_ID], [STATIC_IN_RIGID_ID], [ISSUE_ONLY_IN_RIGID_ID].
      */
     const val MIXED_RIGID_GROUP_ID = "mixed_rigid"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG] and [ANDROID_LOCK_SCREEN_SOURCES_CONFIG], this is
-     * a dynamic, primary profile only, visible source for which only the required fields are set.
+     * ID of a source provided by [COMPLEX_CONFIG], [COMPLEX_ALL_PROFILE_CONFIG], and
+     * [ANDROID_LOCK_SCREEN_SOURCES_CONFIG], this is a dynamic, primary profile only, visible source
+     * for which only the required fields are set.
      */
     const val DYNAMIC_BAREBONE_ID = "dynamic_barebone"
 
@@ -174,16 +177,16 @@ object SafetyCenterCtsConfigs {
     const val DYNAMIC_ALL_OPTIONAL_ID = "dynamic_all_optional"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG] and [ANDROID_LOCK_SCREEN_SOURCES_CONFIG], this is
-     * a dynamic, primary profile only, disabled by default source for which only the required
-     * fields are set.
+     * ID of a source provided by [COMPLEX_CONFIG], [COMPLEX_ALL_PROFILE_CONFIG], and
+     * [ANDROID_LOCK_SCREEN_SOURCES_CONFIG], this is a dynamic, disabled by default source for which
+     * only the required fields are set.
      */
     const val DYNAMIC_DISABLED_ID = "dynamic_disabled"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG] and [ANDROID_LOCK_SCREEN_SOURCES_CONFIG], this is
-     * a dynamic, primary profile only, hidden by default source for which only the required fields
-     * are set.
+     * ID of a source provided by [COMPLEX_CONFIG], [COMPLEX_ALL_PROFILE_CONFIG], and
+     * [ANDROID_LOCK_SCREEN_SOURCES_CONFIG], this ism a dynamic, hidden by default source for which
+     * only the required fields are set.
      */
     const val DYNAMIC_HIDDEN_ID = "dynamic_hidden"
 
@@ -194,27 +197,27 @@ object SafetyCenterCtsConfigs {
     const val DYNAMIC_HIDDEN_WITH_SEARCH_ID = "dynamic_hidden_with_search"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG], this is a static, primary profile only source
-     * for which only the required fields are set.
+     * ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is a
+     * static, primary profile only source for which only the required fields are set.
      */
     const val STATIC_BAREBONE_ID = "static_barebone"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG], this is a static, primary profile only source
-     * for which all the required and optional fields are set.
+     * ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is a
+     * static source for which all the required and optional fields are set.
      */
     const val STATIC_ALL_OPTIONAL_ID = "static_all_optional"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG], this is an issue-only, primary profile only
-     * source for which only the required fields are set.
+     * ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is an
+     * issue-only, primary profile only source for which only the required fields are set.
      */
     const val ISSUE_ONLY_BAREBONE_ID = "issue_only_barebone"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG], this is an issue-only, primary profile only
-     * source for which all the required and optional fields are set. Notably, this includes the
-     * refresh on page open flag and a max severity level of recommendation.
+     * ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is an
+     * issue-only source for which all the required and optional fields are set. Notably, this
+     * includes the refresh on page open flag and a max severity level of recommendation.
      */
     const val ISSUE_ONLY_ALL_OPTIONAL_ID = "issue_only_all_optional"
 
@@ -225,14 +228,14 @@ object SafetyCenterCtsConfigs {
     const val DYNAMIC_IN_COLLAPSIBLE_ID = "dynamic_in_collapsible"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG], this is a generic, dynamic, primary profile
-     * only, visible source.
+     * ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is a
+     * generic, dynamic, visible source.
      */
     const val DYNAMIC_IN_RIGID_ID = "dynamic_in_rigid"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG], this is an issue-only, primary profile only
-     * source.
+     * ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is an
+     * issue-only source.
      */
     const val ISSUE_ONLY_IN_RIGID_ID = "issue_only_in_rigid"
 
@@ -243,8 +246,8 @@ object SafetyCenterCtsConfigs {
     const val STATIC_IN_COLLAPSIBLE_ID = "static_in_collapsible"
 
     /**
-     * ID of a source provided by [COMPLEX_CONFIG], this is a generic, static, primary profile only
-     * source.
+     * ID of a source provided by [COMPLEX_CONFIG] and [COMPLEX_ALL_PROFILE_CONFIG], this is a
+     * generic, static source.
      */
     const val STATIC_IN_RIGID_ID = "static_in_rigid"
 
@@ -258,12 +261,7 @@ object SafetyCenterCtsConfigs {
     /** A Simple [SafetyCenterConfig] with an issue only source supporting all profiles. */
     val ISSUE_ONLY_SOURCE_ALL_PROFILE_CONFIG =
         singleSourceConfig(
-            SafetySource.Builder(SAFETY_SOURCE_TYPE_ISSUE_ONLY)
-                .setId(ISSUE_ONLY_ALL_PROFILE_SOURCE_ID)
-                .setPackageName(CTS_PACKAGE_NAME)
-                .setProfile(SafetySource.PROFILE_ALL)
-                .setRefreshOnPageOpenAllowed(true)
-                .build())
+            issueOnlyAllProfileSafetySourceBuilder(ISSUE_ONLY_ALL_PROFILE_SOURCE_ID).build())
 
     /** A dynamic source with [OTHER_PACKAGE_NAME] */
     val DYNAMIC_OTHER_PACKAGE_SAFETY_SOURCE =
@@ -275,20 +273,10 @@ object SafetyCenterCtsConfigs {
     /** A [SafetyCenterConfig] with a dynamic source in a different, missing package. */
     val SINGLE_SOURCE_OTHER_PACKAGE_CONFIG = singleSourceConfig(DYNAMIC_OTHER_PACKAGE_SAFETY_SOURCE)
 
-    private fun dynamicAllProfileSafetySourceBuilder() =
-        dynamicSafetySourceBuilder(SINGLE_SOURCE_ALL_PROFILE_ID)
-            .setProfile(SafetySource.PROFILE_ALL)
-            .setTitleForWorkResId(android.R.string.paste)
-
     /** A simple [SafetyCenterConfig] with a source supporting all profiles. */
     val SINGLE_SOURCE_ALL_PROFILE_CONFIG =
-        singleSourceConfig(dynamicAllProfileSafetySourceBuilder().build())
-
-    /**
-     * A simple [SafetyCenterConfig] with a source supporting all profiles with an invalid intent.
-     */
-    val SINGLE_SOURCE_ALL_PROFILE_INVALID_INTENT_CONFIG =
-        singleSourceConfig(dynamicAllProfileSafetySourceBuilder().setIntentAction("stub").build())
+        singleSourceConfig(
+            dynamicAllProfileSafetySourceBuilder(SINGLE_SOURCE_ALL_PROFILE_ID).build())
 
     /** A simple [SafetyCenterConfig] for CTS tests with multiple sources. */
     val MULTIPLE_SOURCES_CONFIG =
@@ -314,13 +302,6 @@ object SafetyCenterCtsConfigs {
             .setSummaryResId(android.R.string.autofill)
             .build()
 
-    /** Source provided by [STATIC_ALL_PROFILE_CONFIG]. */
-    val STATIC_ALL_PROFILE_SOURCE =
-        staticSafetySourceBuilder("cts_static_all_profile_source_id")
-            .setProfile(SafetySource.PROFILE_ALL)
-            .setTitleForWorkResId(android.R.string.dialog_alert_title)
-            .build()
-
     /** Source provided by [STATIC_SOURCES_CONFIG]. */
     val STATIC_SOURCE_2 =
         staticSafetySourceBuilder("cts_static_source_id_2")
@@ -340,16 +321,6 @@ object SafetyCenterCtsConfigs {
             .build()
 
     /**
-     * Source group provided by [STATIC_ALL_PROFILE_SOURCES_CONFIG] containing a single source of id
-     * [STATIC_GROUP_ID].
-     */
-    val STATIC_ALL_PROFILE_SOURCE_GROUP =
-        safetySourcesGroupBuilder(STATIC_GROUP_ID)
-            .setSummaryResId(Resources.ID_NULL)
-            .addSafetySource(STATIC_ALL_PROFILE_SOURCE)
-            .build()
-
-    /**
      * Source group provided by [STATIC_SOURCES_CONFIG] containing a single source of id
      * [STATIC_SOURCE_2].
      */
@@ -367,10 +338,6 @@ object SafetyCenterCtsConfigs {
             .addSafetySourcesGroup(STATIC_SOURCE_GROUP_2)
             .build()
 
-    /** A simple [SafetyCenterConfig] for CTS tests with static all profile source. */
-    val STATIC_ALL_PROFILE_SOURCES_CONFIG =
-        SafetyCenterConfig.Builder().addSafetySourcesGroup(STATIC_ALL_PROFILE_SOURCE_GROUP).build()
-
     /** [SafetyCenterConfig] used in CTS tests for Your Work Policy Info source. */
     fun Context.getWorkPolicyInfoConfig() =
         SafetyCenterConfig.Builder()
@@ -530,6 +497,69 @@ object SafetyCenterCtsConfigs {
                     .build())
             .build()
 
+    /**
+     * A complex [SafetyCenterConfig] exploring different combinations of valid sources and groups.
+     * Including sources that support all profiles.
+     */
+    val COMPLEX_ALL_PROFILE_CONFIG =
+        SafetyCenterConfig.Builder()
+            .addSafetySourcesGroup(
+                safetySourcesGroupBuilder(DYNAMIC_GROUP_ID)
+                    .addSafetySource(
+                        dynamicSafetySourceBuilder(DYNAMIC_BAREBONE_ID)
+                            .setRefreshOnPageOpenAllowed(false)
+                            .build())
+                    .addSafetySource(
+                        dynamicAllProfileSafetySourceBuilder(DYNAMIC_DISABLED_ID)
+                            .setIntentAction(null)
+                            .setInitialDisplayState(SafetySource.INITIAL_DISPLAY_STATE_DISABLED)
+                            .build())
+                    .addSafetySource(
+                        dynamicAllProfileSafetySourceBuilder(DYNAMIC_HIDDEN_ID)
+                            .setTitleResId(Resources.ID_NULL)
+                            .setTitleForWorkResId(Resources.ID_NULL)
+                            .setSummaryResId(Resources.ID_NULL)
+                            .setIntentAction(null)
+                            .setInitialDisplayState(SafetySource.INITIAL_DISPLAY_STATE_HIDDEN)
+                            .build())
+                    .build())
+            .addSafetySourcesGroup(
+                safetySourcesGroupBuilder(STATIC_GROUP_ID)
+                    .setStatelessIconType(SafetySourcesGroup.STATELESS_ICON_TYPE_PRIVACY)
+                    .addSafetySource(
+                        staticSafetySourceBuilder(STATIC_BAREBONE_ID)
+                            .setSummaryResId(Resources.ID_NULL)
+                            .build())
+                    .addSafetySource(
+                        staticAllProfileSafetySourceBuilder(STATIC_ALL_OPTIONAL_ID)
+                            .setSearchTermsResId(android.R.string.ok)
+                            .build())
+                    .build())
+            .addSafetySourcesGroup(
+                SafetySourcesGroup.Builder()
+                    .setId(ISSUE_ONLY_GROUP_ID)
+                    .addSafetySource(
+                        issueOnlySafetySourceBuilder(ISSUE_ONLY_BAREBONE_ID)
+                            .setRefreshOnPageOpenAllowed(false)
+                            .build())
+                    .addSafetySource(
+                        issueOnlyAllProfileSafetySourceBuilder(ISSUE_ONLY_ALL_OPTIONAL_ID)
+                            .setMaxSeverityLevel(SafetySourceData.SEVERITY_LEVEL_RECOMMENDATION)
+                            .setLoggingAllowed(false)
+                            .build())
+                    .build())
+            .addSafetySourcesGroup(
+                safetySourcesGroupBuilder(MIXED_RIGID_GROUP_ID)
+                    .setSummaryResId(Resources.ID_NULL)
+                    .addSafetySource(
+                        dynamicAllProfileSafetySourceBuilder(DYNAMIC_IN_RIGID_ID).build())
+                    .addSafetySource(
+                        staticAllProfileSafetySourceBuilder(STATIC_IN_RIGID_ID).build())
+                    .addSafetySource(
+                        issueOnlyAllProfileSafetySourceBuilder(ISSUE_ONLY_IN_RIGID_ID).build())
+                    .build())
+            .build()
+
     private fun dynamicSafetySource(id: String) = dynamicSafetySourceBuilder(id).build()
 
     private fun dynamicSafetySourceBuilder(id: String) =
@@ -542,6 +572,11 @@ object SafetyCenterCtsConfigs {
             .setProfile(SafetySource.PROFILE_PRIMARY)
             .setRefreshOnPageOpenAllowed(true)
 
+    private fun dynamicAllProfileSafetySourceBuilder(id: String) =
+        dynamicSafetySourceBuilder(id)
+            .setProfile(SafetySource.PROFILE_ALL)
+            .setTitleForWorkResId(android.R.string.paste)
+
     private fun staticSafetySource(id: String) = staticSafetySourceBuilder(id).build()
 
     private fun staticSafetySourceBuilder(id: String) =
@@ -552,6 +587,11 @@ object SafetyCenterCtsConfigs {
             .setIntentAction(ACTION_SAFETY_CENTER)
             .setProfile(SafetySource.PROFILE_PRIMARY)
 
+    private fun staticAllProfileSafetySourceBuilder(id: String) =
+        staticSafetySourceBuilder(id)
+            .setProfile(SafetySource.PROFILE_ALL)
+            .setTitleForWorkResId(android.R.string.paste)
+
     private fun issueOnlySafetySource(id: String) = issueOnlySafetySourceBuilder(id).build()
 
     private fun issueOnlySafetySourceBuilder(id: String) =
@@ -561,6 +601,9 @@ object SafetyCenterCtsConfigs {
             .setProfile(SafetySource.PROFILE_PRIMARY)
             .setRefreshOnPageOpenAllowed(true)
 
+    private fun issueOnlyAllProfileSafetySourceBuilder(id: String) =
+        issueOnlySafetySourceBuilder(id).setProfile(SafetySource.PROFILE_ALL)
+
     private fun safetySourcesGroupBuilder(id: String) =
         SafetySourcesGroup.Builder()
             .setId(id)
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsData.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsData.kt
index 578790e7e..38652f254 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsData.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetyCenterCtsData.kt
@@ -16,77 +16,349 @@
 
 package android.safetycenter.cts.testing
 
+import android.app.PendingIntent
+import android.content.Context
+import android.icu.text.MessageFormat
 import android.os.UserHandle
 import android.safetycenter.SafetyCenterData
+import android.safetycenter.SafetyCenterEntry
+import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING
+import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_OK
+import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_RECOMMENDATION
+import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNKNOWN
+import android.safetycenter.SafetyCenterEntry.ENTRY_SEVERITY_LEVEL_UNSPECIFIED
+import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON
+import android.safetycenter.SafetyCenterEntry.SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION
+import android.safetycenter.SafetyCenterIssue
+import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING
+import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_OK
+import android.safetycenter.SafetyCenterIssue.ISSUE_SEVERITY_LEVEL_RECOMMENDATION
 import android.safetycenter.SafetyCenterStatus
+import android.safetycenter.SafetyCenterStatus.OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING
 import android.safetycenter.SafetyCenterStatus.OVERALL_SEVERITY_LEVEL_UNKNOWN
+import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.CRITICAL_ISSUE_ACTION_ID
+import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.CRITICAL_ISSUE_ID
+import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.INFORMATION_ISSUE_ACTION_ID
+import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.INFORMATION_ISSUE_ID
 import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.ISSUE_TYPE_ID
+import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.RECOMMENDATION_ISSUE_ACTION_ID
+import android.safetycenter.cts.testing.SafetySourceCtsData.Companion.RECOMMENDATION_ISSUE_ID
+import android.util.ArrayMap
 import com.android.safetycenter.internaldata.SafetyCenterEntryGroupId
 import com.android.safetycenter.internaldata.SafetyCenterEntryId
 import com.android.safetycenter.internaldata.SafetyCenterIds
 import com.android.safetycenter.internaldata.SafetyCenterIssueActionId
 import com.android.safetycenter.internaldata.SafetyCenterIssueId
 import com.android.safetycenter.internaldata.SafetyCenterIssueKey
+import com.android.safetycenter.resources.SafetyCenterResourcesContext
+import java.util.Locale
 
 /**
  * A class that provides [SafetyCenterData] objects and associated constants to facilitate asserting
  * on specific Safety Center states in SafetyCenter for testing.
  */
-object SafetyCenterCtsData {
-
-    /** The default [SafetyCenterData] returned by the Safety Center APIs. */
-    val DEFAULT: SafetyCenterData =
-        SafetyCenterData(
-            SafetyCenterStatus.Builder("", "")
-                .setSeverityLevel(OVERALL_SEVERITY_LEVEL_UNKNOWN)
-                .build(),
-            emptyList(),
-            emptyList(),
-            emptyList())
-
-    /** Creates an ID for a Safety Center entry group. */
-    fun entryGroupId(sourcesGroupId: String) =
-        SafetyCenterIds.encodeToString(
-            SafetyCenterEntryGroupId.newBuilder().setSafetySourcesGroupId(sourcesGroupId).build())
-
-    /** Creates an ID for a Safety Center entry. */
-    fun entryId(sourceId: String, userId: Int = UserHandle.myUserId()) =
-        SafetyCenterIds.encodeToString(
-            SafetyCenterEntryId.newBuilder().setSafetySourceId(sourceId).setUserId(userId).build())
-
-    /** Creates an ID for a Safety Center issue. */
-    fun issueId(
+class SafetyCenterCtsData(context: Context) {
+
+    private val safetyCenterResourcesContext = SafetyCenterResourcesContext.forTests(context)
+    private val safetySourceCtsData = SafetySourceCtsData(context)
+
+    /**
+     * The [SafetyCenterStatus] used when the overall status is unknown and no scan is in progress.
+     */
+    val safetyCenterStatusUnknown =
+        SafetyCenterStatus.Builder(
+                safetyCenterResourcesContext.getStringByName(
+                    "overall_severity_level_ok_review_title"),
+                safetyCenterResourcesContext.getStringByName(
+                    "overall_severity_level_ok_review_summary"))
+            .setSeverityLevel(OVERALL_SEVERITY_LEVEL_UNKNOWN)
+            .build()
+
+    /**
+     * Returns the [SafetyCenterStatus] used when the overall status is critical and no scan is in
+     * progress for the given number of alerts.
+     */
+    fun safetyCenterStatusCritical(numAlerts: Int) =
+        SafetyCenterStatus.Builder(
+                safetyCenterResourcesContext.getStringByName(
+                    "overall_severity_level_critical_safety_warning_title"),
+                getAlertString(numAlerts))
+            .setSeverityLevel(OVERALL_SEVERITY_LEVEL_CRITICAL_WARNING)
+            .build()
+
+    /**
+     * Returns a [SafetyCenterEntry] builder with a grey icon (for unknown severity), the summary
+     * generally used for sources of the [SafetyCenterCtsConfigs], and a pending intent that
+     * redirects to Safety Center for the given source, user id, and title.
+     */
+    fun safetyCenterEntryDefaultBuilder(
         sourceId: String,
-        sourceIssueId: String,
-        issueTypeId: String = ISSUE_TYPE_ID,
-        userId: Int = UserHandle.myUserId()
+        userId: Int = UserHandle.myUserId(),
+        title: CharSequence = "OK"
+    ) =
+        SafetyCenterEntry.Builder(entryId(sourceId, userId), title)
+            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNKNOWN)
+            .setSummary("OK")
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
+            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
+
+    /**
+     * Returns a [SafetyCenterEntry] with a grey icon (for unknown severity), the summary generally
+     * used for sources of the [SafetyCenterCtsConfigs], and a pending intent that redirects to
+     * Safety Center for the given source, user id, and title.
+     */
+    fun safetyCenterEntryDefault(
+        sourceId: String,
+        userId: Int = UserHandle.myUserId(),
+        title: CharSequence = "OK"
+    ) = safetyCenterEntryDefaultBuilder(sourceId, userId, title).build()
+
+    /**
+     * Returns a [SafetyCenterEntry] builder with no icon, the summary generally used for sources of
+     * the [SafetyCenterCtsConfigs], and a pending intent that redirects to Safety Center for the
+     * given source, user id, and title.
+     */
+    fun safetyCenterEntryDefaultStaticBuilder(
+        sourceId: String,
+        userId: Int = UserHandle.myUserId(),
+        title: CharSequence = "OK"
+    ) =
+        SafetyCenterEntry.Builder(entryId(sourceId, userId), title)
+            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
+            .setSummary("OK")
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
+            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_ICON)
+
+    /**
+     * Returns a [SafetyCenterEntry] with a grey icon (for unknown severity), a refresh error
+     * summary, and a pending intent that redirects to Safety Center for the given source, user id,
+     * and title.
+     */
+    fun safetyCenterEntryError(sourceId: String) =
+        safetyCenterEntryDefaultBuilder(sourceId).setSummary(getRefreshErrorString(1)).build()
+
+    /**
+     * Returns a disabled [SafetyCenterEntry] with a grey icon (for unspecified severity), a
+     * standard summary, and a standard title for the given source and pending intent.
+     */
+    fun safetyCenterEntryUnspecified(
+        sourceId: String,
+        pendingIntent: PendingIntent? = safetySourceCtsData.redirectPendingIntent
+    ) =
+        SafetyCenterEntry.Builder(entryId(sourceId), "Unspecified title")
+            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_UNSPECIFIED)
+            .setSummary("Unspecified summary")
+            .setPendingIntent(pendingIntent)
+            .setEnabled(false)
+            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
+            .build()
+
+    /**
+     * Returns a [SafetyCenterEntry] builder with a green icon (for ok severity), a standard
+     * summary, and a pending intent that redirects to Safety Center for the given source, user id,
+     * and title.
+     */
+    fun safetyCenterEntryOkBuilder(
+        sourceId: String,
+        userId: Int = UserHandle.myUserId(),
+        title: CharSequence = "Ok title"
     ) =
-        SafetyCenterIds.encodeToString(
-            SafetyCenterIssueId.newBuilder()
-                .setSafetyCenterIssueKey(
-                    SafetyCenterIssueKey.newBuilder()
-                        .setSafetySourceId(sourceId)
-                        .setSafetySourceIssueId(sourceIssueId)
-                        .setUserId(userId)
-                        .build())
-                .setIssueTypeId(issueTypeId)
-                .build())
-
-    /** Creates an ID for a Safety Center issue action. */
-    fun issueActionId(
+        SafetyCenterEntry.Builder(entryId(sourceId, userId), title)
+            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_OK)
+            .setSummary("Ok summary")
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
+            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
+
+    /**
+     * Returns a [SafetyCenterEntry] with a green icon (for ok severity), a standard summary, and a
+     * pending intent that redirects to Safety Center for the given source, user id, and title.
+     */
+    fun safetyCenterEntryOk(
+        sourceId: String,
+        userId: Int = UserHandle.myUserId(),
+        title: CharSequence = "Ok title"
+    ) = safetyCenterEntryOkBuilder(sourceId, userId, title).build()
+
+    /**
+     * Returns a [SafetyCenterEntry] with a yellow icon (for recommendation severity), a standard
+     * title, and a pending intent that redirects to Safety Center for the given source and summary.
+     */
+    fun safetyCenterEntryRecommendation(
+        sourceId: String,
+        summary: String = "Recommendation summary"
+    ) =
+        SafetyCenterEntry.Builder(entryId(sourceId), "Recommendation title")
+            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_RECOMMENDATION)
+            .setSummary(summary)
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
+            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
+            .build()
+
+    /**
+     * Returns a [SafetyCenterEntry] with a red icon (for critical severity), a standard title, a
+     * standard summary, and a pending intent that redirects to Safety Center for the given source.
+     */
+    fun safetyCenterEntryCritical(sourceId: String) =
+        SafetyCenterEntry.Builder(entryId(sourceId), "Critical title")
+            .setSeverityLevel(ENTRY_SEVERITY_LEVEL_CRITICAL_WARNING)
+            .setSummary("Critical summary")
+            .setPendingIntent(safetySourceCtsData.redirectPendingIntent)
+            .setSeverityUnspecifiedIconType(SEVERITY_UNSPECIFIED_ICON_TYPE_NO_RECOMMENDATION)
+            .build()
+
+    /**
+     * Returns an information [SafetyCenterIssue] for the given source and user id that is
+     * consistent with information [SafetySourceIssue]s used in [SafetySourceCtsData].
+     */
+    fun safetyCenterIssueInformation(sourceId: String, userId: Int = UserHandle.myUserId()) =
+        SafetyCenterIssue.Builder(
+                issueId(sourceId, INFORMATION_ISSUE_ID, userId = userId),
+                "Information issue title",
+                "Information issue summary")
+            .setSeverityLevel(ISSUE_SEVERITY_LEVEL_OK)
+            .setShouldConfirmDismissal(false)
+            .setActions(
+                listOf(
+                    SafetyCenterIssue.Action.Builder(
+                            issueActionId(
+                                sourceId,
+                                INFORMATION_ISSUE_ID,
+                                INFORMATION_ISSUE_ACTION_ID,
+                                userId),
+                            "Review",
+                            safetySourceCtsData.redirectPendingIntent)
+                        .build()))
+            .build()
+
+    /**
+     * Returns a recommendation [SafetyCenterIssue] for the given source and user id that is
+     * consistent with recommendation [SafetySourceIssue]s used in [SafetySourceCtsData].
+     */
+    fun safetyCenterIssueRecommendation(sourceId: String, userId: Int = UserHandle.myUserId()) =
+        SafetyCenterIssue.Builder(
+                issueId(sourceId, RECOMMENDATION_ISSUE_ID, userId = userId),
+                "Recommendation issue title",
+                "Recommendation issue summary")
+            .setSeverityLevel(ISSUE_SEVERITY_LEVEL_RECOMMENDATION)
+            .setActions(
+                listOf(
+                    SafetyCenterIssue.Action.Builder(
+                            issueActionId(
+                                sourceId,
+                                RECOMMENDATION_ISSUE_ID,
+                                RECOMMENDATION_ISSUE_ACTION_ID,
+                                userId),
+                            "See issue",
+                            safetySourceCtsData.redirectPendingIntent)
+                        .build()))
+            .build()
+
+    /**
+     * Returns a critical [SafetyCenterIssue] for the given source and user id that is consistent
+     * with critical [SafetySourceIssue]s used in [SafetySourceCtsData].
+     */
+    fun safetyCenterIssueCritical(
         sourceId: String,
-        sourceIssueId: String,
-        sourceIssueActionId: String,
+        isActionInFlight: Boolean = false,
         userId: Int = UserHandle.myUserId()
     ) =
-        SafetyCenterIds.encodeToString(
-            SafetyCenterIssueActionId.newBuilder()
-                .setSafetyCenterIssueKey(
-                    SafetyCenterIssueKey.newBuilder()
-                        .setSafetySourceId(sourceId)
-                        .setSafetySourceIssueId(sourceIssueId)
-                        .setUserId(userId)
-                        .build())
-                .setSafetySourceIssueActionId(sourceIssueActionId)
-                .build())
+        SafetyCenterIssue.Builder(
+                issueId(sourceId, CRITICAL_ISSUE_ID, userId = userId),
+                "Critical issue title",
+                "Critical issue summary")
+            .setSeverityLevel(ISSUE_SEVERITY_LEVEL_CRITICAL_WARNING)
+            .setActions(
+                listOf(
+                    SafetyCenterIssue.Action.Builder(
+                            issueActionId(
+                                sourceId, CRITICAL_ISSUE_ID, CRITICAL_ISSUE_ACTION_ID, userId),
+                            "Solve issue",
+                            safetySourceCtsData.criticalIssueActionPendingIntent)
+                        .setWillResolve(true)
+                        .setIsInFlight(isActionInFlight)
+                        .build()))
+            .build()
+
+    /**
+     * Returns the [overall_severity_n_alerts_summary] string formatted for the given number of
+     * alerts.
+     */
+    fun getAlertString(numberOfAlerts: Int): String =
+        getIcuPluralsString("overall_severity_n_alerts_summary", numberOfAlerts)
+
+    /** Returns the [refresh_error] string formatted for the given number of error entries. */
+    fun getRefreshErrorString(numberOfErrorEntries: Int): String =
+        getIcuPluralsString("refresh_error", numberOfErrorEntries)
+
+    private fun getIcuPluralsString(name: String, count: Int, vararg formatArgs: Any): String {
+        val messageFormat =
+            MessageFormat(
+                safetyCenterResourcesContext.getStringByName(name, formatArgs), Locale.getDefault())
+        val arguments = ArrayMap<String, Any>()
+        arguments["count"] = count
+        return messageFormat.format(arguments)
+    }
+
+    companion object {
+        /** The default [SafetyCenterData] returned by the Safety Center APIs. */
+        val DEFAULT: SafetyCenterData =
+            SafetyCenterData(
+                SafetyCenterStatus.Builder("", "")
+                    .setSeverityLevel(OVERALL_SEVERITY_LEVEL_UNKNOWN)
+                    .build(),
+                emptyList(),
+                emptyList(),
+                emptyList())
+
+        /** Creates an ID for a Safety Center entry group. */
+        fun entryGroupId(sourcesGroupId: String) =
+            SafetyCenterIds.encodeToString(
+                SafetyCenterEntryGroupId.newBuilder()
+                    .setSafetySourcesGroupId(sourcesGroupId)
+                    .build())
+
+        /** Creates an ID for a Safety Center entry. */
+        fun entryId(sourceId: String, userId: Int = UserHandle.myUserId()) =
+            SafetyCenterIds.encodeToString(
+                SafetyCenterEntryId.newBuilder()
+                    .setSafetySourceId(sourceId)
+                    .setUserId(userId)
+                    .build())
+
+        /** Creates an ID for a Safety Center issue. */
+        fun issueId(
+            sourceId: String,
+            sourceIssueId: String,
+            issueTypeId: String = ISSUE_TYPE_ID,
+            userId: Int = UserHandle.myUserId()
+        ) =
+            SafetyCenterIds.encodeToString(
+                SafetyCenterIssueId.newBuilder()
+                    .setSafetyCenterIssueKey(
+                        SafetyCenterIssueKey.newBuilder()
+                            .setSafetySourceId(sourceId)
+                            .setSafetySourceIssueId(sourceIssueId)
+                            .setUserId(userId)
+                            .build())
+                    .setIssueTypeId(issueTypeId)
+                    .build())
+
+        /** Creates an ID for a Safety Center issue action. */
+        fun issueActionId(
+            sourceId: String,
+            sourceIssueId: String,
+            sourceIssueActionId: String,
+            userId: Int = UserHandle.myUserId()
+        ) =
+            SafetyCenterIds.encodeToString(
+                SafetyCenterIssueActionId.newBuilder()
+                    .setSafetyCenterIssueKey(
+                        SafetyCenterIssueKey.newBuilder()
+                            .setSafetySourceId(sourceId)
+                            .setSafetySourceIssueId(sourceIssueId)
+                            .setUserId(userId)
+                            .build())
+                    .setSafetySourceIssueActionId(sourceIssueActionId)
+                    .build())
+    }
 }
diff --git a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetySourceCtsData.kt b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetySourceCtsData.kt
index a1feb1619..a45673bd4 100644
--- a/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetySourceCtsData.kt
+++ b/tests/cts/safetycenter/src/android/safetycenter/cts/testing/SafetySourceCtsData.kt
@@ -97,7 +97,21 @@ class SafetySourceCtsData(private val context: Context) {
         SafetySourceData.Builder()
             .setStatus(
                 SafetySourceStatus.Builder(
-                        "Unspecified title", "Unspecified summary", SEVERITY_LEVEL_UNSPECIFIED)
+                    "Unspecified title", "Unspecified summary", SEVERITY_LEVEL_UNSPECIFIED)
+                    .setPendingIntent(redirectPendingIntent)
+                    .build())
+            .addIssue(informationIssue)
+            .build()
+
+    /**
+     * A [SafetySourceData] with a [SEVERITY_LEVEL_INFORMATION] redirecting [SafetySourceIssue] and
+     * a [SEVERITY_LEVEL_UNSPECIFIED] [SafetySourceStatus], to be used for a managed profile entry.
+     */
+    val unspecifiedWithIssueForWork =
+        SafetySourceData.Builder()
+            .setStatus(
+                SafetySourceStatus.Builder(
+                    "Unspecified title for Work", "Unspecified summary", SEVERITY_LEVEL_UNSPECIFIED)
                     .setPendingIntent(redirectPendingIntent)
                     .build())
             .addIssue(informationIssue)
@@ -138,26 +152,27 @@ class SafetySourceCtsData(private val context: Context) {
             .build()
 
     /**
-     * A [SafetySourceData] with a [SEVERITY_LEVEL_INFORMATION] [SafetySourceStatus], to be used for
-     * a managed profile entry.
+     * A [SafetySourceData] with a [SEVERITY_LEVEL_INFORMATION] redirecting [SafetySourceIssue] and
+     * [SafetySourceStatus].
      */
-    val informationForWork =
+    val informationWithIssue =
         SafetySourceData.Builder()
             .setStatus(
-                SafetySourceStatus.Builder(
-                        "Ok title for Work", "Ok summary", SEVERITY_LEVEL_INFORMATION)
+                SafetySourceStatus.Builder("Ok title", "Ok summary", SEVERITY_LEVEL_INFORMATION)
                     .setPendingIntent(redirectPendingIntent)
                     .build())
+            .addIssue(informationIssue)
             .build()
 
     /**
      * A [SafetySourceData] with a [SEVERITY_LEVEL_INFORMATION] redirecting [SafetySourceIssue] and
-     * [SafetySourceStatus].
+     * [SafetySourceStatus], to be used for a managed profile entry.
      */
-    val informationWithIssue =
+    val informationWithIssueForWork =
         SafetySourceData.Builder()
             .setStatus(
-                SafetySourceStatus.Builder("Ok title", "Ok summary", SEVERITY_LEVEL_INFORMATION)
+                SafetySourceStatus.Builder(
+                    "Ok title for Work", "Ok summary", SEVERITY_LEVEL_INFORMATION)
                     .setPendingIntent(redirectPendingIntent)
                     .build())
             .addIssue(informationIssue)