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

Commit 41adde9a authored by Jordan Liu's avatar Jordan Liu Committed by Automerger Merge Worker
Browse files

Merge "Add resource to disable cb" am: d7858116 am: 52c4c695 

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

Change-Id: I1c75fcbafe846e303ab9d0d46cb8679baa3bbab5
parents b5cb5265 52c4c695

core/res/res/values/config.xml

+5 −0
Original line number Diff line number Diff line
@@ -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>

core/res/res/values/symbols.xml

+1 −0
Original line number Diff line number Diff line
@@ -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" />