summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormike dooley <mdooley@google.com>2016-09-02 14:09:26 -0700
committermike dooley <mdooley@google.com>2016-09-02 14:12:33 -0700
commit64c385e9e481232117db4f81ccd6c47074799f01 (patch)
tree0140a801dacd8a9909314e55808b38f3a522f296
parent976c54b11f4e9ad29776c5395ee037d36b379d33 (diff)
downloadandroid_packages_apps_CarrierConfig-64c385e9e481232117db4f81ccd6c47074799f01.tar.gz
android_packages_apps_CarrierConfig-64c385e9e481232117db4f81ccd6c47074799f01.tar.bz2
android_packages_apps_CarrierConfig-64c385e9e481232117db4f81ccd6c47074799f01.zip
Adding a config to hide the conference 'swap' button for USCC
With this change the behavior after making a 2nd outgoing call is to show a 'merge' button but no 'swap' button. After receiving a 2nd incoming call there is a 'swap' button but no 'merge' button (same behavior as before). This change affects all users (ie. not just Nova users). Moving this cl from the nyc-dr1-dev branch to nyc-mr1-dev (see ag/1379938) Bug: 31028053 Change-Id: I94297705bfb4223ec99d95e1f59e51d472737d08
-rw-r--r--assets/carrier_config_311580.xml1
1 files changed, 1 insertions, 0 deletions
diff --git a/assets/carrier_config_311580.xml b/assets/carrier_config_311580.xml
index 611fbf2..0416ec7 100644
--- a/assets/carrier_config_311580.xml
+++ b/assets/carrier_config_311580.xml
@@ -18,5 +18,6 @@
<boolean name="enabledNotifyWapMMSC" value="true" />
<boolean name="enableMultipartSMS" value="false" />
<boolean name="show_apn_setting_cdma_bool" value="true" />
+<boolean name="support_swap_after_merge_bool" value="false" />
</carrier_config>
</carrier_config_list>