Merge "Hide unused fields" into eclair

This commit is contained in:
Tom Taylor
2010-01-11 14:11:46 -08:00
committed by Android (Google) Code Review

View File

@@ -277,6 +277,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
} else { } else {
String phoneNumber = (String) cookie; String phoneNumber = (String) cookie;
setDisplayName(phoneNumber, null); setDisplayName(phoneNumber, null);
setSocialSnippet(null);
mPhotoView.assignContactFromPhone(phoneNumber, true); mPhotoView.assignContactFromPhone(phoneNumber, true);
} }
break; break;
@@ -290,6 +291,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
} else { } else {
String emailAddress = (String) cookie; String emailAddress = (String) cookie;
setDisplayName(emailAddress, null); setDisplayName(emailAddress, null);
setSocialSnippet(null);
mPhotoView.assignContactFromEmail(emailAddress, true); mPhotoView.assignContactFromEmail(emailAddress, true);
} }
break; break;
@@ -374,6 +376,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
public void setSocialSnippet(CharSequence snippet) { public void setSocialSnippet(CharSequence snippet) {
if (snippet == null) { if (snippet == null) {
mStatusView.setVisibility(View.GONE); mStatusView.setVisibility(View.GONE);
mStatusAttributionView.setVisibility(View.GONE);
} else { } else {
mStatusView.setText(snippet); mStatusView.setText(snippet);
mStatusView.setVisibility(View.VISIBLE); mStatusView.setVisibility(View.VISIBLE);
@@ -446,7 +449,9 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
* *
*/ */
public void wipeClean() { public void wipeClean() {
setDisplayName(null, null);
setPhoto(null); setPhoto(null);
setSocialSnippet(null);
mContactUri = null; mContactUri = null;
mExcludeMimes = null; mExcludeMimes = null;
} }