Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 86c96ec2 authored by Daniel Bright's avatar Daniel Bright Committed by Automerger Merge Worker
Browse files

Merge "Remove simColors from public.xml and rename" am: 30970c17 am: 96a4994f 

Change-Id: Ib8b28f5e04da7cdd223fa02e5d37cff3a4363c6c
parents 6d8a3c37 96a4994f

api/system-current.txt

+0 −1
Original line number Original line Diff line number Diff line
@@ -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 {

































core/res/res/values/arrays.xml



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -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>

































core/res/res/values/public.xml



+0
−4




























Original line number
Original line
Diff line number
Diff line








@@ -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





















































core/res/res/values/symbols.xml



+1
−1




























Original line number
Original line
Diff line number
Diff line








@@ -1304,7 +1304,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" />