diff options
| author | Suchand Ghosh <suchan@codeaurora.org> | 2014-09-24 10:44:23 +0530 |
|---|---|---|
| committer | Steve Kondik <steve@cyngn.com> | 2014-12-27 06:19:39 -0800 |
| commit | 185db00c1aabe45d5f4e52db83b974fb5bc60888 (patch) | |
| tree | 89239dc92d829970a5b477bdfd96a07710f703a2 | |
| parent | f38437e108fd1864e8e4a7e3e4fc54128920fef4 (diff) | |
| download | android_packages_apps_Dialer-185db00c1aabe45d5f4e52db83b974fb5bc60888.tar.gz android_packages_apps_Dialer-185db00c1aabe45d5f4e52db83b974fb5bc60888.tar.bz2 android_packages_apps_Dialer-185db00c1aabe45d5f4e52db83b974fb5bc60888.zip | |
IMS: Clean up Conference URI system property.
Remove system property "persist.dbg.ims_volte_enable".
Add platform configuration flag and user's enhanced 4G
LTE setting to decide IMS capability.
Change-Id: I1ee4dfb8e73ae7bf72a3daafef6957736a560606
CRs-Fixed: 727689
| -rw-r--r-- | Android.mk | 4 | ||||
| -rw-r--r-- | src/com/android/dialer/DialtactsActivity.java | 11 |
2 files changed, 8 insertions, 7 deletions
diff --git a/Android.mk b/Android.mk index 1f9c4deb4..c7323411f 100644 --- a/Android.mk +++ b/Android.mk @@ -27,7 +27,9 @@ LOCAL_AAPT_FLAGS := \ --extra-packages com.android.contacts.common \ --extra-packages com.android.phone.common -LOCAL_JAVA_LIBRARIES := telephony-common +LOCAL_JAVA_LIBRARIES := telephony-common \ + ims-common + LOCAL_STATIC_JAVA_LIBRARIES := \ com.android.services.telephony.common \ com.android.vcard \ diff --git a/src/com/android/dialer/DialtactsActivity.java b/src/com/android/dialer/DialtactsActivity.java index ad6cc5a9c..2a90ab8e9 100644 --- a/src/com/android/dialer/DialtactsActivity.java +++ b/src/com/android/dialer/DialtactsActivity.java @@ -90,6 +90,7 @@ import com.android.dialer.widget.SearchEditTextLayout.OnBackButtonClickedListene import com.android.dialerbind.DatabaseHelperManager; import com.android.incallui.CallCardFragment; import com.android.phone.common.animation.AnimUtils; +import com.android.ims.ImsManager; import com.android.internal.telephony.TelephonyProperties; import com.android.phone.common.animation.AnimationListenerAdapter; @@ -537,11 +538,6 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O startActivity(intent); } - public static boolean isCallOnImsEnabled() { - return (SystemProperties.getBoolean( - TelephonyProperties.PROPERTY_DBG_IMS_VOLTE_ENABLE, false)); - } - @Override public void onClick(View view) { switch (view.getId()) { @@ -1099,8 +1095,11 @@ public class DialtactsActivity extends TransactionSafeActivity implements View.O @Override public void setConferenceDialButtonVisibility(boolean enabled) { + boolean imsUseEnabled = + ImsManager.isEnhanced4gLteModeSettingEnabledByPlatform(this) && + ImsManager.isEnhanced4gLteModeSettingEnabledByUser(this); if(mConferenceDialButton != null) { - mConferenceDialButton.setVisibility(enabled && isCallOnImsEnabled() ? + mConferenceDialButton.setVisibility((enabled && imsUseEnabled) ? View.VISIBLE : View.GONE); } } |