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

Commit e3f7570f authored by Jack Yu's avatar Jack Yu Committed by Automerger Merge Worker
Browse files

Merge "Cell broadcast receiver should not be replaced" into rvc-dev am: b31272dd 

Change-Id: I84006750b860c39e48e817d6feb00911264af06e
parents 328a3bc8 b31272dd

core/res/res/values/config.xml

+1 −6
Original line number Diff line number Diff line
@@ -3575,11 +3575,6 @@ 
    <!-- Flag indicates that whether non-system apps can be installed on internal storage. -->

    <bool name="config_allow3rdPartyAppOnInternal">true</bool>



    <!-- Package names of the default cell broadcast receivers -->

    <string-array name="config_defaultCellBroadcastReceiverPkgs" translatable="false">

        <item>com.android.cellbroadcastreceiver</item>

    </string-array>



    <!-- Specifies the path that is used by AdaptiveIconDrawable class to crop launcher icons. -->

    <string name="config_icon_mask" translatable="false">"M50,0L92,0C96.42,0 100,4.58 100 8L100,92C100, 96.42 96.42 100 92 100L8 100C4.58, 100 0 96.42 0 92L0 8 C 0 4.42 4.42 0 8 0L50 0Z"</string>

core/res/res/values/symbols.xml

+0 −1
Original line number Diff line number Diff line
@@ -3175,7 +3175,6 @@ 
  <java-symbol type="drawable" name="lockscreen_selected" />



  <java-symbol type="string" name="notification_header_divider_symbol_with_spaces" />

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



  <java-symbol type="color" name="notification_primary_text_color_light" />

  <java-symbol type="color" name="notification_primary_text_color_dark" />