am 65d4445b: Merge "Add config option to enable links to Cell Broadcast app." into jb-dev

* commit '65d4445bfd3351609f786fdf6038ddd362a3d6ca':
  Add config option to enable links to Cell Broadcast app.
This commit is contained in:
Jake Hamby
2012-06-21 12:34:35 -07:00
committed by Android Git Automerger
2 changed files with 4 additions and 0 deletions

View File

@@ -862,4 +862,7 @@
[bootmode]:[original USB mode]:[USB mode used]-->
<integer-array translatable="false" name="config_oemUsbModeOverride">
</integer-array>
<!-- Set to true to add links to Cell Broadcast app from Settings and MMS app. -->
<bool name="config_cellBroadcastAppLinks">false</bool>
</resources>

View File

@@ -243,6 +243,7 @@
<java-symbol type="bool" name="config_allowActionMenuItemTextWithIcon" />
<java-symbol type="bool" name="config_bluetooth_adapter_quick_switch" />
<java-symbol type="bool" name="config_bluetooth_sco_off_call" />
<java-symbol type="bool" name="config_cellBroadcastAppLinks" />
<java-symbol type="bool" name="config_duplicate_port_omadm_wappush" />
<java-symbol type="bool" name="config_enable_emergency_call_while_sim_locked" />
<java-symbol type="bool" name="config_enable_puk_unlock_screen" />