Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Jack Yu
2020-04-17 22:07:31 +00:00
committed by Android (Google) Code Review
parent 28ea0461c1 91e1426d33
commit b31272ddcd
2 changed files with 1 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
core/res/res/values/config.xml
View File

@@ -246,7 +246,7 @@
correctly use them when installed on your device. Otherwise, keep this disabled correctly use them when installed on your device. Otherwise, keep this disabled
so that applications can still use their own mechanisms. --> so that applications can still use their own mechanisms. -->
<bool name="config_enableAutoPowerModes">false</bool> <bool name="config_enableAutoPowerModes">false</bool>
<!-- Whether (if true) this is a kind of device that can be moved around (eg. phone/laptop), <!-- Whether (if true) this is a kind of device that can be moved around (eg. phone/laptop),
or (if false) something for which movement is either not measurable or should not count or (if false) something for which movement is either not measurable or should not count
toward power states (eg. tv/soundbar). --> toward power states (eg. tv/soundbar). -->
@@ -3575,11 +3575,6 @@
<!-- Flag indicates that whether non-system apps can be installed on internal storage. --> <!-- Flag indicates that whether non-system apps can be installed on internal storage. -->
<bool name="config_allow3rdPartyAppOnInternal">true</bool> <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. --> <!-- 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> <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>

1
core/res/res/values/symbols.xml
View File

@@ -3175,7 +3175,6 @@
<java-symbol type="drawable" name="lockscreen_selected" /> <java-symbol type="drawable" name="lockscreen_selected" />
<java-symbol type="string" name="notification_header_divider_symbol_with_spaces" /> <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_light" />
<java-symbol type="color" name="notification_primary_text_color_dark" /> <java-symbol type="color" name="notification_primary_text_color_dark" />