diff options
author | Danny Baumann <dannybaumann@web.de> | 2015-03-25 12:47:27 +0100 |
---|---|---|
committer | Danny Baumann <dannybaumann@web.de> | 2015-03-25 12:49:26 +0100 |
commit | 49b9b24a35b2f0b53b6fbd84c5fc54de6151fd8c (patch) | |
tree | 352d55a4cb27816a6f74c6c0d4db369cd437995e | |
parent | c569a957df64f0432a7d5e8fd5f60ac19e34542a (diff) | |
download | android_packages_apps_Dialer-49b9b24a35b2f0b53b6fbd84c5fc54de6151fd8c.tar.gz android_packages_apps_Dialer-49b9b24a35b2f0b53b6fbd84c5fc54de6151fd8c.tar.bz2 android_packages_apps_Dialer-49b9b24a35b2f0b53b6fbd84c5fc54de6151fd8c.zip |
Fix merge relicts.staging/cm-12.1-test
Change-Id: I5a352640ba5704acd69382e53a15626cfd214487
-rw-r--r-- | src/com/android/dialer/CallDetailActivity.java | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/src/com/android/dialer/CallDetailActivity.java b/src/com/android/dialer/CallDetailActivity.java index d169c5d04..e6420dbf5 100644 --- a/src/com/android/dialer/CallDetailActivity.java +++ b/src/com/android/dialer/CallDetailActivity.java @@ -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(); |