diff options
| author | mike dooley <mdooley@google.com> | 2015-02-20 02:12:23 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-02-20 02:12:23 +0000 |
| commit | 05009e1b726658350af86247d4c40e2351e9b79d (patch) | |
| tree | a3c7e9663355833a2c89c52a9352346a9bf6700b /overlay | |
| parent | dd16eefbad50828270d6470ac4feadddbf71f0e0 (diff) | |
| parent | b867a874e765f393b37f93976c3d9a723a8f9f19 (diff) | |
| download | shamu-05009e1b726658350af86247d4c40e2351e9b79d.tar.gz | |
am b867a874: Merge "Config change to not show swap button after merging calls into Cdma conference." into lmp-mr1-dev
* commit 'b867a874e765f393b37f93976c3d9a723a8f9f19':
Config change to not show swap button after merging calls into Cdma conference.
Diffstat (limited to 'overlay')
| -rw-r--r-- | overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml b/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml index 06c9ae5e..d29eb835 100644 --- a/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml +++ b/overlay/packages/services/Telephony/res/values-mcc310-mnc120/config.xml @@ -33,6 +33,8 @@ <bool name="config_use_hfa_for_provisioning" translatable="false">true</bool> <!-- Display carrier settings --> <bool name="config_carrier_settings_enable">true</bool> + <!-- Don't display swap button after merging calls into Cdma conference. --> + <bool name="support_swap_after_merge">false</bool> <!-- carrier settings menu --> <string name="carrier_settings" translatable="false">com.android.sdm.plugins.sprintdm</string> <string name="carrier_settings_menu" translatable="false">com.android.sdm.plugins.sprintdm.SprintCarrierSettingsActivity</string> |