diff options
| author | 2020-01-24 05:36:14 +0000 | |
|---|---|---|
| committer | 2020-01-24 05:36:14 +0000 | |
| commit | 4957036a1f10fdced6cc80e32e6ea49935cdcd55 (patch) | |
| tree | fb29f04c9c41dd870535d6bce9dbb16e918e3ae3 | |
| parent | b945621eb2e12d9c6a51d3bf36a63da3d54e44d2 (diff) | |
| parent | 48bba35dc1f0b2ca4455e400d5fe87824b0a7eae (diff) | |
Merge "make sim_colors a system config"
| -rwxr-xr-x | api/system-current.txt | 1 | ||||
| -rw-r--r-- | core/res/res/values/arrays.xml | 2 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 5 | ||||
| -rw-r--r-- | 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 f61dcc6f9c4d..b1079856b538 100755 --- a/api/system-current.txt +++ b/api/system-current.txt @@ -246,6 +246,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 8f2d6c3e02f4..deb6afcfa3b4 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 d43c9fdb794a..5e394400e80c 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -3065,6 +3065,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 d437318a3296..18ca003dd8c6 100644 --- a/core/res/res/values/symbols.xml +++ b/core/res/res/values/symbols.xml @@ -1241,7 +1241,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" /> |