1 files changed, 52 insertions, 34 deletions

diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java
index b77dc4cde..d9712d1e0 100644
--- a/InCallUI/src/com/android/incallui/CallCardFragment.java
+++ b/InCallUI/src/com/android/incallui/CallCardFragment.java
@@ -42,7 +42,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     // Primary caller info
     private TextView mPhoneNumber;
     private TextView mNumberLabel;
-    private TextView mName;
+    private TextView mPrimaryName;
     private TextView mCallStateLabel;
     private ImageView mPhoto;
     private TextView mElapsedTime;
@@ -72,7 +72,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     public void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
 
-        getPresenter().init(getActivity(), ServiceFactory.newPhoneNumberService(getActivity()));
+        final CallList calls = CallList.getInstance();
+        final Call call = calls.getFirstCall();
+        getPresenter().init(getActivity(), ServiceFactory.newPhoneNumberService(getActivity()),
+                call);
     }
 
     @Override
@@ -90,7 +93,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         super.onViewCreated(view, savedInstanceState);
 
         mPhoneNumber = (TextView) view.findViewById(R.id.phoneNumber);
-        mName = (TextView) view.findViewById(R.id.name);
+        mPrimaryName = (TextView) view.findViewById(R.id.name);
         mNumberLabel = (TextView) view.findViewById(R.id.label);
         mSecondaryCallInfo = (ViewStub) view.findViewById(R.id.secondary_call_info);
         mPhoto = (ImageView) view.findViewById(R.id.photo);
@@ -117,27 +120,30 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
     }
 
     @Override
-    public void setName(String name) {
-        mName.setText(name);
+    public void setPrimaryName(String name, boolean nameIsNumber) {
+        if (TextUtils.isEmpty(name)) {
+            mPrimaryName.setText("");
+        } else {
+            mPrimaryName.setText(name);
+
+            // Set direction of the name field
+            int nameDirection = View.TEXT_DIRECTION_INHERIT;
+            if (nameIsNumber) {
+                nameDirection = View.TEXT_DIRECTION_LTR;
+            }
+            mPrimaryName.setTextDirection(nameDirection);
+        }
     }
 
     @Override
-    public void setImage(Bitmap image) {
+    public void setPrimaryImage(Bitmap image) {
         if (image != null) {
             setDrawableToImageView(mPhoto, new BitmapDrawable(getResources(), image));
         }
     }
 
     @Override
-    public void setPrimary(String number, String name, boolean nameIsNumber, String label,
-            Drawable photo, boolean isConference, String gatewayLabel, String gatewayNumber) {
-        Log.d(this, "Setting primary call [" + gatewayLabel + "][" + gatewayNumber + "]");
-
-        if (isConference) {
-            name = getView().getResources().getString(R.string.card_title_conf_call);
-            photo = getView().getResources().getDrawable(R.drawable.picture_conference);
-        }
-
+    public void setPrimaryPhoneNumber(String number) {
         // Set the number
         if (TextUtils.isEmpty(number)) {
             mPhoneNumber.setText("");
@@ -147,8 +153,21 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
             mPhoneNumber.setVisibility(View.VISIBLE);
             mPhoneNumber.setTextDirection(View.TEXT_DIRECTION_LTR);
         }
+    }
 
-        // Set any gateway information
+    @Override
+    public void setPrimaryLabel(String label) {
+        if (!TextUtils.isEmpty(label)) {
+            mNumberLabel.setText(label);
+            mNumberLabel.setVisibility(View.VISIBLE);
+        } else {
+            mNumberLabel.setVisibility(View.GONE);
+        }
+
+    }
+
+    @Override
+    public void setPrimaryGateway(String gatewayLabel, String gatewayNumber) {
         if (!TextUtils.isEmpty(gatewayLabel) && !TextUtils.isEmpty(gatewayNumber)) {
             mProviderLabel.setText(gatewayLabel);
             mProviderNumber.setText(gatewayNumber);
@@ -156,29 +175,28 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr
         } else {
             mProviderInfo.setVisibility(View.GONE);
         }
+    }
 
-        // Set direction of the name field
-
-        // set the name field.
-        if (TextUtils.isEmpty(name)) {
-            mName.setText("");
-        } else {
-            mName.setText(name);
+    @Override
+    public void setPrimary(String number, String name, boolean nameIsNumber, String label,
+            Drawable photo, boolean isConference, String gatewayLabel, String gatewayNumber) {
+        Log.d(this, "Setting primary call [" + gatewayLabel + "][" + gatewayNumber + "]");
 
-            int nameDirection = View.TEXT_DIRECTION_INHERIT;
-            if (nameIsNumber) {
-                nameDirection = View.TEXT_DIRECTION_LTR;
-            }
-            mName.setTextDirection(nameDirection);
+        if (isConference) {
+            name = getView().getResources().getString(R.string.card_title_conf_call);
+            photo = getView().getResources().getDrawable(R.drawable.picture_conference);
         }
 
+        setPrimaryPhoneNumber(number);
+
+        // Set any gateway information
+        setPrimaryGateway(gatewayLabel, gatewayNumber);
+
+        // set the name field.
+        setPrimaryName(name, nameIsNumber);
+
         // Set the label (Mobile, Work, etc)
-        if (!TextUtils.isEmpty(label)) {
-            mNumberLabel.setText(label);
-            mNumberLabel.setVisibility(View.VISIBLE);
-        } else {
-            mNumberLabel.setVisibility(View.GONE);
-        }
+        setPrimaryLabel(label);
 
         setDrawableToImageView(mPhoto, photo);
     }