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

Commit 4f1e5614 authored by Sanket Padawe's avatar Sanket Padawe Committed by Android Git Automerger
Browse files

am 4960a5bb: Merge "Changes related to setting default color for sim in... 

am 4960a5bb: Merge "Changes related to setting default color for sim in multisim." into lmp-mr1-dev automerge: d12b6951

* commit '4960a5bb':
  Changes related to setting default color for sim in multisim.
parents cf6e9c22 4960a5bb

core/res/res/values/arrays.xml

+9 −0
Original line number Diff line number Diff line
@@ -441,4 +441,13 @@ 
        <item>中文 (繁體)</item>

    </string-array>



    <array name="sim_colors">

        <item>@color/Teal_700</item>

        <item>@color/Blue_700</item>

        <item>@color/Indigo_700</item>

        <item>@color/Purple_700</item>

        <item>@color/Pink_700</item>

        <item>@color/Red_700</item>

    </array>



</resources>

core/res/res/values/colors.xml

+14 −1
Original line number Diff line number Diff line
@@ -160,5 +160,18 @@ 
    <color name="user_icon_8">#ffff5722</color><!-- deep orange 500 -->

    <color name="user_icon_default_gray">#ff9e9e9e</color><!-- gray 500 -->

    <color name="user_icon_default_white">#ffffffff</color><!-- white -->

</resources>



    <!-- Multi-sim sim colors -->

    <color name="Teal_700">#ff00796b</color>

    <color name="Teal_800">#ff00695c</color>

    <color name="Blue_700">#ff3367d6</color>

    <color name="Blue_800">#ff2a56c6</color>

    <color name="Indigo_700">#ff303f9f</color>

    <color name="Indigo_800">#ff283593</color>

    <color name="Purple_700">#ff7b1fa2</color>

    <color name="Purple_800">#ff6a1b9a</color>

    <color name="Pink_700">#ffc2185b</color>

    <color name="Pink_800">#ffad1457</color>

    <color name="Red_700">#ffc53929</color>

    <color name="Red_800">#ffb93221</color>

</resources>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -1073,6 +1073,7 @@ 
  <java-symbol type="array" name="networkAttributes" />

  <java-symbol type="array" name="preloaded_color_state_lists" />

  <java-symbol type="array" name="preloaded_drawables" />

  <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="config_masterVolumeRamp" />