diff options
| author | Jake Hamby <jhamby@google.com> | 2012-06-21 12:32:39 -0700 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2012-06-21 12:32:39 -0700 |
| commit | 65d4445bfd3351609f786fdf6038ddd362a3d6ca (patch) | |
| tree | 6a145fe5159e30a937dc0288946ad95ebb695c65 | |
| parent | ed5cc0e1f7648962f5c93e1277d282be75bcd537 (diff) | |
| parent | 43af7e075622a315ffef6028264853c178ff4312 (diff) | |
| download | frameworks_base-65d4445bfd3351609f786fdf6038ddd362a3d6ca.zip frameworks_base-65d4445bfd3351609f786fdf6038ddd362a3d6ca.tar.gz frameworks_base-65d4445bfd3351609f786fdf6038ddd362a3d6ca.tar.bz2 | |
Merge "Add config option to enable links to Cell Broadcast app." into jb-dev
| -rwxr-xr-x | core/res/res/values/config.xml | 3 | ||||
| -rw-r--r-- | core/res/res/values/public.xml | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/core/res/res/values/config.xml b/core/res/res/values/config.xml index f623d48..ccc85a3 100755 --- a/core/res/res/values/config.xml +++ b/core/res/res/values/config.xml @@ -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> diff --git a/core/res/res/values/public.xml b/core/res/res/values/public.xml index 303cf78..4fbc45f 100644 --- a/core/res/res/values/public.xml +++ b/core/res/res/values/public.xml @@ -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" /> |