diff options
| author | cretin45 <cretin45@gmail.com> | 2014-11-05 14:36:08 -0800 |
|---|---|---|
| committer | cretin45 <cretin45@gmail.com> | 2014-11-05 14:36:08 -0800 |
| commit | 9a281de7ad38b6ac4b3c9b4a7cf704008e7333e3 (patch) | |
| tree | 912065ca93ca5c41004d55964031efc0ca0a33aa | |
| parent | b6783c46c27a987f5b50b6f77b95af16ed0c6030 (diff) | |
| download | android_packages_apps_Dialer-9a281de7ad38b6ac4b3c9b4a7cf704008e7333e3.tar.gz android_packages_apps_Dialer-9a281de7ad38b6ac4b3c9b4a7cf704008e7333e3.tar.bz2 android_packages_apps_Dialer-9a281de7ad38b6ac4b3c9b4a7cf704008e7333e3.zip | |
Dialer: Add config for IP call settings on dialpad
Change-Id: Ifc735504afeecc8c5eca00045bdaf20fa64e642b
| -rw-r--r-- | res/values/config.xml | 3 | ||||
| -rw-r--r-- | src/com/android/dialer/dialpad/DialpadFragment.java | 13 |
2 files changed, 13 insertions, 3 deletions
diff --git a/res/values/config.xml b/res/values/config.xml index 318916dfa..7ad786101 100644 --- a/res/values/config.xml +++ b/res/values/config.xml @@ -18,4 +18,7 @@ <bool name="call_recording_enabled">false</bool> <integer name="call_recording_audio_source">1</integer> <bool name="call_durationtype_enabled">false</bool> + + <!-- Flag whether to enable IP Prefix setting--> + <bool name="config_ip_prefix_enable" translatable="false">false</bool> </resources> diff --git a/src/com/android/dialer/dialpad/DialpadFragment.java b/src/com/android/dialer/dialpad/DialpadFragment.java index 30113f737..aeb7012f7 100644 --- a/src/com/android/dialer/dialpad/DialpadFragment.java +++ b/src/com/android/dialer/dialpad/DialpadFragment.java @@ -846,7 +846,8 @@ public class DialpadFragment extends Fragment final MenuItem videocallsettingsMenuItem = menu.findItem(R.id.menu_video_call_settings); final MenuItem ipCallBySlot1MenuItem = menu.findItem(R.id.menu_ip_call_by_slot1); final MenuItem ipCallBySlot2MenuItem = menu.findItem(R.id.menu_ip_call_by_slot2); - + final boolean isIPPrefixEnabled = + getResources().getBoolean(R.bool.config_ip_prefix_enable); // We show "video call setting" menu only when the csvt is supported //which means the prop "persist.radio.csvt.enabled" = true videocallsettingsMenuItem.setVisible(isVTSupported()); @@ -860,16 +861,22 @@ public class DialpadFragment extends Fragment ipCallBySlot1MenuItem.setVisible(false); ipCallBySlot2MenuItem.setVisible(false); } else { - if (MoreContactUtils.isMultiSimEnable(mContext, MSimConstants.SUB1)) { + if (isIPPrefixEnabled && MoreContactUtils.isMultiSimEnable(mContext, + MSimConstants.SUB1)) { String sub1Name = MoreContactUtils.getSimSpnName(MSimConstants.SUB1); + sub1Name = Settings.Global.getSimNameForSubscription(getActivity(), + MSimConstants.SUB1, sub1Name); ipCallBySlot1MenuItem.setTitle(getActivity().getString( com.android.contacts.common.R.string.ip_call_by_slot, sub1Name)); ipCallBySlot1MenuItem.setVisible(true); } else { ipCallBySlot1MenuItem.setVisible(false); } - if (MoreContactUtils.isMultiSimEnable(mContext, MSimConstants.SUB2)) { + if (isIPPrefixEnabled && MoreContactUtils.isMultiSimEnable(mContext, + MSimConstants.SUB2)) { String sub2Name = MoreContactUtils.getSimSpnName(MSimConstants.SUB2); + sub2Name = Settings.Global.getSimNameForSubscription(getActivity(), + MSimConstants.SUB2, sub2Name); ipCallBySlot2MenuItem.setTitle(getActivity().getString( com.android.contacts.common.R.string.ip_call_by_slot, sub2Name)); ipCallBySlot2MenuItem.setVisible(true); |