Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

am 1edd8277: Merge "Hide unused fields" into eclair

Browse Source 
Merge commit '1edd8277440c83ef44e0128e86afb8c002e49b17' into eclair-plus-aosp

* commit '1edd8277440c83ef44e0128e86afb8c002e49b17':
  Hide unused fields
This commit is contained in:
Tom Taylor
2010-01-11 14:15:51 -08:00
committed by Android Git Automerger
parent 18dedf2cdf 1edd827744
commit 2bb1f87089
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
core/java/com/android/internal/widget/ContactHeaderWidget.java
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;
} }