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

Merge "Hide unused fields" into eclair

Browse Source
This commit is contained in:
Tom Taylor
2010-01-11 14:11:46 -08:00
committed by Android (Google) Code Review
parent 50a3977c61 ac65121351
commit 1edd827744
1 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
core/java/com/android/internal/widget/ContactHeaderWidget.java
View File

@@ -119,12 +119,12 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
int CONTACT_STATUS_RES_PACKAGE = 8; int CONTACT_STATUS_RES_PACKAGE = 8;
int CONTACT_STATUS_LABEL = 9; int CONTACT_STATUS_LABEL = 9;
} }
private interface PhotoQuery { private interface PhotoQuery {
String[] COLUMNS = new String[] { String[] COLUMNS = new String[] {
Photo.PHOTO Photo.PHOTO
}; };
int PHOTO = 0; int PHOTO = 0;
} }
@@ -241,13 +241,13 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
case TOKEN_PHOTO_QUERY: { case TOKEN_PHOTO_QUERY: {
//Set the photo //Set the photo
Bitmap photoBitmap = null; Bitmap photoBitmap = null;
if (cursor != null && cursor.moveToFirst() if (cursor != null && cursor.moveToFirst()
&& !cursor.isNull(PhotoQuery.PHOTO)) { && !cursor.isNull(PhotoQuery.PHOTO)) {
byte[] photoData = cursor.getBlob(PhotoQuery.PHOTO); byte[] photoData = cursor.getBlob(PhotoQuery.PHOTO);
photoBitmap = BitmapFactory.decodeByteArray(photoData, 0, photoBitmap = BitmapFactory.decodeByteArray(photoData, 0,
photoData.length, null); photoData.length, null);
} }
if (photoBitmap == null) { if (photoBitmap == null) {
photoBitmap = loadPlaceholderPhoto(null); photoBitmap = loadPlaceholderPhoto(null);
} }
@@ -261,7 +261,7 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
case TOKEN_CONTACT_INFO: { case TOKEN_CONTACT_INFO: {
if (cursor != null && cursor.moveToFirst()) { if (cursor != null && cursor.moveToFirst()) {
bindContactInfo(cursor); bindContactInfo(cursor);
Uri lookupUri = Contacts.getLookupUri(cursor.getLong(ContactQuery._ID), Uri lookupUri = Contacts.getLookupUri(cursor.getLong(ContactQuery._ID),
cursor.getString(ContactQuery.LOOKUP_KEY)); cursor.getString(ContactQuery.LOOKUP_KEY));
startPhotoQuery(cursor.getLong(ContactQuery.PHOTO_ID), lookupUri); startPhotoQuery(cursor.getLong(ContactQuery.PHOTO_ID), lookupUri);
invalidate(); invalidate();
@@ -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;
} }
@@ -457,11 +462,11 @@ public class ContactHeaderWidget extends FrameLayout implements View.OnClickList
} }
protected void startPhotoQuery(long photoId, Uri lookupKey) { protected void startPhotoQuery(long photoId, Uri lookupKey) {
mQueryHandler.startQuery(TOKEN_PHOTO_QUERY, lookupKey, mQueryHandler.startQuery(TOKEN_PHOTO_QUERY, lookupKey,
ContentUris.withAppendedId(Data.CONTENT_URI, photoId), PhotoQuery.COLUMNS, ContentUris.withAppendedId(Data.CONTENT_URI, photoId), PhotoQuery.COLUMNS,
null, null, null); null, null, null);
} }
/** /**
* Bind the contact details provided by the given {@link Cursor}. * Bind the contact details provided by the given {@link Cursor}.
*/ */