From 48bba35dc1f0b2ca4455e400d5fe87824b0a7eae Mon Sep 17 00:00:00 2001
From: Sooraj Sasindran <sasindran@google.com>
Date: Tue, 21 Jan 2020 18:41:14 -0800
Subject: [PATCH] make sim_colors a system config

make sim_colors a system config

Bug: 143289541
Test: verified that symbol is accessible as android.R and values are
still valid through logs.

Change-Id: Ie0189ef3befff9f1e2da127a1f4cef69f8f7043e
---
 api/system-current.txt          | 1 +
 core/res/res/values/arrays.xml  | 2 +-
 core/res/res/values/public.xml  | 5 +++++
 core/res/res/values/symbols.xml | 2 +-
 4 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index f032a7100fe22..48e5c27493a36 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -241,6 +241,7 @@ package android {
 
   public static final class R.array {
     field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005
+    field public static final int simColors = 17235974; // 0x1070006
   }
 
   public static final class R.attr {
diff --git a/core/res/res/values/arrays.xml b/core/res/res/values/arrays.xml
index 8f2d6c3e02f4b..deb6afcfa3b4c 100644
--- a/core/res/res/values/arrays.xml
+++ b/core/res/res/values/arrays.xml
@@ -165,7 +165,7 @@
         <item>中文 (繁體)</item>
     </string-array>
 
-    <array name="sim_colors">
+    <array name="simColors">
         <item>@color/Teal_700</item>
         <item>@color/Blue_700</item>
         <item>@color/Indigo_700</item>
diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml
index 36dbcbd539779..c081354a7d3a2 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3059,6 +3059,11 @@
       <public name="accessibilitySystemActionLockScreen" />
       <public name="accessibilitySystemActionTakeScreenshot" />
     </public-group>
+
+    <public-group type="array" first-id="0x01070006">
+      <!-- @hide @SystemApi -->
+      <public name="simColors" />
+    </public-group>
   <!-- ===============================================================
        DO NOT ADD UN-GROUPED ITEMS HERE
 
diff --git a/core/res/res/values/symbols.xml b/core/res/res/values/symbols.xml
index 357b1f069107c..7032819644429 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1235,7 +1235,7 @@
   <java-symbol type="array" name="preloaded_color_state_lists" />
   <java-symbol type="array" name="preloaded_drawables" />
   <java-symbol type="array" name="preloaded_freeform_multi_window_drawables" />
-  <java-symbol type="array" name="sim_colors" />
+  <java-symbol type="array" name="simColors" />
   <java-symbol type="array" name="special_locale_codes" />
   <java-symbol type="array" name="special_locale_names" />
   <java-symbol type="array" name="supported_locales" />