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

Merge "Add resource to disable cb" am: d7858116ca am: 52c4c695a8

Browse Source 
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1650607

Change-Id: I1c75fcbafe846e303ab9d0d46cb8679baa3bbab5
This commit is contained in:
Jordan Liu
2021-03-23 23:15:03 +00:00
committed by Automerger Merge Worker
parent b5cb526563 52c4c695a8
commit 41adde9ab3
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -4372,6 +4372,11 @@
check after reboot or airplane mode toggling -->
<bool translatable="false" name="reset_geo_fencing_check_after_boot_or_apm">false</bool>
<!-- Boolean indicating whether all CB messages should be disabled on this device. This config
is intended to be used by OEMs who need to disable CB messages for regulatory requirements,
(e.g. the device is a tablet in a country where tablets should not receive CB messages) -->
<bool translatable="false" name="config_disable_all_cb_messages">false</bool>
<!-- Screen Wake Keys
Determines whether the specified key groups can be used to wake up the device. -->
<bool name="config_wakeOnDpadKeyPress">true</bool>

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

@@ -3854,6 +3854,7 @@
<java-symbol type="layout" name="chooser_action_button" />
<java-symbol type="dimen" name="chooser_action_button_icon_size" />
<java-symbol type="string" name="config_defaultNearbySharingComponent" />
<java-symbol type="bool" name="config_disable_all_cb_messages" />
<java-symbol type="drawable" name="ic_close" />
<java-symbol type="bool" name="config_automotiveHideNavBarForKeyboard" />