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

Commit 15faa1a3 authored by Automerger Merge Worker's avatar Automerger Merge Worker
Browse files

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

Merge "Merge "Cell broadcast receiver should not be replaced" into rvc-dev am: b31272dd am: e3f7570f" into rvc-d1-dev-plus-aosp am: ba581c62 am: dfd0307c

Change-Id: Iece9781adfdab5b488229fcf7e14d183cc34583c
parents 0ad39f17 dfd0307c

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