Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0b2ed140 authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "IMS: Clean up Conference URI system property."

parents d8591f84 a68ac9f3

Android.mk

+3 −1
Original line number Diff line number Diff line
@@ -26,7 +26,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 \

src/com/android/dialer/DialtactsActivity.java

+5 −6
Original line number Diff line number Diff line
@@ -89,6 +89,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;
@@ -535,11 +536,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()) {
@@ -1051,8 +1047,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);

        }

    }