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

Commit 4957036a authored by Sooraj Sasindran's avatar Sooraj Sasindran Committed by Android (Google) Code Review
Browse files

Merge "make sim_colors a system config"

parents b945621e 48bba35d

api/system-current.txt

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

































core/res/res/values/arrays.xml



+1
−1




























Original line number
Diff line number
Diff line








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

































core/res/res/values/public.xml



+5
−0




























Original line number
Diff line number
Diff line








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

















































core/res/res/values/symbols.xml



+1
−1




























Original line number
Diff line number
Diff line








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