Make small tweaks to view contact card.

-Fix bug in dialing a number from the view card.
-Update the primary number asset and positioning.
-Make the sms button unfocusable.
diff --git a/src/com/android/contacts/ViewContactActivity.java b/src/com/android/contacts/ViewContactActivity.java
index 168eee3..80fb7fc 100644
--- a/src/com/android/contacts/ViewContactActivity.java
+++ b/src/com/android/contacts/ViewContactActivity.java
@@ -728,7 +728,8 @@
                                 this, mimetype, type, label);
                         entry.label = buildActionString(R.string.actionCall, displayLabel, true);
                         entry.data = PhoneNumberUtils.stripSeparators(data);
-                        entry.intent = new Intent(Intent.ACTION_CALL_PRIVILEGED, entry.uri);
+                        entry.intent = new Intent(Intent.ACTION_CALL_PRIVILEGED,
+                                Uri.fromParts("tel", data, null));
                         entry.secondaryIntent = new Intent(Intent.ACTION_SENDTO,
                                 Uri.fromParts("sms", data, null));
                         entry.isPrimary = isSuperPrimary;
@@ -739,18 +740,6 @@
                                 || mShowSmsLinksForAllPhones) {
                             // Add an SMS entry
                             entry.secondaryActionIcon = R.drawable.sym_action_sms;
-
-//                            ViewEntry smsEntry = new ViewEntry();
-//                            smsEntry.label = buildActionString(
-//                                    R.string.actionText, displayLabel, true);
-//                            smsEntry.data = PhoneNumberUtils.stripSeparators(data);
-//                            smsEntry.id = id;
-//                            smsEntry.uri = uri;
-//                            smsEntry.intent = entry.secondaryIntent;
-//                            smsEntry.mimetype = FastTrackWindow.MIME_SMS_ADDRESS;
-//                            smsEntry.type = type;
-//                            smsEntry.actionIcon = R.drawable.sym_action_sms;
-//                            mSmsEntries.add(smsEntry);
                         }
                     // Build email entries
                     } else if (mimetype.equals(CommonDataKinds.Email.CONTENT_ITEM_TYPE)) {