Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "Remove simColors from public.xml and rename"

Browse Source
This commit is contained in:
Daniel Bright
2020-04-06 19:49:55 +00:00
committed by Gerrit Code Review
parent c8b4f60e85 476f3dabf1
commit 30970c1745
4 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
api/system-current.txt
View File

@@ -229,7 +229,6 @@ package android {
public static final class R.array { public static final class R.array {
field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005 field public static final int config_keySystemUuidMapping = 17235973; // 0x1070005
field public static final int simColors = 17235974; // 0x1070006
} }
public static final class R.attr { public static final class R.attr {

2
core/res/res/values/arrays.xml
View File

@@ -165,7 +165,7 @@
<item>中文 (繁體)</item> <item>中文 (繁體)</item>
</string-array> </string-array>
<array name="simColors"> <array name="sim_colors">
<item>@color/Teal_700</item> <item>@color/Teal_700</item>
<item>@color/Blue_700</item> <item>@color/Blue_700</item>
<item>@color/Indigo_700</item> <item>@color/Indigo_700</item>

4
core/res/res/values/public.xml
View File

@@ -3021,10 +3021,6 @@
<public-group type="color" first-id="0x0106001d"> <public-group type="color" first-id="0x0106001d">
</public-group> </public-group>
<public-group type="array" first-id="0x01070006">
<!-- @hide @SystemApi -->
<public name="simColors" />
</public-group>
<!-- =============================================================== <!-- ===============================================================
DO NOT ADD UN-GROUPED ITEMS HERE DO NOT ADD UN-GROUPED ITEMS HERE

2
core/res/res/values/symbols.xml
View File

@@ -1303,7 +1303,7 @@
<java-symbol type="array" name="preloaded_color_state_lists" /> <java-symbol type="array" name="preloaded_color_state_lists" />
<java-symbol type="array" name="preloaded_drawables" /> <java-symbol type="array" name="preloaded_drawables" />
<java-symbol type="array" name="preloaded_freeform_multi_window_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_codes" />
<java-symbol type="array" name="special_locale_names" /> <java-symbol type="array" name="special_locale_names" />
<java-symbol type="array" name="supported_locales" /> <java-symbol type="array" name="supported_locales" />