From 476f3dabf1ea2eef4da3e74b26bf9d0d92c3e590 Mon Sep 17 00:00:00 2001
From: Daniel Bright <dbright@google.com>
Date: Wed, 11 Mar 2020 17:49:44 -0700
Subject: [PATCH] Remove simColors from public.xml and rename

* Renaming simColors back to sim_colors
* Remove simColors from public.xml
* Rename in symbols.xml

Bug: 143289541
Test: make
Merged-In: Ida5aafb2db2b47ac5fb0ac098927c0801a717d9b
Change-Id: Ida5aafb2db2b47ac5fb0ac098927c0801a717d9b
---
 api/system-current.txt          | 1 -
 core/res/res/values/arrays.xml  | 2 +-
 core/res/res/values/public.xml  | 4 ----
 core/res/res/values/symbols.xml | 2 +-
 4 files changed, 2 insertions(+), 7 deletions(-)

diff --git a/api/system-current.txt b/api/system-current.txt
index 70e8a852754ca..b9fde130cf474 100755
--- a/api/system-current.txt
+++ b/api/system-current.txt
@@ -229,7 +229,6 @@ 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 67079477a4b87..dca9c7234e13d 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="simColors">
+    <array name="sim_colors">
         <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 8a7b515ee4363..fb54566fc9593 100644
--- a/core/res/res/values/public.xml
+++ b/core/res/res/values/public.xml
@@ -3021,10 +3021,6 @@
     <public-group type="color" first-id="0x0106001d">
     </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 7102f6c972473..fad5e37e38b17 100644
--- a/core/res/res/values/symbols.xml
+++ b/core/res/res/values/symbols.xml
@@ -1303,7 +1303,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="simColors" />
+  <java-symbol type="array" name="sim_colors" />
   <java-symbol type="array" name="special_locale_codes" />
   <java-symbol type="array" name="special_locale_names" />
   <java-symbol type="array" name="supported_locales" />