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

Commit 49b9b24a authored by Danny Baumann's avatar Danny Baumann
Browse files

Fix merge relicts. 

Change-Id: I5a352640ba5704acd69382e53a15626cfd214487
parent c569a957

src/com/android/dialer/CallDetailActivity.java

+0 −34
Original line number Diff line number Diff line
@@ -120,10 +120,6 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 
    private CallDetailHeader mCallDetailHeader;

    private CallTypeHelper mCallTypeHelper;

    private PhoneNumberDisplayHelper mPhoneNumberHelper;

    private QuickContactBadge mQuickContactBadge;

    private TextView mCallerName;

    private TextView mCallerNumber;

    private TextView mAccountLabel;

    private AsyncTaskExecutor mAsyncTaskExecutor;

    private ContactInfoHelper mContactInfoHelper;
@@ -443,36 +439,6 @@ public class CallDetailActivity extends Activity implements ProximitySensorAware 


                final CharSequence callLocationOrType = getNumberTypeOrLocation(firstDetails);



                final CharSequence displayNumber =

                        mPhoneNumberHelper.getDisplayNumber(

                                firstDetails.accountHandle,

                                firstDetails.number,

                                firstDetails.numberPresentation,

                                firstDetails.formattedNumber);

                final String displayNumberStr = mBidiFormatter.unicodeWrap(

                        displayNumber.toString(), TextDirectionHeuristics.LTR);



                if (!TextUtils.isEmpty(firstDetails.name)) {

                    mCallerName.setText(firstDetails.name);

                    mCallerNumber.setText(callLocationOrType + " " + displayNumberStr);

                } else {

                    mCallerName.setText(displayNumberStr);

                    if (!TextUtils.isEmpty(callLocationOrType)) {

                        mCallerNumber.setText(callLocationOrType);

                        mCallerNumber.setVisibility(View.VISIBLE);

                    } else {

                        mCallerNumber.setVisibility(View.GONE);

                    }

                }



                String accountLabel = PhoneAccountUtils.getAccountLabel(context, accountHandle);

                if (!TextUtils.isEmpty(accountLabel)) {

                    mAccountLabel.setText(accountLabel);

                    mAccountLabel.setVisibility(View.VISIBLE);

                } else {

                    mAccountLabel.setVisibility(View.GONE);

                }



                mHasEditNumberBeforeCallOption =

                        canPlaceCallsTo && !isSipNumber && !isVoicemailNumber;

                mHasTrashOption = hasVoicemail();