Merge "Respect PASSWORD_QUALITY_MANAGED for biometrics" into sc-qpr1-dev
diff --git a/res/raw/udfps_edu_lottie.json b/res/raw/udfps_edu_lottie.json
index 0240bce..c13a02f 100644
--- a/res/raw/udfps_edu_lottie.json
+++ b/res/raw/udfps_edu_lottie.json
@@ -2,7 +2,7 @@
   "v": "5.7.13",
   "fr": 60,
   "ip": 0,
-  "op": 481,
+  "op": 541,
   "w": 300,
   "h": 289,
   "nm": "enrollment_edu_02",
@@ -877,13 +877,13 @@
                     0
                   ]
                 },
-                "t": 399,
+                "t": 429,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 410,
+                "t": 440,
                 "s": [
                   0
                 ]
@@ -908,9 +908,9 @@
           "hd": false
         }
       ],
-      "ip": 388,
-      "op": 481,
-      "st": 202,
+      "ip": 418,
+      "op": 630,
+      "st": 232,
       "bm": 0
     },
     {
@@ -1786,13 +1786,13 @@
                     0
                   ]
                 },
-                "t": 350,
+                "t": 380,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 364,
+                "t": 394,
                 "s": [
                   0
                 ]
@@ -1812,9 +1812,9 @@
           "hd": false
         }
       ],
-      "ip": 339,
-      "op": 388,
-      "st": 202,
+      "ip": 369,
+      "op": 418,
+      "st": 232,
       "bm": 0
     },
     {
@@ -2685,13 +2685,13 @@
                     0
                   ]
                 },
-                "t": 305,
+                "t": 335,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 318,
+                "t": 348,
                 "s": [
                   0
                 ]
@@ -2716,9 +2716,9 @@
           "hd": false
         }
       ],
-      "ip": 294,
-      "op": 339,
-      "st": 101,
+      "ip": 324,
+      "op": 369,
+      "st": 131,
       "bm": 0
     },
     {
@@ -3594,13 +3594,13 @@
                     0
                   ]
                 },
-                "t": 255,
+                "t": 285,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 269,
+                "t": 299,
                 "s": [
                   0
                 ]
@@ -3620,9 +3620,9 @@
           "hd": false
         }
       ],
-      "ip": 248,
-      "op": 294,
-      "st": 101,
+      "ip": 278,
+      "op": 324,
+      "st": 131,
       "bm": 0
     },
     {
@@ -4493,13 +4493,13 @@
                     0
                   ]
                 },
-                "t": 202,
+                "t": 232,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 215,
+                "t": 245,
                 "s": [
                   0
                 ]
@@ -4524,9 +4524,9 @@
           "hd": false
         }
       ],
-      "ip": 188,
-      "op": 248,
-      "st": 0,
+      "ip": 218,
+      "op": 278,
+      "st": 30,
       "bm": 0
     },
     {
@@ -5402,13 +5402,13 @@
                     0
                   ]
                 },
-                "t": 155,
+                "t": 185,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 169,
+                "t": 199,
                 "s": [
                   0
                 ]
@@ -5428,9 +5428,9 @@
           "hd": false
         }
       ],
-      "ip": 130,
-      "op": 188,
-      "st": 0,
+      "ip": 160,
+      "op": 218,
+      "st": 30,
       "bm": 0
     },
     {
@@ -6301,13 +6301,13 @@
                     0
                   ]
                 },
-                "t": 108,
+                "t": 138,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 119,
+                "t": 149,
                 "s": [
                   0
                 ]
@@ -6333,8 +6333,8 @@
         }
       ],
       "ip": 0,
-      "op": 130,
-      "st": 0,
+      "op": 160,
+      "st": 30,
       "bm": 0
     },
     {
@@ -7210,13 +7210,13 @@
                     0
                   ]
                 },
-                "t": 62,
+                "t": 92,
                 "s": [
                   100
                 ]
               },
               {
-                "t": 76,
+                "t": 106,
                 "s": [
                   0
                 ]
@@ -7237,8 +7237,8 @@
         }
       ],
       "ip": 0,
-      "op": 130,
-      "st": 0,
+      "op": 160,
+      "st": 30,
       "bm": 0
     },
     {
@@ -8112,8 +8112,8 @@
         }
       ],
       "ip": 0,
-      "op": 481,
-      "st": 0,
+      "op": 630,
+      "st": 30,
       "bm": 0
     },
     {
@@ -8181,7 +8181,7 @@
                   0
                 ]
               },
-              "t": 62,
+              "t": 92,
               "s": [
                 17.82,
                 17.82,
@@ -8213,7 +8213,7 @@
                   0
                 ]
               },
-              "t": 72,
+              "t": 102,
               "s": [
                 16.92,
                 16.92,
@@ -8245,7 +8245,7 @@
                   0
                 ]
               },
-              "t": 108,
+              "t": 138,
               "s": [
                 16.92,
                 16.92,
@@ -8277,7 +8277,7 @@
                   0
                 ]
               },
-              "t": 118,
+              "t": 148,
               "s": [
                 17.82,
                 17.82,
@@ -8309,7 +8309,7 @@
                   0
                 ]
               },
-              "t": 155,
+              "t": 185,
               "s": [
                 17.82,
                 17.82,
@@ -8341,7 +8341,7 @@
                   0
                 ]
               },
-              "t": 165,
+              "t": 195,
               "s": [
                 16.92,
                 16.92,
@@ -8373,7 +8373,7 @@
                   0
                 ]
               },
-              "t": 202,
+              "t": 232,
               "s": [
                 16.92,
                 16.92,
@@ -8405,7 +8405,7 @@
                   0
                 ]
               },
-              "t": 212,
+              "t": 242,
               "s": [
                 17.82,
                 17.82,
@@ -8437,7 +8437,7 @@
                   0
                 ]
               },
-              "t": 255,
+              "t": 285,
               "s": [
                 17.82,
                 17.82,
@@ -8469,7 +8469,7 @@
                   0
                 ]
               },
-              "t": 265,
+              "t": 295,
               "s": [
                 16.92,
                 16.92,
@@ -8501,7 +8501,7 @@
                   0
                 ]
               },
-              "t": 305,
+              "t": 335,
               "s": [
                 16.92,
                 16.92,
@@ -8533,7 +8533,7 @@
                   0
                 ]
               },
-              "t": 315,
+              "t": 345,
               "s": [
                 17.82,
                 17.82,
@@ -8565,7 +8565,7 @@
                   0
                 ]
               },
-              "t": 350,
+              "t": 380,
               "s": [
                 17.82,
                 17.82,
@@ -8597,7 +8597,7 @@
                   0
                 ]
               },
-              "t": 360,
+              "t": 390,
               "s": [
                 16.92,
                 16.92,
@@ -8629,7 +8629,7 @@
                   0
                 ]
               },
-              "t": 399,
+              "t": 429,
               "s": [
                 16.92,
                 16.92,
@@ -8637,7 +8637,7 @@
               ]
             },
             {
-              "t": 409,
+              "t": 439,
               "s": [
                 17.82,
                 17.82,
@@ -8699,7 +8699,7 @@
                         0.167
                       ]
                     },
-                    "t": 62,
+                    "t": 92,
                     "s": [
                       0.247058838489,
                       0.305882352941,
@@ -8724,7 +8724,7 @@
                         0.167
                       ]
                     },
-                    "t": 68,
+                    "t": 98,
                     "s": [
                       0.105882360421,
                       0.152941176471,
@@ -8749,7 +8749,7 @@
                         0.167
                       ]
                     },
-                    "t": 108,
+                    "t": 138,
                     "s": [
                       0.105882360421,
                       0.152941176471,
@@ -8774,7 +8774,7 @@
                         0.167
                       ]
                     },
-                    "t": 113,
+                    "t": 143,
                     "s": [
                       0.247058838489,
                       0.305882352941,
@@ -8799,7 +8799,7 @@
                         0.167
                       ]
                     },
-                    "t": 155,
+                    "t": 185,
                     "s": [
                       0.247058838489,
                       0.305882352941,
@@ -8824,7 +8824,7 @@
                         0.167
                       ]
                     },
-                    "t": 160,
+                    "t": 190,
                     "s": [
                       0.117647059262,
                       0.152941182256,
@@ -8849,7 +8849,7 @@
                         0.167
                       ]
                     },
-                    "t": 202,
+                    "t": 232,
                     "s": [
                       0.117647059262,
                       0.152941182256,
@@ -8874,7 +8874,7 @@
                         0.167
                       ]
                     },
-                    "t": 207,
+                    "t": 237,
                     "s": [
                       0.258823543787,
                       0.305882364511,
@@ -8899,7 +8899,7 @@
                         0.167
                       ]
                     },
-                    "t": 255,
+                    "t": 285,
                     "s": [
                       0.258823543787,
                       0.305882364511,
@@ -8924,7 +8924,7 @@
                         0.167
                       ]
                     },
-                    "t": 260,
+                    "t": 290,
                     "s": [
                       0.117647059262,
                       0.152941182256,
@@ -8949,7 +8949,7 @@
                         0.167
                       ]
                     },
-                    "t": 305,
+                    "t": 335,
                     "s": [
                       0.117647059262,
                       0.152941182256,
@@ -8974,7 +8974,7 @@
                         0.167
                       ]
                     },
-                    "t": 310,
+                    "t": 340,
                     "s": [
                       0.258823543787,
                       0.305882364511,
@@ -8999,7 +8999,7 @@
                         0.167
                       ]
                     },
-                    "t": 350,
+                    "t": 380,
                     "s": [
                       0.258823543787,
                       0.305882364511,
@@ -9024,7 +9024,7 @@
                         0.167
                       ]
                     },
-                    "t": 355,
+                    "t": 385,
                     "s": [
                       0.117647059262,
                       0.152941182256,
@@ -9049,7 +9049,7 @@
                         0.167
                       ]
                     },
-                    "t": 399,
+                    "t": 429,
                     "s": [
                       0.117647059262,
                       0.152941182256,
@@ -9058,7 +9058,7 @@
                     ]
                   },
                   {
-                    "t": 404,
+                    "t": 434,
                     "s": [
                       0.258823543787,
                       0.305882364511,
@@ -9139,8 +9139,8 @@
         }
       ],
       "ip": 0,
-      "op": 481,
-      "st": 0,
+      "op": 630,
+      "st": 30,
       "bm": 0
     },
     {
@@ -9565,7 +9565,7 @@
                         0.167
                       ]
                     },
-                    "t": 30,
+                    "t": 60,
                     "s": [
                       100
                     ]
@@ -9587,7 +9587,7 @@
                         0.167
                       ]
                     },
-                    "t": 40,
+                    "t": 70,
                     "s": [
                       0
                     ]
@@ -9609,13 +9609,13 @@
                         0.167
                       ]
                     },
-                    "t": 459,
+                    "t": 489,
                     "s": [
                       0
                     ]
                   },
                   {
-                    "t": 469,
+                    "t": 499,
                     "s": [
                       100
                     ]
@@ -9688,8 +9688,8 @@
         }
       ],
       "ip": 0,
-      "op": 481,
-      "st": 0,
+      "op": 630,
+      "st": 30,
       "bm": 0
     },
     {
@@ -9835,13 +9835,13 @@
                         0.167
                       ]
                     },
-                    "t": 457,
+                    "t": 487,
                     "s": [
                       100
                     ]
                   },
                   {
-                    "t": 460,
+                    "t": 490,
                     "s": [
                       0
                     ]
@@ -9946,13 +9946,13 @@
                     0
                   ]
                 },
-                "t": 403,
+                "t": 433,
                 "s": [
                   0
                 ]
               },
               {
-                "t": 417,
+                "t": 447,
                 "s": [
                   100
                 ]
@@ -9972,9 +9972,9 @@
           "hd": false
         }
       ],
-      "ip": 399,
-      "op": 460,
-      "st": 0,
+      "ip": 429,
+      "op": 630,
+      "st": 30,
       "bm": 0
     },
     {
@@ -10042,7 +10042,7 @@
                   0
                 ]
               },
-              "t": 399,
+              "t": 429,
               "s": [
                 7.2,
                 7.2,
@@ -10074,7 +10074,7 @@
                   0
                 ]
               },
-              "t": 407,
+              "t": 437,
               "s": [
                 19.525,
                 19.525,
@@ -10106,7 +10106,7 @@
                   0
                 ]
               },
-              "t": 424,
+              "t": 454,
               "s": [
                 17.185,
                 17.185,
@@ -10138,7 +10138,7 @@
                   0
                 ]
               },
-              "t": 450,
+              "t": 480,
               "s": [
                 17.185,
                 17.185,
@@ -10146,7 +10146,7 @@
               ]
             },
             {
-              "t": 460,
+              "t": 490,
               "s": [
                 7.2,
                 7.2,
@@ -10218,13 +10218,13 @@
                         0.167
                       ]
                     },
-                    "t": 452,
+                    "t": 482,
                     "s": [
                       100
                     ]
                   },
                   {
-                    "t": 460,
+                    "t": 490,
                     "s": [
                       0
                     ]
@@ -10277,13 +10277,13 @@
                         0.167
                       ]
                     },
-                    "t": 452,
+                    "t": 482,
                     "s": [
                       100
                     ]
                   },
                   {
-                    "t": 460,
+                    "t": 490,
                     "s": [
                       0
                     ]
@@ -10355,9 +10355,9 @@
           "hd": false
         }
       ],
-      "ip": 399,
-      "op": 460,
-      "st": 0,
+      "ip": 429,
+      "op": 630,
+      "st": 30,
       "bm": 0
     },
     {
@@ -10468,13 +10468,13 @@
                         0.167
                       ]
                     },
-                    "t": 450,
+                    "t": 480,
                     "s": [
                       100
                     ]
                   },
                   {
-                    "t": 456,
+                    "t": 486,
                     "s": [
                       0
                     ]
@@ -10553,9 +10553,9 @@
           "hd": false
         }
       ],
-      "ip": 447,
-      "op": 481,
-      "st": 0,
+      "ip": 477,
+      "op": 630,
+      "st": 30,
       "bm": 0
     },
     {
@@ -10748,7 +10748,7 @@
                     0
                   ]
                 },
-                "t": 350,
+                "t": 380,
                 "s": [
                   0
                 ]
@@ -10770,13 +10770,13 @@
                     0
                   ]
                 },
-                "t": 399,
+                "t": 429,
                 "s": [
                   22.5
                 ]
               },
               {
-                "t": 410,
+                "t": 440,
                 "s": [
                   26
                 ]
@@ -10796,9 +10796,9 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     },
     {
@@ -10909,13 +10909,13 @@
                         0.167
                       ]
                     },
-                    "t": 39,
+                    "t": 69,
                     "s": [
                       0
                     ]
                   },
                   {
-                    "t": 49,
+                    "t": 79,
                     "s": [
                       100
                     ]
@@ -11017,9 +11017,9 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     },
     {
@@ -11212,7 +11212,7 @@
                     0
                   ]
                 },
-                "t": 255,
+                "t": 285,
                 "s": [
                   0
                 ]
@@ -11234,7 +11234,7 @@
                     0
                   ]
                 },
-                "t": 305,
+                "t": 335,
                 "s": [
                   22.5
                 ]
@@ -11256,13 +11256,13 @@
                     0
                   ]
                 },
-                "t": 399,
+                "t": 429,
                 "s": [
                   22.5
                 ]
               },
               {
-                "t": 410,
+                "t": 440,
                 "s": [
                   26
                 ]
@@ -11282,9 +11282,9 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     },
     {
@@ -11395,13 +11395,13 @@
                         0.167
                       ]
                     },
-                    "t": 39,
+                    "t": 69,
                     "s": [
                       0
                     ]
                   },
                   {
-                    "t": 49,
+                    "t": 79,
                     "s": [
                       100
                     ]
@@ -11503,9 +11503,9 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     },
     {
@@ -11698,7 +11698,7 @@
                     0
                   ]
                 },
-                "t": 155,
+                "t": 185,
                 "s": [
                   0
                 ]
@@ -11720,7 +11720,7 @@
                     0
                   ]
                 },
-                "t": 202,
+                "t": 232,
                 "s": [
                   22.5
                 ]
@@ -11742,13 +11742,13 @@
                     0
                   ]
                 },
-                "t": 399,
+                "t": 429,
                 "s": [
                   22.5
                 ]
               },
               {
-                "t": 410,
+                "t": 440,
                 "s": [
                   26
                 ]
@@ -11768,9 +11768,9 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     },
     {
@@ -11881,13 +11881,13 @@
                         0.167
                       ]
                     },
-                    "t": 39,
+                    "t": 69,
                     "s": [
                       0
                     ]
                   },
                   {
-                    "t": 49,
+                    "t": 79,
                     "s": [
                       100
                     ]
@@ -11989,9 +11989,9 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     },
     {
@@ -12184,7 +12184,7 @@
                     0
                   ]
                 },
-                "t": 62,
+                "t": 92,
                 "s": [
                   0
                 ]
@@ -12206,7 +12206,7 @@
                     0
                   ]
                 },
-                "t": 108,
+                "t": 138,
                 "s": [
                   22.5
                 ]
@@ -12228,13 +12228,13 @@
                     0
                   ]
                 },
-                "t": 399,
+                "t": 429,
                 "s": [
                   22.5
                 ]
               },
               {
-                "t": 410,
+                "t": 440,
                 "s": [
                   26
                 ]
@@ -12254,9 +12254,9 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     },
     {
@@ -12367,13 +12367,13 @@
                         0.167
                       ]
                     },
-                    "t": 39,
+                    "t": 69,
                     "s": [
                       0
                     ]
                   },
                   {
-                    "t": 49,
+                    "t": 79,
                     "s": [
                       100
                     ]
@@ -12475,11 +12475,11 @@
           "hd": false
         }
       ],
-      "ip": 0,
-      "op": 447,
-      "st": 0,
+      "ip": -7,
+      "op": 477,
+      "st": 30,
       "bm": 0
     }
   ],
   "markers": []
-}
+}
\ No newline at end of file
diff --git a/res/values-af/arrays.xml b/res/values-af/arrays.xml
index 0f73dbc..879a0f0 100644
--- a/res/values-af/arrays.xml
+++ b/res/values-af/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Gekas (aktiwiteitkliënt)"</item>
     <item msgid="8186970968968646288">"Gekas (leeg)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blougroen"</item>
+    <item msgid="7216413848731287689">"Groenblou"</item>
     <item msgid="5661027589207588703">"Blou"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Groen"</item>
     <item msgid="6331809026622602308">"Pers"</item>
     <item msgid="6390546163902724700">"Pienk"</item>
-    <item msgid="6618900408138432102">"Rooi"</item>
+    <item msgid="6500473130620545980">"Oranje"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Meer as 30 dae oud"</item>
diff --git a/res/values-am/arrays.xml b/res/values-am/arrays.xml
index 5f06fbf..794942b 100644
--- a/res/values-am/arrays.xml
+++ b/res/values-am/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"የተሸጎጠ (የእንቅስቃሴ ደንበኛ)"</item>
     <item msgid="8186970968968646288">"የተሸጎጠ (ባዶ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ጥቁር አረንጓዴ-ሰማያዊ"</item>
+    <item msgid="7216413848731287689">"ሳያን"</item>
     <item msgid="5661027589207588703">"ሰማያዊ"</item>
-    <item msgid="3795787248113275442">"ወይን ጠጅ"</item>
+    <item msgid="1219738214736244749">"አረንጓዴ"</item>
     <item msgid="6331809026622602308">"ሐምራዊ"</item>
     <item msgid="6390546163902724700">"ሮዝ"</item>
-    <item msgid="6618900408138432102">"ቀይ"</item>
+    <item msgid="6500473130620545980">"ብርቱካናማ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"ከ30 ቀኖች በላይ የሆናቸው"</item>
diff --git a/res/values-ar/arrays.xml b/res/values-ar/arrays.xml
index e8f4b7e..2f19c46 100644
--- a/res/values-ar/arrays.xml
+++ b/res/values-ar/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"تخزين مؤقت (برنامج النشاط)"</item>
     <item msgid="8186970968968646288">"تخزين مؤقت (فارغ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"أزرق مخضر"</item>
+    <item msgid="7216413848731287689">"سماوي"</item>
     <item msgid="5661027589207588703">"أزرق"</item>
-    <item msgid="3795787248113275442">"نيلي"</item>
+    <item msgid="1219738214736244749">"أخضر"</item>
     <item msgid="6331809026622602308">"أرجواني"</item>
     <item msgid="6390546163902724700">"قرنفلي"</item>
-    <item msgid="6618900408138432102">"أحمر"</item>
+    <item msgid="6500473130620545980">"برتقالي"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"تم إنشاؤها قبل أكثر من 30 يومًا."</item>
diff --git a/res/values-as/arrays.xml b/res/values-as/arrays.xml
index 8ffed81..7e9132b 100644
--- a/res/values-as/arrays.xml
+++ b/res/values-as/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"কেশ্ব কৰা হোৱা (কাৰ্যকলাপ গ্ৰাহক)"</item>
     <item msgid="8186970968968646288">"কেশ্ব কৰা হোৱা (খালী)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"গাঢ় সেউজ-নীলা"</item>
+    <item msgid="7216413848731287689">"সেউজ নীলা"</item>
     <item msgid="5661027589207588703">"নীলা"</item>
-    <item msgid="3795787248113275442">"ইণ্ডিগ\'"</item>
+    <item msgid="1219738214736244749">"সেউজীয়া"</item>
     <item msgid="6331809026622602308">"বেঙুনীয়া"</item>
     <item msgid="6390546163902724700">"গুলপীয়া"</item>
-    <item msgid="6618900408138432102">"ৰঙা"</item>
+    <item msgid="6500473130620545980">"কমলা"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"৩০দিনতকৈ অধিক পুৰণি"</item>
diff --git a/res/values-az/arrays.xml b/res/values-az/arrays.xml
index 70de5cb..08a2243 100644
--- a/res/values-az/arrays.xml
+++ b/res/values-az/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keşlənmiş (fəaliyyət klienti)"</item>
     <item msgid="8186970968968646288">"Keşlənmiş (boş)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Firuzəyi"</item>
+    <item msgid="7216413848731287689">"Mavi"</item>
     <item msgid="5661027589207588703">"Göy"</item>
-    <item msgid="3795787248113275442">"İndiqo"</item>
+    <item msgid="1219738214736244749">"Yaşıl"</item>
     <item msgid="6331809026622602308">"Bənövşəyi"</item>
     <item msgid="6390546163902724700">"Çəhrayı"</item>
-    <item msgid="6618900408138432102">"Qırmızı"</item>
+    <item msgid="6500473130620545980">"Narıncı"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 gündən köhnə"</item>
diff --git a/res/values-b+sr+Latn/arrays.xml b/res/values-b+sr+Latn/arrays.xml
index 8a03b5f..3c3be0f 100644
--- a/res/values-b+sr+Latn/arrays.xml
+++ b/res/values-b+sr+Latn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keširana (klijent aktivnosti)"</item>
     <item msgid="8186970968968646288">"Keširana (prazno)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Plavozelena"</item>
+    <item msgid="7216413848731287689">"Tirkizna"</item>
     <item msgid="5661027589207588703">"Plava"</item>
-    <item msgid="3795787248113275442">"Tamnoplava"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Ljubičasta"</item>
     <item msgid="6390546163902724700">"Roze"</item>
-    <item msgid="6618900408138432102">"Crvena"</item>
+    <item msgid="6500473130620545980">"Narandžasta"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starije od 30 dana"</item>
diff --git a/res/values-be/arrays.xml b/res/values-be/arrays.xml
index c890c97..bb99c97 100644
--- a/res/values-be/arrays.xml
+++ b/res/values-be/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кэшавана (кліент дзейнасці)"</item>
     <item msgid="8186970968968646288">"Кэшавана (пуста)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Сіне-зялёны"</item>
+    <item msgid="7216413848731287689">"Блакітны"</item>
     <item msgid="5661027589207588703">"Сiнi"</item>
-    <item msgid="3795787248113275442">"Індыга"</item>
+    <item msgid="1219738214736244749">"Зялёны"</item>
     <item msgid="6331809026622602308">"Фіялетавы"</item>
     <item msgid="6390546163902724700">"Ружовы"</item>
-    <item msgid="6618900408138432102">"Чырвоны"</item>
+    <item msgid="6500473130620545980">"Аранжавы"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Старэйшыя за 30 дзён"</item>
diff --git a/res/values-bg/arrays.xml b/res/values-bg/arrays.xml
index 8146b3b..bcb64eb 100644
--- a/res/values-bg/arrays.xml
+++ b/res/values-bg/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеширано (клиентска програма за активността)"</item>
     <item msgid="8186970968968646288">"Кеширано (празно)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"синьо-зелено"</item>
+    <item msgid="7216413848731287689">"синьо-зелено"</item>
     <item msgid="5661027589207588703">"синьо"</item>
-    <item msgid="3795787248113275442">"индиго"</item>
+    <item msgid="1219738214736244749">"зелено"</item>
     <item msgid="6331809026622602308">"лилаво"</item>
     <item msgid="6390546163902724700">"розово"</item>
-    <item msgid="6618900408138432102">"червено"</item>
+    <item msgid="6500473130620545980">"оранжево"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"По-стари от 30 дни"</item>
diff --git a/res/values-bn/arrays.xml b/res/values-bn/arrays.xml
index 1f1afe9..03504a4 100644
--- a/res/values-bn/arrays.xml
+++ b/res/values-bn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ব্যবহৃত ক্যাশে (অ্যাক্টিভিটি ক্লায়েন্ট)"</item>
     <item msgid="8186970968968646288">"ব্যবহৃত ক্যাশে (খালি)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"টিল"</item>
+    <item msgid="7216413848731287689">"নীলাভ রঙ"</item>
     <item msgid="5661027589207588703">"নীল"</item>
-    <item msgid="3795787248113275442">"বেগুনী নীলবর্ণ"</item>
+    <item msgid="1219738214736244749">"সবুজ রঙ"</item>
     <item msgid="6331809026622602308">"বেগুনী"</item>
     <item msgid="6390546163902724700">"গোলাপী"</item>
-    <item msgid="6618900408138432102">"লাল"</item>
+    <item msgid="6500473130620545980">"কমলা রঙ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"৩০ দিনের বেশি পুরনো"</item>
diff --git a/res/values-bs/arrays.xml b/res/values-bs/arrays.xml
index 2f727e8..8e60228 100644
--- a/res/values-bs/arrays.xml
+++ b/res/values-bs/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keširana (aktivnost klijenta)"</item>
     <item msgid="8186970968968646288">"Keširano (prazno)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Plavozelena"</item>
+    <item msgid="7216413848731287689">"Cijan"</item>
     <item msgid="5661027589207588703">"Plava"</item>
-    <item msgid="3795787248113275442">"Indigoplava"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Ljubičasta"</item>
     <item msgid="6390546163902724700">"Ružičasta"</item>
-    <item msgid="6618900408138432102">"Crvena"</item>
+    <item msgid="6500473130620545980">"Narandžasta"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starije od 30 dana"</item>
diff --git a/res/values-ca/arrays.xml b/res/values-ca/arrays.xml
index 1b97667..209a522 100644
--- a/res/values-ca/arrays.xml
+++ b/res/values-ca/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"A la memòria cau (client de l\'activitat)"</item>
     <item msgid="8186970968968646288">"A la memòria cau (buit)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verd blavós"</item>
+    <item msgid="7216413848731287689">"Cian"</item>
     <item msgid="5661027589207588703">"Blau"</item>
-    <item msgid="3795787248113275442">"Anyil"</item>
+    <item msgid="1219738214736244749">"Verd"</item>
     <item msgid="6331809026622602308">"Porpra"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermell"</item>
+    <item msgid="6500473130620545980">"Taronja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Més de 30 dies d\'antiguitat"</item>
diff --git a/res/values-cs/arrays.xml b/res/values-cs/arrays.xml
index effe6a0..7b191af 100644
--- a/res/values-cs/arrays.xml
+++ b/res/values-cs/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"V mezipaměti (klient aktivity)"</item>
     <item msgid="8186970968968646288">"V mezipaměti (prázdné)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Šedozelená"</item>
+    <item msgid="7216413848731287689">"Azurová"</item>
     <item msgid="5661027589207588703">"Modrá"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelená"</item>
     <item msgid="6331809026622602308">"Fialová"</item>
     <item msgid="6390546163902724700">"Růžová"</item>
-    <item msgid="6618900408138432102">"Červená"</item>
+    <item msgid="6500473130620545980">"Oranžová"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starší než 30 dní"</item>
diff --git a/res/values-da/arrays.xml b/res/values-da/arrays.xml
index 621fcd3..103f57d 100644
--- a/res/values-da/arrays.xml
+++ b/res/values-da/arrays.xml
@@ -221,15 +221,15 @@
     <item msgid="2362840341195111674">"Lad systemet vælge"</item>
   </string-array>
   <string-array name="app_ops_categories">
-    <item msgid="528483497841471005">"Placering"</item>
+    <item msgid="528483497841471005">"Lokation"</item>
     <item msgid="7786376598377098070">"Personlig"</item>
     <item msgid="7707692387382449990">"Beskeder"</item>
     <item msgid="2235402926760712958">"Medier"</item>
     <item msgid="1822578131647724167">"Enhed"</item>
   </string-array>
   <string-array name="app_ops_summaries">
-    <item msgid="8837238583601420163">"omtrentlig placering"</item>
-    <item msgid="3205182755091629995">"nøjagtig placering"</item>
+    <item msgid="8837238583601420163">"omtrentlig lokation"</item>
+    <item msgid="3205182755091629995">"nøjagtig lokation"</item>
     <item msgid="8952113542524604064">"GPS"</item>
     <item msgid="50701215019227883">"vibrer"</item>
     <item msgid="2690144000353492014">"læs kontakter"</item>
@@ -269,8 +269,8 @@
     <item msgid="4422070755065530548">"lydstyrke for notifikationer"</item>
     <item msgid="3250654589277825306">"lydstyrke for bluetooth"</item>
     <item msgid="4212187233638382465">"lås ikke"</item>
-    <item msgid="5099026183238335900">"overvåg placering"</item>
-    <item msgid="2297727967385895059">"overvåg placering med højt strømforbrug"</item>
+    <item msgid="5099026183238335900">"overvåg lokation"</item>
+    <item msgid="2297727967385895059">"overvåg lokation med højt strømforbrug"</item>
     <item msgid="8700593962030471569">"hent brugsstatistik"</item>
     <item msgid="4140820386622184831">"slå mikrofonlyd til/fra"</item>
     <item msgid="317746827951691657">"vis toast"</item>
@@ -286,7 +286,7 @@
     <item msgid="2702338156976571452">"fingeraftryk"</item>
     <item msgid="7925495329948404955">"kropssensorer"</item>
     <item msgid="8163066895749904470">"læs Cell Broadcast-meddelelser"</item>
-    <item msgid="7621394050624063528">"imiteret placering"</item>
+    <item msgid="7621394050624063528">"imiteret lokation"</item>
     <item msgid="37519917674959757">"læs lager"</item>
     <item msgid="3868809525697401379">"skriv til lager"</item>
     <item msgid="2504191192460059817">"tænd skærmen"</item>
@@ -295,9 +295,9 @@
     <item msgid="2553974920157061225">"lydstyrke for hjælpefunktioner"</item>
   </string-array>
   <string-array name="app_ops_labels">
-    <item msgid="7780927354556651567">"Placering"</item>
-    <item msgid="364182753727575631">"Placering"</item>
-    <item msgid="5728662879095632194">"Placering"</item>
+    <item msgid="7780927354556651567">"Lokation"</item>
+    <item msgid="364182753727575631">"Lokation"</item>
+    <item msgid="5728662879095632194">"Lokation"</item>
     <item msgid="4104617224667554750">"Vibrer"</item>
     <item msgid="1623646715189708947">"Læs kontakter"</item>
     <item msgid="5060760609109972207">"Rediger kontakter"</item>
@@ -305,9 +305,9 @@
     <item msgid="2348589304974534308">"Rediger opkaldshistorik"</item>
     <item msgid="4089146706115315300">"Læs kalenderen"</item>
     <item msgid="1305780729690198918">"Rediger kalenderen"</item>
-    <item msgid="3461096740171440592">"Placering"</item>
+    <item msgid="3461096740171440592">"Lokation"</item>
     <item msgid="6657539556093198883">"Send notifikation"</item>
-    <item msgid="8112680908829570200">"Placering"</item>
+    <item msgid="8112680908829570200">"Lokation"</item>
     <item msgid="5019327268152480733">"Ring til telefon"</item>
     <item msgid="8001855901083066554">"Læs sms/mms"</item>
     <item msgid="187744670643011148">"Skriv sms/mms"</item>
@@ -336,8 +336,8 @@
     <item msgid="8608084169623998854">"Lydstyrke for notifikationer"</item>
     <item msgid="7948784184567841794">"Lydstyrke for bluetooth"</item>
     <item msgid="1148968792599973150">"Lås ikke"</item>
-    <item msgid="8482874682804856549">"Placering"</item>
-    <item msgid="5186169827582545242">"Placering"</item>
+    <item msgid="8482874682804856549">"Lokation"</item>
+    <item msgid="5186169827582545242">"Lokation"</item>
     <item msgid="6122293931012635638">"Hent brugsstatistik"</item>
     <item msgid="2526677383312751932">"Slå mikrofonlyd til/fra"</item>
     <item msgid="4000577305179914546">"Vis toast"</item>
@@ -353,7 +353,7 @@
     <item msgid="4480721672278100858">"Fingeraftryk"</item>
     <item msgid="7883743426029759112">"Kropssensorer"</item>
     <item msgid="2546206711741159825">"Læs Cell Broadcast-meddelelser"</item>
-    <item msgid="2363460595607829243">"Imiteret placering"</item>
+    <item msgid="2363460595607829243">"Imiteret lokation"</item>
     <item msgid="3778165903878569143">"Læs lager"</item>
     <item msgid="555939881912035315">"Skriv til lager"</item>
     <item msgid="4281352581602735717">"Tænd skærmen"</item>
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cachelagret (aktivitetsklient)"</item>
     <item msgid="8186970968968646288">"Cachelagret (tom)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turkis"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blå"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grøn"</item>
     <item msgid="6331809026622602308">"Lilla"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Rød"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Mere end 30 dage gamle"</item>
diff --git a/res/values-de/arrays.xml b/res/values-de/arrays.xml
index f47e2fb..2e869b7 100644
--- a/res/values-de/arrays.xml
+++ b/res/values-de/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Im Cache gespeichert (Aktivitätsclient)"</item>
     <item msgid="8186970968968646288">"Im Cache gespeichert (leer)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blaugrün"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blau"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grün"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Rot"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Nach 30 Tagen"</item>
diff --git a/res/values-el/arrays.xml b/res/values-el/arrays.xml
index 92e4697..725d8c2 100644
--- a/res/values-el/arrays.xml
+++ b/res/values-el/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Αποθηκευμένο στην κρυφή μνήμη (δραστηριότητα πελάτη)"</item>
     <item msgid="8186970968968646288">"Αποθηκευμένο στην κρυφή μνήμη (κενό)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orangeΣ"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Γαλαζοπράσινο"</item>
+    <item msgid="7216413848731287689">"Κυανό"</item>
     <item msgid="5661027589207588703">"Μπλε"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Πράσινο"</item>
     <item msgid="6331809026622602308">"Μοβ"</item>
     <item msgid="6390546163902724700">"Ροζ"</item>
-    <item msgid="6618900408138432102">"Κόκκινο"</item>
+    <item msgid="6500473130620545980">"Πορτοκαλί"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Πάνω από 30 ημερών"</item>
diff --git a/res/values-en-rAU/arrays.xml b/res/values-en-rAU/arrays.xml
index 8385162..d4852dd 100644
--- a/res/values-en-rAU/arrays.xml
+++ b/res/values-en-rAU/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rCA/arrays.xml b/res/values-en-rCA/arrays.xml
index 682eaf0..3ce0de7 100644
--- a/res/values-en-rCA/arrays.xml
+++ b/res/values-en-rCA/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rGB/arrays.xml b/res/values-en-rGB/arrays.xml
index 8385162..d4852dd 100644
--- a/res/values-en-rGB/arrays.xml
+++ b/res/values-en-rGB/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rIN/arrays.xml b/res/values-en-rIN/arrays.xml
index 8385162..d4852dd 100644
--- a/res/values-en-rIN/arrays.xml
+++ b/res/values-en-rIN/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (activity client)"</item>
     <item msgid="8186970968968646288">"Cached (empty)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blue"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Green"</item>
     <item msgid="6331809026622602308">"Purple"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Red"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 days old"</item>
diff --git a/res/values-en-rXC/arrays.xml b/res/values-en-rXC/arrays.xml
index 7c2da06..553f8e6 100644
--- a/res/values-en-rXC/arrays.xml
+++ b/res/values-en-rXC/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‏‏‎‏‎‏‎‏‏‏‎‎‎‏‏‏‎‎‏‎‏‏‎‏‎‏‎‎‎‎‎‏‏‏‏‎‏‏‎‏‎‎‏‏‎‎‎‎‏‎‎‏‏‏‎‎Cached (activity client)‎‏‎‎‏‎"</item>
     <item msgid="8186970968968646288">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‎‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‎‏‏‎‏‎‏‏‏‎‎‎‎‏‎‎‎‏‏‏‏‏‎‎‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎Cached (empty)‎‏‎‎‏‎"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‎‎‏‎‎‏‏‏‏‏‏‏‏‎‏‎‎‎‎‎‏‏‎‎‎‏‎‏‏‎‏‏‏‏‎‎‏‎‏‎‏‎‎‎‎‎‏‏‎‏‏‏‎‏‏‏‏‏‏‎@color/SIM_color_cyan‎‏‎‎‏‎"</item>
+    <item msgid="177868870612833388">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‎‏‎‏‎‎‏‏‏‎‏‏‏‏‏‏‎‏‎‏‎‏‏‎‎‏‎‏‏‏‎‏‎‎‎‎‏‎‏‏‏‏‎‏‎‎‏‎‏‎‏‎‎‎‏‏‎‏‏‎‎‎@color/SIM_color_blue800‎‏‎‎‏‎"</item>
+    <item msgid="1129898906008357171">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‏‏‏‎‏‎‏‏‏‎‎‎‏‏‎‏‎‏‎‎‎‏‎‎‎‏‏‎‎‎‏‏‎‎‏‎‏‏‏‎‏‏‎‎‎‎‏‎‎‏‎‎‏‏‎‎‏‏‎@color/SIM_color_green800‎‏‎‎‏‎"</item>
+    <item msgid="4206364087389793587">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‏‎‏‎‎‏‏‎‎‎‎‎‎‎‎‎‎‎‎‏‏‏‎‏‏‎‎‏‏‏‏‎‏‎‎‎‏‏‎‏‎‏‎‎‎‎‏‎‏‏‎‏‎‎‏‏‎‎‏‏‎@color/SIM_color_purple800‎‏‎‎‏‎"</item>
+    <item msgid="6728943460061940130">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‏‎‏‎‏‏‎‎‎‏‎‎‎‎‎‎‎‏‎‎‏‏‎‏‏‎‎‏‏‏‎‏‎‏‎‏‎‏‎‏‏‏‎‎‎‎‎‏‎‎‏‏‎‏‎‎‎‏‎‎@color/SIM_color_pink800‎‏‎‎‏‎"</item>
+    <item msgid="968332068361935002">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‎‏‏‎‏‎‏‏‏‎‎‎‎‎‎‏‏‎‏‎‎‏‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‏‎‏‎‏‎‏‎‎‎‏‏‎‎‎‏‎‎‏‏‎‏‎‎@color/SIM_color_orange‎‏‎‎‏‎"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‎‏‏‎‎‏‏‎‏‎‏‏‎‏‏‎‎‏‎‏‎‏‏‏‎‎‎‏‏‎‎‎‏‏‏‎‏‏‎‎‎‏‎‎‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‏‏‎Teal‎‏‎‎‏‎"</item>
+    <item msgid="7216413848731287689">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‎‎‏‎‎‎‎‏‎‎‏‎‏‏‏‎‏‏‎‏‎‎‎‏‎‏‎‎‏‎‏‎‎‎‏‎‏‏‏‎‏‎‏‏‎‏‎‎‎‎‎‎‎‏‎‎‎‏‎‎‏‎Cyan‎‏‎‎‏‎"</item>
     <item msgid="5661027589207588703">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‎‏‏‏‎‏‎‎‏‎‎‎‎‎‎‎‎‎‎‏‎‏‎‎‏‏‎‎‏‎‏‎‏‎‏‏‎‎‏‏‎‎‏‏‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎Blue‎‏‎‎‏‎"</item>
-    <item msgid="3795787248113275442">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‎‏‏‎‏‎‎‏‎‏‎‏‏‎‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‎‎‎‏‎‎‏‏‎‏‎‏‏‏‏‏‏‏‏‎‏‎‎‏‎‎‎‏‏‎‎‏‎‎Indigo‎‏‎‎‏‎"</item>
+    <item msgid="1219738214736244749">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‎‏‏‎‎‎‎‏‎‏‏‏‎‎‎‏‏‎‏‎‎‎‎‎‎‏‎‏‎‎‏‎‏‎‏‏‎‎‎‎‎‎‎‎‏‏‎‏‎Green‎‏‎‎‏‎"</item>
     <item msgid="6331809026622602308">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‎‏‏‏‏‏‎‏‏‏‏‏‎‎‎‏‏‎‏‎‏‏‎‎‎‎‏‏‎‎‏‎‏‎‎‏‎‏‏‏‎‎‏‏‏‎‏‏‏‏‎‎‎‏‎‎‎‏‎‎‎Purple‎‏‎‎‏‎"</item>
     <item msgid="6390546163902724700">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‎‎‏‎‏‎‏‏‏‏‏‏‎‎‎‏‏‏‏‏‏‎‎‎‎‎‏‎‏‎‎‏‎‎‎‎‏‎‏‎‎‎‎‎‏‏‏‎‏‎‎‏‎‏‏‏‎‎‎Pink‎‏‎‎‏‎"</item>
-    <item msgid="6618900408138432102">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‏‏‏‎‏‏‎‏‏‎‎‎‎‏‏‏‎‏‏‎‏‏‎‏‎‎‏‎‎‏‏‏‎‏‏‎‎‎‏‏‏‎‏‏‏‏‏‏‎‎‏‏‎‎‏‏‎‎Red‎‏‎‎‏‎"</item>
+    <item msgid="6500473130620545980">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‎‏‏‎‏‎‎‎‏‏‎‏‏‎‎‏‎‏‎‎‎‏‏‏‎‏‏‏‏‏‎‎‎‎‏‏‏‎‏‎‎‏‏‎‏‏‏‏‏‎‏‎‏‏‏‎‏‏‏‏‎‎‎Orange‎‏‎‎‏‎"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"‎‏‎‎‎‎‎‏‎‏‏‏‎‎‎‎‎‎‏‎‎‏‎‎‎‏‎‏‏‏‏‏‏‏‏‏‏‎‏‏‎‏‏‏‎‏‏‏‎‎‏‏‏‎‏‎‏‎‎‏‏‎‏‎‏‎‏‏‏‎‎‏‏‏‎‏‎‎‎‏‏‏‏‎‏‎‎‏‎‎‏‏‏‏‎‏‎Over 30 days old‎‏‎‎‏‎"</item>
diff --git a/res/values-es-rUS/arrays.xml b/res/values-es-rUS/arrays.xml
index 8d4f681..74bb789 100644
--- a/res/values-es-rUS/arrays.xml
+++ b/res/values-es-rUS/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"En caché (cliente de actividad)"</item>
     <item msgid="8186970968968646288">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde azulado"</item>
+    <item msgid="7216413848731287689">"Cian"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Púrpura"</item>
     <item msgid="6390546163902724700">"Rosado"</item>
-    <item msgid="6618900408138432102">"Rojo"</item>
+    <item msgid="6500473130620545980">"Naranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Más de 30 días"</item>
diff --git a/res/values-es/arrays.xml b/res/values-es/arrays.xml
index c03ffd6..9996c21 100644
--- a/res/values-es/arrays.xml
+++ b/res/values-es/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"En caché (cliente de actividad)"</item>
     <item msgid="8186970968968646288">"En caché (vacío)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde azulado"</item>
+    <item msgid="7216413848731287689">"Cian"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Morado"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Rojo"</item>
+    <item msgid="6500473130620545980">"Naranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"De más de 30 días de antigüedad"</item>
diff --git a/res/values-et/arrays.xml b/res/values-et/arrays.xml
index 9d5e8ef..bcdb33d 100644
--- a/res/values-et/arrays.xml
+++ b/res/values-et/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Vahemälus (tegevuse klient)"</item>
     <item msgid="8186970968968646288">"Vahemälus (tühi)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Sinakasroheline"</item>
+    <item msgid="7216413848731287689">"Tsüaan"</item>
     <item msgid="5661027589207588703">"Sinine"</item>
-    <item msgid="3795787248113275442">"Indigosinine"</item>
+    <item msgid="1219738214736244749">"Roheline"</item>
     <item msgid="6331809026622602308">"Lilla"</item>
     <item msgid="6390546163902724700">"Roosa"</item>
-    <item msgid="6618900408138432102">"Punane"</item>
+    <item msgid="6500473130620545980">"Oranž"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Üle 30 päeva vanad"</item>
diff --git a/res/values-eu/arrays.xml b/res/values-eu/arrays.xml
index f136638..63d45eb 100644
--- a/res/values-eu/arrays.xml
+++ b/res/values-eu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cachean gordetakoa (jardueren bezeroa)"</item>
     <item msgid="8186970968968646288">"Cachean gordetakoa (hutsik)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Anila"</item>
+    <item msgid="7216413848731287689">"Ziana"</item>
     <item msgid="5661027589207588703">"Urdina"</item>
-    <item msgid="3795787248113275442">"Indigoa"</item>
+    <item msgid="1219738214736244749">"Berdea"</item>
     <item msgid="6331809026622602308">"Morea"</item>
     <item msgid="6390546163902724700">"Arrosa"</item>
-    <item msgid="6618900408138432102">"Gorria"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 egunetik gorakoak"</item>
diff --git a/res/values-fa/arrays.xml b/res/values-fa/arrays.xml
index f622e95..b8b0b0d 100644
--- a/res/values-fa/arrays.xml
+++ b/res/values-fa/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"قرار داده شده در حافظه پنهان (کلاینت فعالیت)"</item>
     <item msgid="8186970968968646288">"قرار داده شده در حافظه پنهان (خالی)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"‎@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"‎@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"‎@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"‎@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"‎@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"‎@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"فیروزه‌ای"</item>
+    <item msgid="7216413848731287689">"سبزآبی"</item>
     <item msgid="5661027589207588703">"آبی"</item>
-    <item msgid="3795787248113275442">"نیلی"</item>
+    <item msgid="1219738214736244749">"سبز"</item>
     <item msgid="6331809026622602308">"بنفش"</item>
     <item msgid="6390546163902724700">"صورتی"</item>
-    <item msgid="6618900408138432102">"قرمز"</item>
+    <item msgid="6500473130620545980">"نارنجی"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"بیش از ۳۰ روز پیش"</item>
diff --git a/res/values-fi/arrays.xml b/res/values-fi/arrays.xml
index f6b375a..4c39095 100644
--- a/res/values-fi/arrays.xml
+++ b/res/values-fi/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Välimuistissa (toiminnan suorittaja)"</item>
     <item msgid="8186970968968646288">"Välimuistissa (tyhjä)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Sinivihreä"</item>
+    <item msgid="7216413848731287689">"Syaani"</item>
     <item msgid="5661027589207588703">"Sininen"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Vihreä"</item>
     <item msgid="6331809026622602308">"Violetti"</item>
     <item msgid="6390546163902724700">"Pinkki"</item>
-    <item msgid="6618900408138432102">"Punainen"</item>
+    <item msgid="6500473130620545980">"Oranssi"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Yli 30 päivää vanhat"</item>
diff --git a/res/values-fr-rCA/arrays.xml b/res/values-fr-rCA/arrays.xml
index 8ac074a..ab61755 100644
--- a/res/values-fr-rCA/arrays.xml
+++ b/res/values-fr-rCA/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Mise en cache (client d\'activité)"</item>
     <item msgid="8186970968968646288">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turquoise"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Bleu"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Vert"</item>
     <item msgid="6331809026622602308">"Mauve"</item>
     <item msgid="6390546163902724700">"Rose"</item>
-    <item msgid="6618900408138432102">"Rouge"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Depuis plus de 30 jours"</item>
diff --git a/res/values-fr/arrays.xml b/res/values-fr/arrays.xml
index b377a3c..87bb6e7 100644
--- a/res/values-fr/arrays.xml
+++ b/res/values-fr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Mise en cache (client d\'activité)"</item>
     <item msgid="8186970968968646288">"Mise en cache (vide)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turquoise"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Bleu"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Vert"</item>
     <item msgid="6331809026622602308">"Violet"</item>
     <item msgid="6390546163902724700">"Rose"</item>
-    <item msgid="6618900408138432102">"Rouge"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Depuis plus de 30 jours"</item>
diff --git a/res/values-gl/arrays.xml b/res/values-gl/arrays.xml
index 0480290..2ae1b1e 100644
--- a/res/values-gl/arrays.xml
+++ b/res/values-gl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Na caché (cliente de actividade)"</item>
     <item msgid="8186970968968646288">"Na caché (en branco)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde azulado"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Violeta"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermello"</item>
+    <item msgid="6500473130620545980">"Laranxa"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"De máis de 30 días"</item>
diff --git a/res/values-gu/arrays.xml b/res/values-gu/arrays.xml
index 11f66a4..75e2e7f 100644
--- a/res/values-gu/arrays.xml
+++ b/res/values-gu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"કેશ્ડ (પ્રવૃત્તિ ક્લાઇન્ટ)"</item>
     <item msgid="8186970968968646288">"કેશ્ડ (ખાલી)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"મોરપીછ"</item>
+    <item msgid="7216413848731287689">"સાઍન"</item>
     <item msgid="5661027589207588703">"વાદળી"</item>
-    <item msgid="3795787248113275442">"ઘેરો વાદળી રંગ"</item>
+    <item msgid="1219738214736244749">"લીલો"</item>
     <item msgid="6331809026622602308">"જાંબલી"</item>
     <item msgid="6390546163902724700">"ગુલાબી"</item>
-    <item msgid="6618900408138432102">"લાલ"</item>
+    <item msgid="6500473130620545980">"નારંગી"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 દિવસથી વધુ જૂના"</item>
diff --git a/res/values-hi/arrays.xml b/res/values-hi/arrays.xml
index ef27022..3b3d8fb 100644
--- a/res/values-hi/arrays.xml
+++ b/res/values-hi/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"संचित (गतिविधि क्लाइंट)"</item>
     <item msgid="8186970968968646288">"संचित (खाली)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"हरा-नीला"</item>
+    <item msgid="7216413848731287689">"स्यान"</item>
     <item msgid="5661027589207588703">"नीला"</item>
-    <item msgid="3795787248113275442">"गहरा नीला"</item>
+    <item msgid="1219738214736244749">"हरा"</item>
     <item msgid="6331809026622602308">"बैंगनी"</item>
     <item msgid="6390546163902724700">"गुलाबी"</item>
-    <item msgid="6618900408138432102">"लाल"</item>
+    <item msgid="6500473130620545980">"नारंगी"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 दिन से ज़्यादा पुराने"</item>
diff --git a/res/values-hr/arrays.xml b/res/values-hr/arrays.xml
index dbe69b1..7932577 100644
--- a/res/values-hr/arrays.xml
+++ b/res/values-hr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Predmemorija (klijent aktivnosti)"</item>
     <item msgid="8186970968968646288">"Predmemorija (prazna)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@boja/SIM_boja_cijan"</item>
+    <item msgid="177868870612833388">"@boja/SIM_boja_plava800"</item>
+    <item msgid="1129898906008357171">"@boja/SIM_boja_zelena800"</item>
+    <item msgid="4206364087389793587">"@boja/SIM_boja_ljubičasta800"</item>
+    <item msgid="6728943460061940130">"@boja/SIM_boja_ružičasta800"</item>
+    <item msgid="968332068361935002">"@boja/SIM_boja_narančasta"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Tirkiznoplava"</item>
+    <item msgid="7216413848731287689">"Cijan"</item>
     <item msgid="5661027589207588703">"Plava"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Ljubičasta"</item>
     <item msgid="6390546163902724700">"Ružičasta"</item>
-    <item msgid="6618900408138432102">"Crvena"</item>
+    <item msgid="6500473130620545980">"Narančasta"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starije od 30 dana"</item>
diff --git a/res/values-hu/arrays.xml b/res/values-hu/arrays.xml
index b7c89b0..13ab2f4 100644
--- a/res/values-hu/arrays.xml
+++ b/res/values-hu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Gyorsítótárazott (tevékenységkliens)"</item>
     <item msgid="8186970968968646288">"Gyorsítótárazott (üres)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Pávakék"</item>
+    <item msgid="7216413848731287689">"Ciánkék"</item>
     <item msgid="5661027589207588703">"Kék"</item>
-    <item msgid="3795787248113275442">"Indigókék"</item>
+    <item msgid="1219738214736244749">"Zöld"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Rózsaszín"</item>
-    <item msgid="6618900408138432102">"Piros"</item>
+    <item msgid="6500473130620545980">"Narancssárga"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Több mint 30 napos"</item>
diff --git a/res/values-hy/arrays.xml b/res/values-hy/arrays.xml
index ea01146..d84bb54 100644
--- a/res/values-hy/arrays.xml
+++ b/res/values-hy/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Քեշավորված (սպասառուի գործողությունը)"</item>
     <item msgid="8186970968968646288">"Քեշավորված (դատարկ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Փիրուզագույն"</item>
+    <item msgid="7216413848731287689">"Երկնագույն"</item>
     <item msgid="5661027589207588703">"Կապույտ"</item>
-    <item msgid="3795787248113275442">"Ինդիգո"</item>
+    <item msgid="1219738214736244749">"Կանաչ"</item>
     <item msgid="6331809026622602308">"Մանուշակագույն"</item>
     <item msgid="6390546163902724700">"Վարդագույն"</item>
-    <item msgid="6618900408138432102">"Կարմիր"</item>
+    <item msgid="6500473130620545980">"Նարնջագույն"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 օրից հին"</item>
diff --git a/res/values-in/arrays.xml b/res/values-in/arrays.xml
index 4fe59a0..f1c9c10 100644
--- a/res/values-in/arrays.xml
+++ b/res/values-in/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Disimpan dalam cache (klien aktivitas)"</item>
     <item msgid="8186970968968646288">"Disimpan dalam cache (kosong)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Hijau kebiruan"</item>
+    <item msgid="7216413848731287689">"Sian"</item>
     <item msgid="5661027589207588703">"Biru"</item>
-    <item msgid="3795787248113275442">"Nila"</item>
+    <item msgid="1219738214736244749">"Hijau"</item>
     <item msgid="6331809026622602308">"Ungu"</item>
     <item msgid="6390546163902724700">"Merah Muda"</item>
-    <item msgid="6618900408138432102">"Merah"</item>
+    <item msgid="6500473130620545980">"Oranye"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Lebih dari 30 hari"</item>
diff --git a/res/values-is/arrays.xml b/res/values-is/arrays.xml
index 790d361..89e2f18 100644
--- a/res/values-is/arrays.xml
+++ b/res/values-is/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Í skyndiminni (virknibiðlari)"</item>
     <item msgid="8186970968968646288">"Í skyndiminni (autt)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blágrænn"</item>
+    <item msgid="7216413848731287689">"Ljósblár"</item>
     <item msgid="5661027589207588703">"Blár"</item>
-    <item msgid="3795787248113275442">"Dimmfjólublár"</item>
+    <item msgid="1219738214736244749">"Grænn"</item>
     <item msgid="6331809026622602308">"Fjólublár"</item>
     <item msgid="6390546163902724700">"Bleikur"</item>
-    <item msgid="6618900408138432102">"Rauður"</item>
+    <item msgid="6500473130620545980">"Appelsínugulur"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Eldri en 30 daga"</item>
diff --git a/res/values-it/arrays.xml b/res/values-it/arrays.xml
index 7b3b500..287eec6 100644
--- a/res/values-it/arrays.xml
+++ b/res/values-it/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Memorizzata nella cache (client attività)"</item>
     <item msgid="8186970968968646288">"Memorizzata nella cache (vuoto)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Verde acqua"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Blu"</item>
-    <item msgid="3795787248113275442">"Indaco"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Viola"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Rosso"</item>
+    <item msgid="6500473130620545980">"Arancione"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Più vecchi di 30 giorni"</item>
diff --git a/res/values-iw/arrays.xml b/res/values-iw/arrays.xml
index 22554f0..31a8fd3 100644
--- a/res/values-iw/arrays.xml
+++ b/res/values-iw/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"בקובץ שמור (לקוח פעילות)"</item>
     <item msgid="8186970968968646288">"בקובץ שמור (ריק)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"‎@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"‎@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"‎@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"‎@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"‎@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"‎@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"כחול-ירקרק"</item>
+    <item msgid="7216413848731287689">"ציאן"</item>
     <item msgid="5661027589207588703">"כחול"</item>
-    <item msgid="3795787248113275442">"כחול כהה"</item>
+    <item msgid="1219738214736244749">"ירוק"</item>
     <item msgid="6331809026622602308">"סגול"</item>
     <item msgid="6390546163902724700">"ורוד"</item>
-    <item msgid="6618900408138432102">"אדום"</item>
+    <item msgid="6500473130620545980">"כתום"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"בני למעלה מ-30 ימים"</item>
diff --git a/res/values-ja/arrays.xml b/res/values-ja/arrays.xml
index 6184680..5120065 100644
--- a/res/values-ja/arrays.xml
+++ b/res/values-ja/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"キャッシュ済み(アクティビティクライアント)"</item>
     <item msgid="8186970968968646288">"キャッシュ済み(空)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ティール"</item>
+    <item msgid="7216413848731287689">"シアン"</item>
     <item msgid="5661027589207588703">"ブルー"</item>
-    <item msgid="3795787248113275442">"インディゴ"</item>
+    <item msgid="1219738214736244749">"グリーン"</item>
     <item msgid="6331809026622602308">"パープル"</item>
     <item msgid="6390546163902724700">"ピンク"</item>
-    <item msgid="6618900408138432102">"レッド"</item>
+    <item msgid="6500473130620545980">"オレンジ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 日以上経過"</item>
diff --git a/res/values-ka/arrays.xml b/res/values-ka/arrays.xml
index e8c0ee0..2f983af 100644
--- a/res/values-ka/arrays.xml
+++ b/res/values-ka/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ქეშირებულია (აქტივობის კლიენტი)"</item>
     <item msgid="8186970968968646288">"ქეშირებული (ცარიელი)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ზურმუხტისფერი"</item>
+    <item msgid="7216413848731287689">"ციანი"</item>
     <item msgid="5661027589207588703">"ლურჯი"</item>
-    <item msgid="3795787248113275442">"მუქი ლურჯი"</item>
+    <item msgid="1219738214736244749">"მწვანე"</item>
     <item msgid="6331809026622602308">"მეწამული"</item>
     <item msgid="6390546163902724700">"ვარდისფერი"</item>
-    <item msgid="6618900408138432102">"წითელი"</item>
+    <item msgid="6500473130620545980">"ნარინჯისფერი"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 დღეზე ძველი"</item>
diff --git a/res/values-kk/arrays.xml b/res/values-kk/arrays.xml
index 9360ac9..8097032 100644
--- a/res/values-kk/arrays.xml
+++ b/res/values-kk/arrays.xml
@@ -290,7 +290,7 @@
     <item msgid="37519917674959757">"жадты оқу"</item>
     <item msgid="3868809525697401379">"жадқа жазу"</item>
     <item msgid="2504191192460059817">"экранды қосу"</item>
-    <item msgid="7905819538788103556">"есептік жазбаларды алу"</item>
+    <item msgid="7905819538788103556">"аккаунттарды алу"</item>
     <item msgid="1675025662248079254">"фонда іске қосу"</item>
     <item msgid="2553974920157061225">"арнайы мүмкіндіктердің дыбыс деңгейі"</item>
   </string-array>
@@ -357,7 +357,7 @@
     <item msgid="3778165903878569143">"Жадты оқу"</item>
     <item msgid="555939881912035315">"Жадқа жазу"</item>
     <item msgid="4281352581602735717">"Экранды қосу"</item>
-    <item msgid="346122795998225472">"Есептік жазбаларды алу"</item>
+    <item msgid="346122795998225472">"Аккаунттарды алу"</item>
     <item msgid="3756073389408535680">"Фонда іске қосу"</item>
     <item msgid="2114661179947426734">"Арнайы мүмкіндіктердің дыбыс деңгейі"</item>
   </string-array>
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кэштелген (белсенділік клиенті)"</item>
     <item msgid="8186970968968646288">"Кэштелген (бос)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Көкшіл жасыл"</item>
+    <item msgid="7216413848731287689">"Көк"</item>
     <item msgid="5661027589207588703">"Көк"</item>
-    <item msgid="3795787248113275442">"Индиго түсі"</item>
+    <item msgid="1219738214736244749">"Жасыл"</item>
     <item msgid="6331809026622602308">"Күлгін"</item>
     <item msgid="6390546163902724700">"Қызғылт"</item>
-    <item msgid="6618900408138432102">"Қызыл"</item>
+    <item msgid="6500473130620545980">"Қызғылт сары"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 күннен артық сақталған"</item>
diff --git a/res/values-km/arrays.xml b/res/values-km/arrays.xml
index e8f4e4a..0dbb161 100644
--- a/res/values-km/arrays.xml
+++ b/res/values-km/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ម៉ាស៊ីន​​កូន​សកម្មភាព​)"</item>
     <item msgid="8186970968968646288">"ទុក​ក្នុង​ឃ្លាំង​សម្ងាត់ (ទទេ​)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"បៃតង​​ចាស់"</item>
+    <item msgid="7216413848731287689">"ស៊ីលៀប"</item>
     <item msgid="5661027589207588703">"ពណ៌ខៀវ"</item>
-    <item msgid="3795787248113275442">"ទឹកប៊ិក"</item>
+    <item msgid="1219738214736244749">"បៃតង"</item>
     <item msgid="6331809026622602308">"ពណ៍ស្វាយ"</item>
     <item msgid="6390546163902724700">"ផ្កាឈូក"</item>
-    <item msgid="6618900408138432102">"ពណ៌ក្រហម"</item>
+    <item msgid="6500473130620545980">"ទឹកក្រូច"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"លើសពី 30 ថ្ងៃ"</item>
diff --git a/res/values-kn/arrays.xml b/res/values-kn/arrays.xml
index 335084b..31c4b4d 100644
--- a/res/values-kn/arrays.xml
+++ b/res/values-kn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ಕ್ಯಾಶ್ ಮಾಡಲಾದ (ಚಟುವಟಿಕೆ ಕ್ಲೈಂಟ್)"</item>
     <item msgid="8186970968968646288">"ಕ್ಯಾಶ್ ಮಾಡಲಾಗಿದೆ (ಖಾಲಿ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ಗಾಢ ಹಸಿರು-ನೀಲಿ"</item>
+    <item msgid="7216413848731287689">"ಸಯನ್"</item>
     <item msgid="5661027589207588703">"ನೀಲಿ"</item>
-    <item msgid="3795787248113275442">"ಊದಾ"</item>
+    <item msgid="1219738214736244749">"ಹಸಿರು"</item>
     <item msgid="6331809026622602308">"ನೇರಳೆ"</item>
     <item msgid="6390546163902724700">"ಗುಲಾಬಿ ಬಣ್ಣ"</item>
-    <item msgid="6618900408138432102">"ಕೆಂಪು"</item>
+    <item msgid="6500473130620545980">"ಕಿತ್ತಳೆ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ದಿನಗಳಿಗಿಂತಲೂ ಹಳೆಯದು"</item>
diff --git a/res/values-ko/arrays.xml b/res/values-ko/arrays.xml
index ebd8efb..66603b8 100644
--- a/res/values-ko/arrays.xml
+++ b/res/values-ko/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"캐시됨(활동 클라이언트)"</item>
     <item msgid="8186970968968646288">"캐시됨(비어 있음)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"청록색"</item>
+    <item msgid="7216413848731287689">"녹청색"</item>
     <item msgid="5661027589207588703">"파란색"</item>
-    <item msgid="3795787248113275442">"남색"</item>
+    <item msgid="1219738214736244749">"녹색"</item>
     <item msgid="6331809026622602308">"보라색"</item>
     <item msgid="6390546163902724700">"분홍색"</item>
-    <item msgid="6618900408138432102">"빨간색"</item>
+    <item msgid="6500473130620545980">"주황색"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30일 이상 경과"</item>
diff --git a/res/values-ky/arrays.xml b/res/values-ky/arrays.xml
index abe0fcd..cb59e7a 100644
--- a/res/values-ky/arrays.xml
+++ b/res/values-ky/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кештелген (иш-аракет кардары)"</item>
     <item msgid="8186970968968646288">"Кештелген (бош)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Жашыл"</item>
+    <item msgid="7216413848731287689">"Көгүлтүр"</item>
     <item msgid="5661027589207588703">"Көк"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Жашыл"</item>
     <item msgid="6331809026622602308">"Сыя"</item>
     <item msgid="6390546163902724700">"Кызгылтым"</item>
-    <item msgid="6618900408138432102">"Кызыл"</item>
+    <item msgid="6500473130620545980">"Кызгылт сары"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 күндөн мурунку"</item>
diff --git a/res/values-lo/arrays.xml b/res/values-lo/arrays.xml
index e179361..b03d165 100644
--- a/res/values-lo/arrays.xml
+++ b/res/values-lo/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cached (​ການ​ເຄື່ອນ​ໄຫວ​ລູກ​ຂ່າຍ)"</item>
     <item msgid="8186970968968646288">"Cached (​ຫວ່າງ​ເປົ່າ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ສີຂຽວອົມຟ້າ"</item>
+    <item msgid="7216413848731287689">"ສີຟ້າຂຽວ"</item>
     <item msgid="5661027589207588703">"ສີຟ້າ"</item>
-    <item msgid="3795787248113275442">"​ສີມ່ວງ​ເຂັ້ມ"</item>
+    <item msgid="1219738214736244749">"ສີຂຽວ"</item>
     <item msgid="6331809026622602308">"ສີມ່ວງ"</item>
     <item msgid="6390546163902724700">"ສີບົວ"</item>
-    <item msgid="6618900408138432102">"ສີແດງ"</item>
+    <item msgid="6500473130620545980">"ສີສົ້ມ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"ເກີນ 30 ມື້ແລ້ວ"</item>
diff --git a/res/values-lt/arrays.xml b/res/values-lt/arrays.xml
index 744546a..b9a00e7 100644
--- a/res/values-lt/arrays.xml
+++ b/res/values-lt/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Išsaugota talpykloje (veiklos kliento programa)"</item>
     <item msgid="8186970968968646288">"Išsaugota talpykloje (tuščia)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Žalsvai mėlyna"</item>
+    <item msgid="7216413848731287689">"Žalsvai mėlyna"</item>
     <item msgid="5661027589207588703">"Mėlyna"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Žalia"</item>
     <item msgid="6331809026622602308">"Purpurinė"</item>
     <item msgid="6390546163902724700">"Rožinė"</item>
-    <item msgid="6618900408138432102">"Raudona"</item>
+    <item msgid="6500473130620545980">"Oranžinė"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Daugiau nei 30 dienų"</item>
diff --git a/res/values-lv/arrays.xml b/res/values-lv/arrays.xml
index 3df73c3..8e2c787 100644
--- a/res/values-lv/arrays.xml
+++ b/res/values-lv/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Saglabāts kešatmiņā (darbības klients)"</item>
     <item msgid="8186970968968646288">"Saglabāts kešatmiņā (tukša)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Zilganzaļa"</item>
+    <item msgid="7216413848731287689">"Ciānzila"</item>
     <item msgid="5661027589207588703">"Zila"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zaļa"</item>
     <item msgid="6331809026622602308">"Violeta"</item>
     <item msgid="6390546163902724700">"Rozā"</item>
-    <item msgid="6618900408138432102">"Sarkana"</item>
+    <item msgid="6500473130620545980">"Oranža"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Vecāki par 30 dienām"</item>
diff --git a/res/values-mk/arrays.xml b/res/values-mk/arrays.xml
index 5f4698c..f116f62 100644
--- a/res/values-mk/arrays.xml
+++ b/res/values-mk/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеширана (клиент за активност)"</item>
     <item msgid="8186970968968646288">"Кеширана (празна)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Тиркизна"</item>
+    <item msgid="7216413848731287689">"Тиркизна"</item>
     <item msgid="5661027589207588703">"Сина"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Зелена"</item>
     <item msgid="6331809026622602308">"Виолетова"</item>
     <item msgid="6390546163902724700">"Розова"</item>
-    <item msgid="6618900408138432102">"Црвена"</item>
+    <item msgid="6500473130620545980">"Портокалова"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Постари од 30 дена"</item>
diff --git a/res/values-ml/arrays.xml b/res/values-ml/arrays.xml
index 5ac71ec..dafc6e2 100644
--- a/res/values-ml/arrays.xml
+++ b/res/values-ml/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"കാഷെചെയ്‌തു (പ്രവർത്തന ക്ലയന്റ്)"</item>
     <item msgid="8186970968968646288">"കാഷെചെയ്‌തു (ശൂന്യം)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ടീല്‍"</item>
+    <item msgid="7216413848731287689">"സിയാൻ"</item>
     <item msgid="5661027589207588703">"നീല"</item>
-    <item msgid="3795787248113275442">"ഇൻഡിഗോ"</item>
+    <item msgid="1219738214736244749">"പച്ച"</item>
     <item msgid="6331809026622602308">"പര്‍പ്പിള്‍"</item>
     <item msgid="6390546163902724700">"പിങ്ക്"</item>
-    <item msgid="6618900408138432102">"ചുവപ്പ്"</item>
+    <item msgid="6500473130620545980">"ഓറഞ്ച്"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ദിവസത്തിലധികം പഴയത്"</item>
diff --git a/res/values-mn/arrays.xml b/res/values-mn/arrays.xml
index 89dc9ee..832563b 100644
--- a/res/values-mn/arrays.xml
+++ b/res/values-mn/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеш хийгдсэн (үйлдэлийн клиент)"</item>
     <item msgid="8186970968968646288">"Кеш хийгдсэн (хоосон)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Ногоон цэнхэр"</item>
+    <item msgid="7216413848731287689">"Ногоон хөх"</item>
     <item msgid="5661027589207588703">"Цэнхэр"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Ногоон"</item>
     <item msgid="6331809026622602308">"Нил ягаан"</item>
     <item msgid="6390546163902724700">"Ягаан"</item>
-    <item msgid="6618900408138432102">"Улаан"</item>
+    <item msgid="6500473130620545980">"Улбар шар"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 гаруй хоног хадгална"</item>
diff --git a/res/values-mr/arrays.xml b/res/values-mr/arrays.xml
index 140c163..ad2af7c 100644
--- a/res/values-mr/arrays.xml
+++ b/res/values-mr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"कॅशे  केलेला (ॲक्टिव्हिटी क्लायंट)"</item>
     <item msgid="8186970968968646288">"कॅशे   केलेला (रिक्त)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"टील"</item>
+    <item msgid="7216413848731287689">"निळसर"</item>
     <item msgid="5661027589207588703">"निळा"</item>
-    <item msgid="3795787248113275442">"नीळ"</item>
+    <item msgid="1219738214736244749">"हिरवा"</item>
     <item msgid="6331809026622602308">"जांभळा"</item>
     <item msgid="6390546163902724700">"गुलाबी"</item>
-    <item msgid="6618900408138432102">"लाल"</item>
+    <item msgid="6500473130620545980">"नारिंगी"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 दिवसांपेक्षा अधिक जुने"</item>
diff --git a/res/values-ms/arrays.xml b/res/values-ms/arrays.xml
index 4b6992b..274e55c 100644
--- a/res/values-ms/arrays.xml
+++ b/res/values-ms/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cache (klien aktiviti)"</item>
     <item msgid="8186970968968646288">"Cache (kosong)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Hijau kebiruan"</item>
+    <item msgid="7216413848731287689">"Sian"</item>
     <item msgid="5661027589207588703">"Biru"</item>
-    <item msgid="3795787248113275442">"Biru nila"</item>
+    <item msgid="1219738214736244749">"Hijau"</item>
     <item msgid="6331809026622602308">"Ungu"</item>
     <item msgid="6390546163902724700">"Merah jambu"</item>
-    <item msgid="6618900408138432102">"Merah"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Lebih 30 hari"</item>
diff --git a/res/values-my/arrays.xml b/res/values-my/arrays.xml
index 2b0c319..93a8fc3 100644
--- a/res/values-my/arrays.xml
+++ b/res/values-my/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ကက်ရှ လုပ်ထား (အသုံးပြုသူ ဖောက်သည်)"</item>
     <item msgid="8186970968968646288">"ကက်ရှ် လုပ်ထား (ဗလာ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"စိမ်းပြာ"</item>
+    <item msgid="7216413848731287689">"စိမ်းပြာ"</item>
     <item msgid="5661027589207588703">"အပြာ"</item>
-    <item msgid="3795787248113275442">"မဲနယ်"</item>
+    <item msgid="1219738214736244749">"အစိမ်း"</item>
     <item msgid="6331809026622602308">"ခရမ်း"</item>
     <item msgid="6390546163902724700">"ပန်းရောင်"</item>
-    <item msgid="6618900408138432102">"အနီ"</item>
+    <item msgid="6500473130620545980">"လိမ္မော်"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"ရက်ပေါင်း ၃၀ ထက်ကျော်သော"</item>
diff --git a/res/values-nb/arrays.xml b/res/values-nb/arrays.xml
index e1d7b76..c212dbb 100644
--- a/res/values-nb/arrays.xml
+++ b/res/values-nb/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Bufret (aktivitetsklient)"</item>
     <item msgid="8186970968968646288">"Bufret (tom)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blågrønn"</item>
+    <item msgid="7216413848731287689">"Turkis"</item>
     <item msgid="5661027589207588703">"Blå"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grønn"</item>
     <item msgid="6331809026622602308">"Lilla"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Rød"</item>
+    <item msgid="6500473130620545980">"Oransje"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Over 30 dager gamle"</item>
diff --git a/res/values-ne/arrays.xml b/res/values-ne/arrays.xml
index 94452cc..0c4c653 100644
--- a/res/values-ne/arrays.xml
+++ b/res/values-ne/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"क्यास (गतिविधि ग्राहक)"</item>
     <item msgid="8186970968968646288">"क्यास (खाली)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"टिल"</item>
+    <item msgid="7216413848731287689">"सायन"</item>
     <item msgid="5661027589207588703">"निलो"</item>
-    <item msgid="3795787248113275442">"इन्डिगो"</item>
+    <item msgid="1219738214736244749">"हरियो"</item>
     <item msgid="6331809026622602308">"बैजनी"</item>
     <item msgid="6390546163902724700">"गुलाबी"</item>
-    <item msgid="6618900408138432102">"रातो"</item>
+    <item msgid="6500473130620545980">"सुन्तले रङ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"कम्तीमा ३० दिन पुरानो"</item>
diff --git a/res/values-nl/arrays.xml b/res/values-nl/arrays.xml
index d0aa809..875e5bc 100644
--- a/res/values-nl/arrays.xml
+++ b/res/values-nl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Gecacht (activiteitsclient)"</item>
     <item msgid="8186970968968646288">"Gecacht (leeg)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blauwgroen"</item>
+    <item msgid="7216413848731287689">"Cyaan"</item>
     <item msgid="5661027589207588703">"Blauw"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Groen"</item>
     <item msgid="6331809026622602308">"Paars"</item>
     <item msgid="6390546163902724700">"Roze"</item>
-    <item msgid="6618900408138432102">"Rood"</item>
+    <item msgid="6500473130620545980">"Oranje"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Meer dan 30 dagen oud"</item>
diff --git a/res/values-or/arrays.xml b/res/values-or/arrays.xml
index cc8cce2..cda80f2 100644
--- a/res/values-or/arrays.xml
+++ b/res/values-or/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"କ୍ୟାଶ୍ ହୋଇଥିବା (କାର୍ଯ୍ୟକଳାପ କ୍ଲାଏଣ୍ଟ)"</item>
     <item msgid="8186970968968646288">"କ୍ୟାଶ୍ ହୋଇଥିବା (ଖାଲି)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ଟିଲ୍"</item>
+    <item msgid="7216413848731287689">"ସାଇଆନ୍"</item>
     <item msgid="5661027589207588703">"ନୀଳ"</item>
-    <item msgid="3795787248113275442">"ଇଣ୍ଡିଗୋ"</item>
+    <item msgid="1219738214736244749">"ସବୁଜ"</item>
     <item msgid="6331809026622602308">"ବାଇଗଣୀ"</item>
     <item msgid="6390546163902724700">"ଗୋଲାପି"</item>
-    <item msgid="6618900408138432102">"ନାଲି"</item>
+    <item msgid="6500473130620545980">"କମଳା"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ଦିନରୁ ଅଧିକ ପୁରୁଣା"</item>
diff --git a/res/values-pa/arrays.xml b/res/values-pa/arrays.xml
index 79d098f..daa8d5a 100644
--- a/res/values-pa/arrays.xml
+++ b/res/values-pa/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"ਕੈਸ਼ ਕੀਤੀ (ਗਤੀਵਿਧੀ ਕਲਾਇੰਟ)"</item>
     <item msgid="8186970968968646288">"ਕੈਚ ਕੀਤੀ (ਖਾਲੀ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"ਟੀਲ"</item>
+    <item msgid="7216413848731287689">"ਹਰਾ ਨੀਲਾ"</item>
     <item msgid="5661027589207588703">"ਨੀਲਾ"</item>
-    <item msgid="3795787248113275442">"ਗੂੜ੍ਹਾ ਨੀਲਾ"</item>
+    <item msgid="1219738214736244749">"ਹਰਾ"</item>
     <item msgid="6331809026622602308">"ਜਾਮਨੀ"</item>
     <item msgid="6390546163902724700">"ਗੁਲਾਬੀ"</item>
-    <item msgid="6618900408138432102">"ਲਾਲ"</item>
+    <item msgid="6500473130620545980">"ਸੰਤਰੀ"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 ਦਿਨਾਂ ਤੋਂ ਜ਼ਿਆਦਾ ਪੁਰਾਣੀ"</item>
diff --git a/res/values-pl/arrays.xml b/res/values-pl/arrays.xml
index 3845bc1..d10c228 100644
--- a/res/values-pl/arrays.xml
+++ b/res/values-pl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Pamięć podręczna (klient aktywności)"</item>
     <item msgid="8186970968968646288">"Pamięć podręczna (pusta)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Morski"</item>
+    <item msgid="7216413848731287689">"Cyjan"</item>
     <item msgid="5661027589207588703">"Niebieski"</item>
-    <item msgid="3795787248113275442">"Indygo"</item>
+    <item msgid="1219738214736244749">"Zielony"</item>
     <item msgid="6331809026622602308">"Fioletowy"</item>
     <item msgid="6390546163902724700">"Różowy"</item>
-    <item msgid="6618900408138432102">"Czerwony"</item>
+    <item msgid="6500473130620545980">"Pomarańczowy"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starsze niż 30 dni"</item>
diff --git a/res/values-pt-rBR/arrays.xml b/res/values-pt-rBR/arrays.xml
index 8b75911..e802e57 100644
--- a/res/values-pt-rBR/arrays.xml
+++ b/res/values-pt-rBR/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Em cache (cliente de atividade)"</item>
     <item msgid="8186970968968646288">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Azul-petróleo"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Roxo"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermelho"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Com mais de 30 dias"</item>
diff --git a/res/values-pt-rPT/arrays.xml b/res/values-pt-rPT/arrays.xml
index 5750e2b..5994f66 100644
--- a/res/values-pt-rPT/arrays.xml
+++ b/res/values-pt-rPT/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Em cache (cliente de atividade)"</item>
     <item msgid="8186970968968646288">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Azul esverdeado"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Roxo"</item>
     <item msgid="6390546163902724700">"Cor-de-rosa"</item>
-    <item msgid="6618900408138432102">"Vermelho"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Mais de 30 dias"</item>
diff --git a/res/values-pt/arrays.xml b/res/values-pt/arrays.xml
index 8b75911..e802e57 100644
--- a/res/values-pt/arrays.xml
+++ b/res/values-pt/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Em cache (cliente de atividade)"</item>
     <item msgid="8186970968968646288">"Em cache (vazio)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Azul-petróleo"</item>
+    <item msgid="7216413848731287689">"Ciano"</item>
     <item msgid="5661027589207588703">"Azul"</item>
-    <item msgid="3795787248113275442">"Índigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Roxo"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Vermelho"</item>
+    <item msgid="6500473130620545980">"Laranja"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Com mais de 30 dias"</item>
diff --git a/res/values-ro/arrays.xml b/res/values-ro/arrays.xml
index 937ea46..a8c6545 100644
--- a/res/values-ro/arrays.xml
+++ b/res/values-ro/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"În cache (client de activitate)"</item>
     <item msgid="8186970968968646288">"În cache (gol)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Turcoaz"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Albastru"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Verde"</item>
     <item msgid="6331809026622602308">"Violet"</item>
     <item msgid="6390546163902724700">"Roz"</item>
-    <item msgid="6618900408138432102">"Roșu"</item>
+    <item msgid="6500473130620545980">"Portocaliu"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Vechi de peste 30 de zile"</item>
diff --git a/res/values-ru/arrays.xml b/res/values-ru/arrays.xml
index e271faf..e2ade5d 100644
--- a/res/values-ru/arrays.xml
+++ b/res/values-ru/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кешировано (клиент)"</item>
     <item msgid="8186970968968646288">"Кешировано (пусто)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Сине-зеленый"</item>
+    <item msgid="7216413848731287689">"Голубой"</item>
     <item msgid="5661027589207588703">"Синий"</item>
-    <item msgid="3795787248113275442">"Индиго"</item>
+    <item msgid="1219738214736244749">"Зеленый"</item>
     <item msgid="6331809026622602308">"Фиолетовый"</item>
     <item msgid="6390546163902724700">"Розовый"</item>
-    <item msgid="6618900408138432102">"Красный"</item>
+    <item msgid="6500473130620545980">"Оранжевый"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Добавленные более 30 дней назад"</item>
diff --git a/res/values-si/arrays.xml b/res/values-si/arrays.xml
index 0450326..207c582 100644
--- a/res/values-si/arrays.xml
+++ b/res/values-si/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"හැඹිලි ගත කළ (ක්‍රියාකාරකම් සේවාලාභියා)"</item>
     <item msgid="8186970968968646288">"හැඹිලි ගත කළ (හිස්)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"සේරා"</item>
+    <item msgid="7216413848731287689">"සියන්"</item>
     <item msgid="5661027589207588703">"නිල්"</item>
-    <item msgid="3795787248113275442">"ඉන්ඩිගෝ"</item>
+    <item msgid="1219738214736244749">"කොළ"</item>
     <item msgid="6331809026622602308">"දම්"</item>
     <item msgid="6390546163902724700">"රෝස"</item>
-    <item msgid="6618900408138432102">"රතු"</item>
+    <item msgid="6500473130620545980">"තැඹිලි"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"දින 30කට වඩා පැරණි"</item>
diff --git a/res/values-sk/arrays.xml b/res/values-sk/arrays.xml
index b467c8a..0c9e75d 100644
--- a/res/values-sk/arrays.xml
+++ b/res/values-sk/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Vo vyrovnávacej pamäti (klient aktivity)"</item>
     <item msgid="8186970968968646288">"Vo vyrovnávacej pamäti (prázdne)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Modrozelená"</item>
+    <item msgid="7216413848731287689">"Azúrová"</item>
     <item msgid="5661027589207588703">"Modrá"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelená"</item>
     <item msgid="6331809026622602308">"Purpurová"</item>
     <item msgid="6390546163902724700">"Ružová"</item>
-    <item msgid="6618900408138432102">"Červená"</item>
+    <item msgid="6500473130620545980">"Oranžová"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Staršie ako 30 dní"</item>
diff --git a/res/values-sl/arrays.xml b/res/values-sl/arrays.xml
index a42d464..58223f0 100644
--- a/res/values-sl/arrays.xml
+++ b/res/values-sl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Predpomnjeno (odjemalec dejavnosti)"</item>
     <item msgid="8186970968968646288">"Predpomnjeno (prazno)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Zelenomodra"</item>
+    <item msgid="7216413848731287689">"Cijan"</item>
     <item msgid="5661027589207588703">"Modra"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Zelena"</item>
     <item msgid="6331809026622602308">"Vijolična"</item>
     <item msgid="6390546163902724700">"Rožnata"</item>
-    <item msgid="6618900408138432102">"Rdeča"</item>
+    <item msgid="6500473130620545980">"Oranžna"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Starejše od 30 dni"</item>
diff --git a/res/values-sq/arrays.xml b/res/values-sq/arrays.xml
index aba8967..2bd9b766 100644
--- a/res/values-sq/arrays.xml
+++ b/res/values-sq/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"I ruajtur në memorie specifike (aktiviteti i klientit)"</item>
     <item msgid="8186970968968646288">"I ruajtur në memorie specifike (bosh)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Gurkali"</item>
+    <item msgid="7216413848731287689">"E bruztë"</item>
     <item msgid="5661027589207588703">"E kaltër"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"E gjelbër"</item>
     <item msgid="6331809026622602308">"Vjollcë"</item>
     <item msgid="6390546163902724700">"Rozë"</item>
-    <item msgid="6618900408138432102">"E kuqe"</item>
+    <item msgid="6500473130620545980">"Portokalli"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Mbi 30 ditë të vjetra"</item>
diff --git a/res/values-sr/arrays.xml b/res/values-sr/arrays.xml
index 4c1406d..8cbd363 100644
--- a/res/values-sr/arrays.xml
+++ b/res/values-sr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеширана (клијент активности)"</item>
     <item msgid="8186970968968646288">"Кеширана (празно)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Плавозелена"</item>
+    <item msgid="7216413848731287689">"Тиркизна"</item>
     <item msgid="5661027589207588703">"Плава"</item>
-    <item msgid="3795787248113275442">"Тамноплава"</item>
+    <item msgid="1219738214736244749">"Зелена"</item>
     <item msgid="6331809026622602308">"Љубичаста"</item>
     <item msgid="6390546163902724700">"Розе"</item>
-    <item msgid="6618900408138432102">"Црвена"</item>
+    <item msgid="6500473130620545980">"Наранџаста"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Старије од 30 дана"</item>
diff --git a/res/values-sv/arrays.xml b/res/values-sv/arrays.xml
index aaeda5c..15ca538 100644
--- a/res/values-sv/arrays.xml
+++ b/res/values-sv/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Cachelagrad (aktivitetsklient)"</item>
     <item msgid="8186970968968646288">"Cachelagrad (tom)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Blågrön"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Blå"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Grön"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Rosa"</item>
-    <item msgid="6618900408138432102">"Röd"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Äldre än 30 dagar"</item>
diff --git a/res/values-sw/arrays.xml b/res/values-sw/arrays.xml
index 942ff6f..b3ebf18 100644
--- a/res/values-sw/arrays.xml
+++ b/res/values-sw/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Imewekwa akiba (kiteja cha shughuli)"</item>
     <item msgid="8186970968968646288">"Imewekwa akiba (tupu)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Kijani"</item>
+    <item msgid="7216413848731287689">"Samawati-Kijani"</item>
     <item msgid="5661027589207588703">"Samawati"</item>
-    <item msgid="3795787248113275442">"Nili"</item>
+    <item msgid="1219738214736244749">"Kijani"</item>
     <item msgid="6331809026622602308">"Zambarau"</item>
     <item msgid="6390546163902724700">"Waridi"</item>
-    <item msgid="6618900408138432102">"Nyekundu"</item>
+    <item msgid="6500473130620545980">"Rangi ya machungwa"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Zilizokaa zaidi ya siku 30"</item>
diff --git a/res/values-ta/arrays.xml b/res/values-ta/arrays.xml
index a2def21..fb62e80 100644
--- a/res/values-ta/arrays.xml
+++ b/res/values-ta/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"தற்காலிகச் சேமிப்பு (செயல்பாட்டு கிளையண்ட்)"</item>
     <item msgid="8186970968968646288">"தற்காலிகச் சேமிப்பு (காலி)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"பசும் நீலம்"</item>
+    <item msgid="7216413848731287689">"சியான்"</item>
     <item msgid="5661027589207588703">"நீலம்"</item>
-    <item msgid="3795787248113275442">"அடர் நீலம்"</item>
+    <item msgid="1219738214736244749">"பச்சை"</item>
     <item msgid="6331809026622602308">"ஊதா"</item>
     <item msgid="6390546163902724700">"பிங்க்"</item>
-    <item msgid="6618900408138432102">"சிவப்பு"</item>
+    <item msgid="6500473130620545980">"ஆரஞ்சு"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 நாட்களுக்கு மேல்"</item>
diff --git a/res/values-te/arrays.xml b/res/values-te/arrays.xml
index 3ac22e9..4cb9b50 100644
--- a/res/values-te/arrays.xml
+++ b/res/values-te/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"కాష్ చేసినవి (యాక్టివిటీ క్లయింట్)"</item>
     <item msgid="8186970968968646288">"కాష్ చేసినవి (ఖాళీ)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"నీలి ఆకుపచ్చ"</item>
+    <item msgid="7216413848731287689">"నీలి ఆకుపచ్చ రంగు"</item>
     <item msgid="5661027589207588703">"నీలం"</item>
-    <item msgid="3795787248113275442">"నీలిరంగు"</item>
+    <item msgid="1219738214736244749">"ఆకుపచ్చ"</item>
     <item msgid="6331809026622602308">"ఊదా"</item>
     <item msgid="6390546163902724700">"గులాబీ"</item>
-    <item msgid="6618900408138432102">"ఎరుపు"</item>
+    <item msgid="6500473130620545980">"ఆరెంజ్"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 రోజులు పైబడినవి"</item>
diff --git a/res/values-th/arrays.xml b/res/values-th/arrays.xml
index a5ee6e2..bc399ab 100644
--- a/res/values-th/arrays.xml
+++ b/res/values-th/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"แคชไว้ (ไคลเอ็นต์กิจกรรม)"</item>
     <item msgid="8186970968968646288">"แคชไว้ (ว่างเปล่า)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"น้ำเงินอมเขียว"</item>
+    <item msgid="7216413848731287689">"สีน้ำเงินเขียว"</item>
     <item msgid="5661027589207588703">"น้ำเงิน"</item>
-    <item msgid="3795787248113275442">"น้ำเงินอมม่วง"</item>
+    <item msgid="1219738214736244749">"สีเขียว"</item>
     <item msgid="6331809026622602308">"ม่วง"</item>
     <item msgid="6390546163902724700">"ชมพู"</item>
-    <item msgid="6618900408138432102">"แดง"</item>
+    <item msgid="6500473130620545980">"สีส้ม"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"เกิน 30 วัน"</item>
diff --git a/res/values-tl/arrays.xml b/res/values-tl/arrays.xml
index 11f60c0..0e5344f 100644
--- a/res/values-tl/arrays.xml
+++ b/res/values-tl/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Naka-cache (client ng gawain)"</item>
     <item msgid="8186970968968646288">"Naka-cache (walang laman)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Teal"</item>
+    <item msgid="7216413848731287689">"Cyan"</item>
     <item msgid="5661027589207588703">"Asul"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Berde"</item>
     <item msgid="6331809026622602308">"Lila"</item>
     <item msgid="6390546163902724700">"Pink"</item>
-    <item msgid="6618900408138432102">"Pula"</item>
+    <item msgid="6500473130620545980">"Orange"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Higit sa 30 araw"</item>
diff --git a/res/values-tr/arrays.xml b/res/values-tr/arrays.xml
index a648491..29c460d 100644
--- a/res/values-tr/arrays.xml
+++ b/res/values-tr/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Önbelleğe alındı (etkinlik istemcisi)"</item>
     <item msgid="8186970968968646288">"Önbelleğe alındı (boş)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Camgöbeği"</item>
+    <item msgid="7216413848731287689">"Camgöbeği"</item>
     <item msgid="5661027589207588703">"Mavi"</item>
-    <item msgid="3795787248113275442">"Çivit mavisi"</item>
+    <item msgid="1219738214736244749">"Yeşil"</item>
     <item msgid="6331809026622602308">"Mor"</item>
     <item msgid="6390546163902724700">"Pembe"</item>
-    <item msgid="6618900408138432102">"Kırmızı"</item>
+    <item msgid="6500473130620545980">"Turuncu"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 günden eski"</item>
diff --git a/res/values-uk/arrays.xml b/res/values-uk/arrays.xml
index 38c1435..6200fd1 100644
--- a/res/values-uk/arrays.xml
+++ b/res/values-uk/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Кеш (дії клієнта)"</item>
     <item msgid="8186970968968646288">"Кеш (порожньо)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Бірюзовий"</item>
+    <item msgid="7216413848731287689">"Блакитний"</item>
     <item msgid="5661027589207588703">"Синій"</item>
-    <item msgid="3795787248113275442">"Індиго"</item>
+    <item msgid="1219738214736244749">"Зелений"</item>
     <item msgid="6331809026622602308">"Фіолетовий"</item>
     <item msgid="6390546163902724700">"Рожевий"</item>
-    <item msgid="6618900408138432102">"Червоний"</item>
+    <item msgid="6500473130620545980">"Оранжевий"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Додані понад 30 днів тому"</item>
diff --git a/res/values-ur/arrays.xml b/res/values-ur/arrays.xml
index e2905a6..cab4c4b 100644
--- a/res/values-ur/arrays.xml
+++ b/res/values-ur/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"کیش کی ہوئی (سرگرمی کلائنٹ)"</item>
     <item msgid="8186970968968646288">"کیش کی ہوئی (خالی)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"color/SIM_color_cyan@"</item>
+    <item msgid="177868870612833388">"color/SIM_color_blue800@"</item>
+    <item msgid="1129898906008357171">"color/SIM_color_green800@"</item>
+    <item msgid="4206364087389793587">"color/SIM_color_purple800@"</item>
+    <item msgid="6728943460061940130">"color/SIM_color_pink800@"</item>
+    <item msgid="968332068361935002">"color/SIM_color_orange@"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"نیلگوں سبز"</item>
+    <item msgid="7216413848731287689">"سیان"</item>
     <item msgid="5661027589207588703">"نیلا"</item>
-    <item msgid="3795787248113275442">"گہرا نیلا"</item>
+    <item msgid="1219738214736244749">"سبز"</item>
     <item msgid="6331809026622602308">"جامنی"</item>
     <item msgid="6390546163902724700">"گلابی"</item>
-    <item msgid="6618900408138432102">"سرخ"</item>
+    <item msgid="6500473130620545980">"اورنج"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 دن سے زیادہ پرانی"</item>
diff --git a/res/values-uz/arrays.xml b/res/values-uz/arrays.xml
index 4686298..58bd2de 100644
--- a/res/values-uz/arrays.xml
+++ b/res/values-uz/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Keshlangan (harakat mijozi)"</item>
     <item msgid="8186970968968646288">"Keshlangan (bo‘sh)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Moviy"</item>
+    <item msgid="7216413848731287689">"Zangori"</item>
     <item msgid="5661027589207588703">"Havorang"</item>
-    <item msgid="3795787248113275442">"Indigo"</item>
+    <item msgid="1219738214736244749">"Yashil"</item>
     <item msgid="6331809026622602308">"Siyohrang"</item>
     <item msgid="6390546163902724700">"Pushti"</item>
-    <item msgid="6618900408138432102">"Qizil"</item>
+    <item msgid="6500473130620545980">"Toʻq sariq"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"30 kundan ortiq"</item>
diff --git a/res/values-vi/arrays.xml b/res/values-vi/arrays.xml
index 69d29c3..8674388 100644
--- a/res/values-vi/arrays.xml
+++ b/res/values-vi/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Được lưu trong bộ nhớ đệm (máy khách hoạt động)"</item>
     <item msgid="8186970968968646288">"Được lưu trong bộ nhớ đệm (trống)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Xanh két"</item>
+    <item msgid="7216413848731287689">"Xanh lục lam"</item>
     <item msgid="5661027589207588703">"Lam"</item>
-    <item msgid="3795787248113275442">"Chàm"</item>
+    <item msgid="1219738214736244749">"Xanh lục"</item>
     <item msgid="6331809026622602308">"Tía"</item>
     <item msgid="6390546163902724700">"Hồng"</item>
-    <item msgid="6618900408138432102">"Đỏ"</item>
+    <item msgid="6500473130620545980">"Cam"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Cách đây hơn 30 ngày"</item>
diff --git a/res/values-zh-rCN/arrays.xml b/res/values-zh-rCN/arrays.xml
index 91a864e..3b9dcf5 100644
--- a/res/values-zh-rCN/arrays.xml
+++ b/res/values-zh-rCN/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"已缓存(Activity 客户端)"</item>
     <item msgid="8186970968968646288">"已缓存(空)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"蓝绿色"</item>
+    <item msgid="7216413848731287689">"青色"</item>
     <item msgid="5661027589207588703">"蓝色"</item>
-    <item msgid="3795787248113275442">"靛青色"</item>
+    <item msgid="1219738214736244749">"绿色"</item>
     <item msgid="6331809026622602308">"紫色"</item>
     <item msgid="6390546163902724700">"粉红色"</item>
-    <item msgid="6618900408138432102">"红色"</item>
+    <item msgid="6500473130620545980">"橙色"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"超过 30 天"</item>
diff --git a/res/values-zh-rHK/arrays.xml b/res/values-zh-rHK/arrays.xml
index 74d2bf5..a06b840 100644
--- a/res/values-zh-rHK/arrays.xml
+++ b/res/values-zh-rHK/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"快取 (活動使用者端)"</item>
     <item msgid="8186970968968646288">"快取 (清空)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"藍綠色"</item>
+    <item msgid="7216413848731287689">"藍綠色"</item>
     <item msgid="5661027589207588703">"藍色"</item>
-    <item msgid="3795787248113275442">"靛藍色"</item>
+    <item msgid="1219738214736244749">"綠色"</item>
     <item msgid="6331809026622602308">"紫色"</item>
     <item msgid="6390546163902724700">"粉紅色"</item>
-    <item msgid="6618900408138432102">"紅色"</item>
+    <item msgid="6500473130620545980">"橙色"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"超過 30 天"</item>
diff --git a/res/values-zh-rTW/arrays.xml b/res/values-zh-rTW/arrays.xml
index a23587a..347c447 100644
--- a/res/values-zh-rTW/arrays.xml
+++ b/res/values-zh-rTW/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"快取 (活動用戶端)"</item>
     <item msgid="8186970968968646288">"快取 (清空)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"藍綠色"</item>
+    <item msgid="7216413848731287689">"青色"</item>
     <item msgid="5661027589207588703">"藍色"</item>
-    <item msgid="3795787248113275442">"靛藍色"</item>
+    <item msgid="1219738214736244749">"綠色"</item>
     <item msgid="6331809026622602308">"紫色"</item>
     <item msgid="6390546163902724700">"粉紅色"</item>
-    <item msgid="6618900408138432102">"紅色"</item>
+    <item msgid="6500473130620545980">"橘色"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"超過 30 天"</item>
diff --git a/res/values-zu/arrays.xml b/res/values-zu/arrays.xml
index c498737..e3bd1fe 100644
--- a/res/values-zu/arrays.xml
+++ b/res/values-zu/arrays.xml
@@ -487,13 +487,21 @@
     <item msgid="3164591924266309710">"Kulondoloziwe (iklayenti lomsebenzi)"</item>
     <item msgid="8186970968968646288">"Kulondoloziwe (lutho)"</item>
   </string-array>
+  <string-array name="sim_color_light">
+    <item msgid="7007548668267207615">"@color/SIM_color_cyan"</item>
+    <item msgid="177868870612833388">"@color/SIM_color_blue800"</item>
+    <item msgid="1129898906008357171">"@color/SIM_color_green800"</item>
+    <item msgid="4206364087389793587">"@color/SIM_color_purple800"</item>
+    <item msgid="6728943460061940130">"@color/SIM_color_pink800"</item>
+    <item msgid="968332068361935002">"@color/SIM_color_orange"</item>
+  </string-array>
   <string-array name="color_picker">
-    <item msgid="3230992859486877963">"Okuluhlaza ngokujiyile"</item>
+    <item msgid="7216413848731287689">"I-Cyan"</item>
     <item msgid="5661027589207588703">"Okuluhlaza okwesibhakabhaka"</item>
-    <item msgid="3795787248113275442">"I-Indigo"</item>
+    <item msgid="1219738214736244749">"Okuluhlaza"</item>
     <item msgid="6331809026622602308">"Phephuli"</item>
     <item msgid="6390546163902724700">"Ophinki"</item>
-    <item msgid="6618900408138432102">"Okubomvu"</item>
+    <item msgid="6500473130620545980">"Olintshi"</item>
   </string-array>
   <string-array name="automatic_storage_management_days">
     <item msgid="8896644025110620477">"Ngaphezulu kobudala obuyizinsuku ezingu-30"</item>
diff --git a/res/values/strings.xml b/res/values/strings.xml
index c1832b5..3db634b 100644
--- a/res/values/strings.xml
+++ b/res/values/strings.xml
@@ -6158,6 +6158,12 @@
     <string name="battery_tip_limited_temporarily_title">Charging temporarily limited</string>
     <!-- Summary for the battery limited temporarily tip [CHAR LIMIT=NONE] -->
     <string name="battery_tip_limited_temporarily_summary">To preserve your battery. Learn more.</string>
+    <!-- Text of battery limited temporarily tip resume charge button. [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_dialog_resume_charge">Resume charging</string>
+    <!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="default">In certain conditions, like high temperatures and long charging periods, charging may be limited to <xliff:g id="percent" example="50%">%1$s</xliff:g> to help preserve battery health.\n\nWhen those conditions end, your phone will automatically charge normally.</string>
+    <!-- Message of battery limited temporarily tip. [CHAR LIMIT=NONE] -->
+    <string name="battery_tip_limited_temporarily_dialog_msg" product="tablet">In certain conditions, like high temperatures and long charging periods, charging may be limited to <xliff:g id="percent" example="50%">%1$s</xliff:g> to help preserve battery health.\n\nWhen those conditions end, your tablet will automatically charge normally.</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
     <string name="battery_tip_dialog_message" product="default">Because you’ve used your phone more than usual, your battery may run out sooner than it normally would.\n\nApps using most battery:</string>
     <!-- Message for battery tip dialog to show the status about the battery [CHAR LIMIT=NONE] -->
@@ -7952,9 +7958,13 @@
     <!-- Enhaced 4G LTE Mode title for carriers who want to show 4G Calling.  [CHAR LIMIT=50] -->
     <string name="enhanced_4g_lte_mode_title_4g_calling">4G Calling</string>
     <!-- Enhaced 4G LTE Mode summary.  [CHAR LIMIT=100] -->
-    <string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice and other communications (recommended)</string>
+    <string name="enhanced_4g_lte_mode_summary">Use LTE services to improve voice calls (recommended)</string>
     <!-- Enhaced 4G LTE Mode summary for 4g calling.  [CHAR LIMIT=100] -->
-    <string name="enhanced_4g_lte_mode_summary_4g_calling">Use 4G services to improve voice and other communications (recommended)</string>
+    <string name="enhanced_4g_lte_mode_summary_4g_calling">Use 4G services to improve voice calls (recommended)</string>
+    <!-- NR advanced calling(VoNR or Vo5G) title.  [CHAR LIMIT=50] -->
+    <string name="nr_advanced_calling_title">Vo5G</string>
+    <!-- NR advanced calling(VoNR or Vo5G) summary.  [CHAR LIMIT=NONE] -->
+    <string name="nr_advanced_calling_summary">Use 5G for voice calls</string>
     <!-- Title of a preference determining whether or not the user has allowed the device to share
          their contacts' phone numbers with their carrier in order to implement contact discovery,
          which is a service that exchanges contacts with the carrier to determine if your
@@ -8349,6 +8359,9 @@
     <!-- List of synonyms for the enhance 4G LTE titles, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_enhance_4g_lte">volte, advanced calling, 4g calling</string>
 
+    <!-- List of synonyms for the NR advanced calling(VoNR or Vo5G) titles, used to match in settings search [CHAR LIMIT=NONE] -->
+    <string name="keywords_nr_advanced_calling">vo5g, vonr, advanced calling, 5g calling</string>
+
     <!-- List of synonyms for add language, used to match in settings search [CHAR LIMIT=NONE] -->
     <string name="keywords_add_language">add language, add a language</string>
 
@@ -9327,7 +9340,7 @@
     <string name="notification_listener_security_warning_summary">
         <xliff:g id="notification_listener_name">%1$s</xliff:g> will be able to read all notifications,
         including personal information such as contact names and the text of messages you receive.
-        This app will also be able to dismiss notifications or take action on buttons in notifications, including answering phone calls.
+        This app will also be able to snooze or dismiss notifications or take action on buttons in notifications, including answering phone calls.
         \n\nThis will also give the app the ability to turn Do Not Disturb on or off and change related settings.
     </string>
     <string name="notification_listener_disable_warning_summary">
diff --git a/res/xml/mobile_network_settings.xml b/res/xml/mobile_network_settings.xml
index 79f84d3..7d1ff09 100644
--- a/res/xml/mobile_network_settings.xml
+++ b/res/xml/mobile_network_settings.xml
@@ -247,6 +247,13 @@
             android:summary="@string/enable_2g_summary"
             settings:controller="com.android.settings.network.telephony.Enable2gPreferenceController" />
 
+        <SwitchPreference
+            android:key="nr_advanced_calling"
+            android:title="@string/nr_advanced_calling_title"
+            android:persistent="false"
+            android:summary="@string/nr_advanced_calling_summary"
+            settings:keywords="@string/keywords_nr_advanced_calling"
+            settings:controller="com.android.settings.network.telephony.NrAdvancedCallingPreferenceController"/>
     </PreferenceCategory>
 
     <Preference
diff --git a/res/xml/smart_battery_detail.xml b/res/xml/smart_battery_detail.xml
index 9c0aac5..9795125 100644
--- a/res/xml/smart_battery_detail.xml
+++ b/res/xml/smart_battery_detail.xml
@@ -22,7 +22,7 @@
     android:title="@string/smart_battery_manager_title"
     settings:keywords="@string/keywords_battery_adaptive_preferences">
 
-    <com.android.settingslib.widget.IllustrationPreferencee
+    <com.android.settingslib.widget.IllustrationPreference
         android:key="auto_awesome_battery"
         settings:lottie_rawRes="@raw/auto_awesome_battery_lottie" />
 
diff --git a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
index 9790670..0abe042 100644
--- a/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
+++ b/src/com/android/settings/connecteddevice/usb/UsbDefaultFragment.java
@@ -198,8 +198,9 @@
 
         @Override
         public void onTetheringStarted() {
-            Log.d(TAG, "onTetheringStarted()");
             // Set default usb functions again to make internal data persistent
+            mCurrentFunctions = mUsbBackend.getCurrentFunctions();
+            Log.d(TAG, "onTetheringStarted() : mCurrentFunctions " + mCurrentFunctions);
             mUsbBackend.setDefaultUsbFunctions(mCurrentFunctions);
         }
 
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
index eff538f..bab8811 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProvider.java
@@ -139,6 +139,11 @@
     boolean isChartGraphSlotsEnabled(Context context);
 
     /**
+     * Gets a intent for one time bypass charge limited to resume charging.
+     */
+    Intent getResumeChargeIntent();
+
+    /**
      * Returns battery history data with corresponding timestamp key.
      */
     Map<Long, Map<String, BatteryHistEntry>> getBatteryHistory(Context context);
diff --git a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
index 7f1bef0..208a478 100644
--- a/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
+++ b/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImpl.java
@@ -166,6 +166,11 @@
     }
 
     @Override
+    public Intent getResumeChargeIntent() {
+        return null;
+    }
+
+    @Override
     public Map<Long, Map<String, BatteryHistEntry>> getBatteryHistory(Context context) {
         return null;
     }
diff --git a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
index 58038cd..e9e5d68 100644
--- a/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
+++ b/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragment.java
@@ -20,6 +20,9 @@
 import android.app.settings.SettingsEnums;
 import android.content.Context;
 import android.content.DialogInterface;
+import android.content.Intent;
+import android.content.IntentFilter;
+import android.os.BatteryManager;
 import android.os.Bundle;
 import android.view.LayoutInflater;
 
@@ -40,6 +43,7 @@
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
 import com.android.settings.fuelgauge.batterytip.tips.UnrestrictAppTip;
 
+import java.text.NumberFormat;
 import java.util.List;
 
 /**
@@ -50,6 +54,7 @@
 
     private static final String ARG_BATTERY_TIP = "battery_tip";
     private static final String ARG_METRICS_KEY = "metrics_key";
+    private static final double CHARGE_LIMIT_LEVEL = 0.8f;
 
     @VisibleForTesting
     BatteryTip mBatteryTip;
@@ -138,6 +143,28 @@
                         .setPositiveButton(R.string.battery_tip_unrestrict_app_dialog_ok, this)
                         .setNegativeButton(R.string.battery_tip_unrestrict_app_dialog_cancel, null)
                         .create();
+            case BatteryTip.TipType.BATTERY_DEFENDER:
+                mMetricsFeatureProvider.action(context,
+                        SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, mMetricsKey);
+                final String percentage =
+                        NumberFormat.getPercentInstance().format(CHARGE_LIMIT_LEVEL);
+                final String message = context.getString(
+                        R.string.battery_tip_limited_temporarily_dialog_msg, percentage);
+                final boolean isPluggedIn = isPluggedIn();
+                final AlertDialog.Builder dialogBuilder =
+                        new AlertDialog.Builder(context)
+                                .setTitle(R.string.battery_tip_limited_temporarily_title)
+                                .setMessage(message);
+                if (isPluggedIn) {
+                    dialogBuilder
+                            .setPositiveButton(
+                                    R.string.battery_tip_limited_temporarily_dialog_resume_charge,
+                                    this)
+                            .setNegativeButton(R.string.okay, null);
+                } else {
+                    dialogBuilder.setPositiveButton(R.string.okay, null);
+                }
+                return dialogBuilder.create();
             default:
                 throw new IllegalArgumentException("unknown type " + mBatteryTip.getType());
         }
@@ -163,4 +190,11 @@
         lsn.onBatteryTipHandled(mBatteryTip);
     }
 
+    private boolean isPluggedIn() {
+        final Intent batteryIntent = getContext().registerReceiver(null /* receiver */,
+                new IntentFilter(Intent.ACTION_BATTERY_CHANGED));
+        return batteryIntent != null && batteryIntent.getIntExtra(
+                BatteryManager.EXTRA_PLUGGED, 0) != 0;
+    }
+
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
index 24cddcd..af16952 100644
--- a/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
+++ b/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderAction.java
@@ -16,12 +16,11 @@
 
 package com.android.settings.fuelgauge.batterytip.actions;
 
-import android.app.settings.SettingsEnums;
 import android.content.Intent;
 
-import com.android.settings.R;
 import com.android.settings.SettingsActivity;
-import com.android.settingslib.HelpUtils;
+import com.android.settings.overlay.FeatureFactory;
+import android.os.AsyncTask;
 
 /**
  * Action to open the Support Center article
@@ -34,19 +33,13 @@
         mSettingsActivity = settingsActivity;
     }
 
-    /**
-     * Handle the action when user clicks positive button
-     */
     @Override
     public void handlePositiveAction(int metricsKey) {
-        mMetricsFeatureProvider.action(mContext,
-                SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, metricsKey);
-        final Intent intent = HelpUtils.getHelpIntent(
-                mContext,
-                mContext.getString(R.string.help_url_battery_defender),
-                getClass().getName());
+        final Intent intent = FeatureFactory.getFactory(mContext)
+                .getPowerUsageFeatureProvider(mContext).getResumeChargeIntent();
         if (intent != null) {
-            mSettingsActivity.startActivityForResult(intent, 0);
+            // Post intent to background thread to avoid UI flaky
+            AsyncTask.execute(() -> mContext.sendBroadcast(intent));
         }
     }
 }
diff --git a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
index dc33026..5befa33 100644
--- a/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
+++ b/src/com/android/settings/fuelgauge/batterytip/detectors/BatteryDefenderDetector.java
@@ -17,7 +17,6 @@
 package com.android.settings.fuelgauge.batterytip.detectors;
 
 import com.android.settings.fuelgauge.BatteryInfo;
-import com.android.settings.fuelgauge.BatteryUtils;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 
@@ -34,7 +33,7 @@
     @Override
     public BatteryTip detect() {
         final int state =
-                BatteryUtils.isBatteryDefenderOn(mBatteryInfo)
+                mBatteryInfo.isOverheated
                     ? BatteryTip.StateType.NEW
                     : BatteryTip.StateType.INVISIBLE;
         return new BatteryDefenderTip(state);
diff --git a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
index 242be24..a2890ad 100644
--- a/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
+++ b/src/com/android/settings/fuelgauge/batterytip/tips/BatteryDefenderTip.java
@@ -29,7 +29,7 @@
 public class BatteryDefenderTip extends BatteryTip {
 
     public BatteryDefenderTip(@StateType int state) {
-        super(TipType.BATTERY_DEFENDER, state, false /* showDialog */);
+        super(TipType.BATTERY_DEFENDER, state, true /* showDialog */);
     }
 
     private BatteryDefenderTip(Parcel in) {
diff --git a/src/com/android/settings/network/telephony/MobileNetworkSettings.java b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
index adf399f..ba80a8c 100644
--- a/src/com/android/settings/network/telephony/MobileNetworkSettings.java
+++ b/src/com/android/settings/network/telephony/MobileNetworkSettings.java
@@ -193,6 +193,7 @@
                 .addListener(videoCallingPreferenceController);
         use(ContactDiscoveryPreferenceController.class).init(getParentFragmentManager(), mSubId,
                 getLifecycle());
+        use(NrAdvancedCallingPreferenceController.class).init(mSubId);
     }
 
     @Override
diff --git a/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java b/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java
new file mode 100644
index 0000000..7615fe3
--- /dev/null
+++ b/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceController.java
@@ -0,0 +1,197 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyCallback;
+import android.telephony.TelephonyManager;
+import android.util.Log;
+
+import androidx.annotation.VisibleForTesting;
+import androidx.preference.Preference;
+import androidx.preference.PreferenceScreen;
+import androidx.preference.SwitchPreference;
+
+import com.android.internal.telephony.util.ArrayUtils;
+import com.android.settingslib.core.lifecycle.LifecycleObserver;
+import com.android.settingslib.core.lifecycle.events.OnStart;
+import com.android.settingslib.core.lifecycle.events.OnStop;
+
+/**
+ * Preference controller for "Enhanced 4G LTE"
+ */
+public class NrAdvancedCallingPreferenceController extends TelephonyTogglePreferenceController
+        implements LifecycleObserver, OnStart, OnStop {
+
+    private static final String TAG = "VoNrSettings";
+
+    @VisibleForTesting
+    Preference mPreference;
+    private TelephonyManager mTelephonyManager;
+    private PhoneCallStateTelephonyCallback mTelephonyCallback;
+    private boolean mIsVonrVisibleFromCarrierConfig = false;
+    private boolean mIsNrEnableFromCarrierConfig = false;
+    private boolean mHas5gCapability = false;
+    private Integer mCallState;
+
+    public NrAdvancedCallingPreferenceController(Context context, String key) {
+        super(context, key);
+        mTelephonyManager = context.getSystemService(TelephonyManager.class);
+    }
+
+    /**
+     * Initial this PreferenceController.
+     * @param subId The subscription Id.
+     * @return This PreferenceController.
+     */
+    public NrAdvancedCallingPreferenceController init(int subId) {
+        Log.d(TAG, "init: ");
+        if (mTelephonyCallback == null) {
+            mTelephonyCallback = new PhoneCallStateTelephonyCallback();
+        }
+
+        mSubId = subId;
+
+        if (mTelephonyManager == null) {
+            mTelephonyManager = mContext.getSystemService(TelephonyManager.class);
+        }
+        if (SubscriptionManager.isValidSubscriptionId(subId)) {
+            mTelephonyManager = mTelephonyManager.createForSubscriptionId(subId);
+        }
+        long supportedRadioBitmask = mTelephonyManager.getSupportedRadioAccessFamily();
+        mHas5gCapability =
+                (supportedRadioBitmask & TelephonyManager.NETWORK_TYPE_BITMASK_NR) > 0;
+
+        PersistableBundle carrierConfig = getCarrierConfigForSubId(subId);
+        if (carrierConfig == null) {
+            return this;
+        }
+        mIsVonrVisibleFromCarrierConfig = carrierConfig.getBoolean(
+                CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL);
+
+        int[] nrAvailabilities = carrierConfig.getIntArray(
+                CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY);
+        mIsNrEnableFromCarrierConfig = !ArrayUtils.isEmpty(nrAvailabilities);
+
+        Log.d(TAG, "mHas5gCapability: " + mHas5gCapability
+                + ",mIsNrEnabledFromCarrierConfig: " + mIsNrEnableFromCarrierConfig
+                + ",mIsVonrVisibleFromCarrierConfig: " + mIsVonrVisibleFromCarrierConfig);
+        return this;
+    }
+
+    @Override
+    public int getAvailabilityStatus(int subId) {
+        init(subId);
+
+        if (mHas5gCapability && mIsNrEnableFromCarrierConfig && mIsVonrVisibleFromCarrierConfig) {
+            return AVAILABLE;
+        }
+        return CONDITIONALLY_UNAVAILABLE;
+    }
+
+    @Override
+    public void displayPreference(PreferenceScreen screen) {
+        super.displayPreference(screen);
+        mPreference = screen.findPreference(getPreferenceKey());
+    }
+
+    @Override
+    public void onStart() {
+        if (mTelephonyCallback == null) {
+            return;
+        }
+        mTelephonyCallback.register(mTelephonyManager);
+    }
+
+    @Override
+    public void onStop() {
+        if (mTelephonyCallback == null) {
+            return;
+        }
+        mTelephonyCallback.unregister();
+    }
+
+    @Override
+    public void updateState(Preference preference) {
+        super.updateState(preference);
+        if (preference == null) {
+            return;
+        }
+        final SwitchPreference switchPreference = (SwitchPreference) preference;
+        switchPreference.setEnabled(isUserControlAllowed());
+    }
+
+    @Override
+    public boolean setChecked(boolean isChecked) {
+        if (!SubscriptionManager.isValidSubscriptionId(mSubId)) {
+            return false;
+        }
+        Log.d(TAG, "setChecked: " + isChecked);
+        int result = mTelephonyManager.setVoNrEnabled(isChecked);
+        if (result == TelephonyManager.ENABLE_VONR_SUCCESS) {
+            return true;
+        }
+        Log.d(TAG, "Fail to set VoNR result= " + result + ". subId=" + mSubId);
+        return false;
+    }
+
+    @Override
+    public boolean isChecked() {
+        return mTelephonyManager.isVoNrEnabled();
+    }
+
+    @VisibleForTesting
+    protected boolean isCallStateIdle() {
+        return (mCallState != null) && (mCallState == TelephonyManager.CALL_STATE_IDLE);
+    }
+
+    private boolean isUserControlAllowed() {
+        return isCallStateIdle();
+    }
+
+    private class PhoneCallStateTelephonyCallback extends TelephonyCallback implements
+            TelephonyCallback.CallStateListener {
+
+        private TelephonyManager mLocalTelephonyManager;
+
+        @Override
+        public void onCallStateChanged(int state) {
+            mCallState = state;
+            updateState(mPreference);
+        }
+
+        public void register(TelephonyManager telephonyManager) {
+            mLocalTelephonyManager = telephonyManager;
+
+            // assign current call state so that it helps to show correct preference state even
+            // before first onCallStateChanged() by initial registration.
+            mCallState = mLocalTelephonyManager.getCallState();
+            mLocalTelephonyManager.registerTelephonyCallback(
+                    mContext.getMainExecutor(), mTelephonyCallback);
+        }
+
+        public void unregister() {
+            mCallState = null;
+            if (mLocalTelephonyManager != null) {
+                mLocalTelephonyManager.unregisterTelephonyCallback(this);
+            }
+        }
+    }
+}
diff --git a/src/com/android/settings/notification/history/NotificationHistoryAdapter.java b/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
index dfa8a30..96bc14a 100644
--- a/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationHistoryAdapter.java
@@ -90,7 +90,6 @@
                     .putExtra(EXTRA_APP_PACKAGE, hn.getPackage())
                     .putExtra(EXTRA_CHANNEL_ID, hn.getChannelId())
                     .putExtra(EXTRA_CONVERSATION_ID, hn.getConversationId());
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             holder.itemView.getContext().startActivityAsUser(intent, UserHandle.of(hn.getUserId()));
         };
         holder.itemView.setOnClickListener(onClick);
diff --git a/src/com/android/settings/notification/history/NotificationSbnAdapter.java b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
index e032854..7eca3b7 100644
--- a/src/com/android/settings/notification/history/NotificationSbnAdapter.java
+++ b/src/com/android/settings/notification/history/NotificationSbnAdapter.java
@@ -133,7 +133,6 @@
                         .putExtra(EXTRA_APP_PACKAGE, sbn.getPackageName())
                         .putExtra(EXTRA_CHANNEL_ID, sbn.getNotification().getChannelId())
                         .putExtra(EXTRA_CONVERSATION_ID, sbn.getNotification().getShortcutId());
-                intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
                 holder.itemView.getContext().startActivityAsUser(intent, UserHandle.of(userId));
                 return true;
             });
diff --git a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
index eee6398..2317c97 100644
--- a/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/connecteddevice/usb/UsbDefaultFragmentTest.java
@@ -183,7 +183,7 @@
 
     @Test
     public void onTetheringStarted_currentFunctionsIsRndis_setsRndisAsDefaultUsbFunctions() {
-        mFragment.mCurrentFunctions = UsbManager.FUNCTION_RNDIS;
+        when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_RNDIS);
 
         mFragment.mOnStartTetheringCallback.onTetheringStarted();
 
@@ -192,7 +192,7 @@
 
     @Test
     public void onTetheringStarted_currentFunctionsIsNcm_setsNcmAsDefaultUsbFunctions() {
-        mFragment.mCurrentFunctions = UsbManager.FUNCTION_NCM;
+        when(mUsbBackend.getCurrentFunctions()).thenReturn(UsbManager.FUNCTION_NCM);
 
         mFragment.mOnStartTetheringCallback.onTetheringStarted();
 
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
index e8a9c5c..c0b566a 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/PowerUsageFeatureProviderImplTest.java
@@ -155,4 +155,9 @@
 
         assertThat(mPowerFeatureProvider.isSmartBatterySupported()).isFalse();
     }
+
+    @Test
+    public void testGetResumeChargeIntent_returnNull() {
+        assertThat(mPowerFeatureProvider.getResumeChargeIntent()).isNull();
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
index 331fb34..99fbaf3 100644
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
+++ b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/BatteryTipDialogFragmentTest.java
@@ -31,6 +31,7 @@
 import androidx.fragment.app.FragmentActivity;
 
 import com.android.settings.R;
+import com.android.settings.fuelgauge.batterytip.tips.BatteryDefenderTip;
 import com.android.settings.fuelgauge.batterytip.tips.BatteryTip;
 import com.android.settings.fuelgauge.batterytip.tips.HighUsageTip;
 import com.android.settings.fuelgauge.batterytip.tips.RestrictAppTip;
@@ -74,6 +75,7 @@
     private RestrictAppTip mRestrictTwoAppsTip;
     private UnrestrictAppTip mUnrestrictAppTip;
     private SummaryTip mSummaryTip;
+    private BatteryDefenderTip mDefenderTip;
     private AppInfo mAppInfo;
     private ShadowPackageManager mPackageManager;
 
@@ -116,6 +118,7 @@
         mUnrestrictAppTip = new UnrestrictAppTip(BatteryTip.StateType.NEW, mAppInfo);
         mSummaryTip = spy(new SummaryTip(BatteryTip.StateType.NEW,
                 EstimateKt.AVERAGE_TIME_TO_DISCHARGE_UNKNOWN));
+        mDefenderTip = new BatteryDefenderTip(BatteryTip.StateType.NEW);
     }
 
     @After
@@ -243,4 +246,20 @@
                         + "your phone will suggest actions you can take.\n\nYou can always turn"
                         + " on Battery Saver if you’re running low on battery.");
     }
+
+    @Test
+    public void testOnCreateDialog_defenderTip_fireDialog() {
+        mDialogFragment = BatteryTipDialogFragment.newInstance(mDefenderTip, METRICS_KEY);
+
+        FragmentController.setupFragment(mDialogFragment, FragmentActivity.class,
+                0 /* containerViewId */, null /* bundle */);
+
+        final AlertDialog dialog = ShadowAlertDialogCompat.getLatestAlertDialog();
+        ShadowAlertDialogCompat shadowDialog = ShadowAlertDialogCompat.shadowOf(dialog);
+
+        assertThat(shadowDialog.getTitle()).isEqualTo(
+                mContext.getString(R.string.battery_tip_limited_temporarily_title));
+        assertThat(shadowDialog.getMessage()).isEqualTo(
+                mContext.getString(R.string.battery_tip_limited_temporarily_dialog_msg, "80%"));
+    }
 }
diff --git a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderActionTest.java b/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderActionTest.java
deleted file mode 100644
index ad5dc54..0000000
--- a/tests/robotests/src/com/android/settings/fuelgauge/batterytip/actions/BatteryDefenderActionTest.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (C) 2021 The Android Open Source Project
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.android.settings.fuelgauge.batterytip.actions;
-
-
-import static com.google.common.truth.Truth.assertThat;
-
-import static org.mockito.Mockito.doReturn;
-import static org.mockito.Mockito.spy;
-import static org.mockito.Mockito.verify;
-
-import android.app.settings.SettingsEnums;
-import android.content.Context;
-
-import com.android.settings.R;
-import com.android.settings.SettingsActivity;
-import com.android.settings.testutils.FakeFeatureFactory;
-import com.android.settingslib.core.instrumentation.MetricsFeatureProvider;
-
-import org.junit.Before;
-import org.junit.Test;
-import org.junit.runner.RunWith;
-import org.mockito.Mock;
-import org.mockito.MockitoAnnotations;
-import org.robolectric.RobolectricTestRunner;
-import org.robolectric.RuntimeEnvironment;
-
-@RunWith(RobolectricTestRunner.class)
-public final class BatteryDefenderActionTest {
-
-    private Context mContext;
-    private FakeFeatureFactory mFeatureFactory;
-    private BatteryDefenderAction mBatteryDefenderAction;
-    private MetricsFeatureProvider mMetricsFeatureProvider;
-
-    @Mock private SettingsActivity mSettingsActivity;
-
-    @Before
-    public void setUp() {
-        MockitoAnnotations.initMocks(this);
-
-        mFeatureFactory = FakeFeatureFactory.setupForTest();
-        mMetricsFeatureProvider = mFeatureFactory.metricsFeatureProvider;
-        mContext = spy(RuntimeEnvironment.application);
-        doReturn(mContext).when(mSettingsActivity).getApplicationContext();
-        mBatteryDefenderAction = new BatteryDefenderAction(mSettingsActivity);
-    }
-
-    @Test
-    public void testHandlePositiveAction_logMetric() {
-        final int metricKey = 10;
-        mBatteryDefenderAction.handlePositiveAction(metricKey);
-
-        verify(mMetricsFeatureProvider).action(mContext,
-                SettingsEnums.ACTION_TIP_BATTERY_DEFENDER, metricKey);
-    }
-}
diff --git a/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java b/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java
new file mode 100644
index 0000000..9eb67df
--- /dev/null
+++ b/tests/unit/src/com/android/settings/network/telephony/NrAdvancedCallingPreferenceControllerTest.java
@@ -0,0 +1,168 @@
+/*
+ * Copyright (C) 2021 The Android Open Source Project
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package com.android.settings.network.telephony;
+
+import static com.google.common.truth.Truth.assertThat;
+
+import static org.mockito.ArgumentMatchers.anyBoolean;
+import static org.mockito.Mockito.doReturn;
+import static org.mockito.Mockito.spy;
+import static org.mockito.Mockito.when;
+
+import android.content.Context;
+import android.os.PersistableBundle;
+import android.telephony.CarrierConfigManager;
+import android.telephony.SubscriptionManager;
+import android.telephony.TelephonyManager;
+
+import androidx.preference.SwitchPreference;
+import androidx.test.core.app.ApplicationProvider;
+import androidx.test.ext.junit.runners.AndroidJUnit4;
+
+import com.android.settings.core.BasePreferenceController;
+import com.android.settingslib.RestrictedSwitchPreference;
+
+import org.junit.Before;
+import org.junit.Test;
+import org.junit.runner.RunWith;
+import org.mockito.Mock;
+import org.mockito.MockitoAnnotations;
+
+@RunWith(AndroidJUnit4.class)
+public class NrAdvancedCallingPreferenceControllerTest {
+    private static final int SUB_ID = 2;
+
+    @Mock
+    private TelephonyManager mTelephonyManager;
+    @Mock
+    private TelephonyManager mInvalidTelephonyManager;
+    @Mock
+    private SubscriptionManager mSubscriptionManager;
+    @Mock
+    private CarrierConfigManager mCarrierConfigManager;
+
+    private NrAdvancedCallingPreferenceController mController;
+    private SwitchPreference mPreference;
+    private PersistableBundle mCarrierConfig;
+    private Context mContext;
+
+    @Before
+    public void setUp() {
+        MockitoAnnotations.initMocks(this);
+
+        mContext = spy(ApplicationProvider.getApplicationContext());
+        when(mContext.getSystemService(TelephonyManager.class)).thenReturn(mTelephonyManager);
+        when(mContext.getSystemService(SubscriptionManager.class)).thenReturn(mSubscriptionManager);
+        when(mContext.getSystemService(CarrierConfigManager.class))
+                .thenReturn(mCarrierConfigManager);
+
+        doReturn(mTelephonyManager).when(mTelephonyManager).createForSubscriptionId(SUB_ID);
+        doReturn(mInvalidTelephonyManager).when(mTelephonyManager).createForSubscriptionId(
+                SubscriptionManager.INVALID_SUBSCRIPTION_ID);
+        doReturn(TelephonyManager.NETWORK_TYPE_BITMASK_NR).when(
+                mTelephonyManager).getSupportedRadioAccessFamily();
+        doReturn(false).when(mTelephonyManager).isVoNrEnabled();
+        doReturn(TelephonyManager.ENABLE_VONR_REQUEST_NOT_SUPPORTED).when(
+                mTelephonyManager).setVoNrEnabled(anyBoolean());
+        mCarrierConfig = new PersistableBundle();
+        doReturn(mCarrierConfig).when(mCarrierConfigManager).getConfigForSubId(SUB_ID);
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL, false);
+        mCarrierConfig.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
+                new int[]{1, 2});
+
+        mPreference = new RestrictedSwitchPreference(mContext);
+        mController = spy(new NrAdvancedCallingPreferenceController(mContext, "VoNr"));
+        mController.init(SUB_ID);
+        doReturn(true).when(mController).isCallStateIdle();
+        mPreference.setKey(mController.getPreferenceKey());
+    }
+
+    @Test
+    public void getAvailabilityStatus_vonrDisabled_returnUnavailable() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL, false);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_vonrEnabled_returnAvailable() {
+        mCarrierConfig.putBoolean(CarrierConfigManager.KEY_VONR_SETTING_VISIBILITY_BOOL, true);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.AVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_deviceNoNr_returnUnavailable() {
+        doReturn(TelephonyManager.NETWORK_TYPE_BITMASK_LTE).when(
+                mTelephonyManager).getSupportedRadioAccessFamily();
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_carrierNoNr_returnUnavailable() {
+        mCarrierConfig.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
+                new int[0]);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void getAvailabilityStatus_carrierConfigNrIsNull_returnUnavailable() {
+        mCarrierConfig.putIntArray(CarrierConfigManager.KEY_CARRIER_NR_AVAILABILITIES_INT_ARRAY,
+                null);
+
+        mController.init(SUB_ID);
+
+        assertThat(mController.getAvailabilityStatus()).isEqualTo(
+                BasePreferenceController.CONDITIONALLY_UNAVAILABLE);
+    }
+
+    @Test
+    public void updateState_callStateNotIdle_prefDisabled() {
+        doReturn(false).when(mController).isCallStateIdle();
+        mPreference.setEnabled(true);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isEnabled()).isFalse();
+    }
+
+    @Test
+    public void updateState_configOn_prefChecked() {
+        doReturn(TelephonyManager.ENABLE_VONR_SUCCESS).when(
+                mTelephonyManager).setVoNrEnabled(anyBoolean());
+        doReturn(true).when(mTelephonyManager).isVoNrEnabled();
+        mPreference.setChecked(false);
+
+        mController.updateState(mPreference);
+
+        assertThat(mPreference.isChecked()).isTrue();
+    }
+}