From 9bead9c01ab09ebfbd1c2be8555d8c8d4e3cf6bd Mon Sep 17 00:00:00 2001 From: Christine Chen Date: Fri, 20 Sep 2013 18:08:58 -0700 Subject: Adds star to indicate favorite contacts - For squared tiles, stars will replace info icons when a contact is a favorite contact. And clicking on either star or info icon will bring up the quick contact card. Bug: 10862067 Change-Id: Ie0ad9e7e5969a70c3bafef5c2bb47fb84cd7ffdb --- .../dialer/list/PhoneFavoriteSquareTileView.java | 32 ++++++++++++++++++---- .../android/dialer/list/PhoneFavoriteTileView.java | 6 ++++ .../dialer/list/PhoneFavoritesTileAdapter.java | 6 ++-- 3 files changed, 35 insertions(+), 9 deletions(-) (limited to 'src') diff --git a/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java b/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java index e2548a3bf..85e721619 100644 --- a/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java +++ b/src/com/android/dialer/list/PhoneFavoriteSquareTileView.java @@ -24,6 +24,7 @@ import android.view.View; import android.widget.ImageButton; import com.android.contacts.common.R; +import com.android.contacts.common.list.ContactEntry; import java.util.regex.Pattern; @@ -48,12 +49,6 @@ public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView { super.onFinishInflate(); mSecondaryButton = (ImageButton) findViewById(R.id.contact_tile_secondary_button); - mSecondaryButton.setOnClickListener(new OnClickListener() { - @Override - public void onClick(View v) { - launchQuickContact(); - } - }); } @Override @@ -74,4 +69,29 @@ public class PhoneFavoriteSquareTileView extends PhoneFavoriteTileView { if (tokens.length < 1) return name; return tokens[0]; } + + @Override + public void loadFromContact(ContactEntry entry) { + super.loadFromContact(entry); + if (entry != null) { + final boolean contactIsFavorite = entry.isFavorite; + mSecondaryButton.setVisibility(contactIsFavorite ? GONE : VISIBLE); + + if (contactIsFavorite) { + mStarView.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + launchQuickContact(); + } + }); + } else { + mSecondaryButton.setOnClickListener(new OnClickListener() { + @Override + public void onClick(View v) { + launchQuickContact(); + } + }); + } + } + } } diff --git a/src/com/android/dialer/list/PhoneFavoriteTileView.java b/src/com/android/dialer/list/PhoneFavoriteTileView.java index 57d258f88..765745172 100644 --- a/src/com/android/dialer/list/PhoneFavoriteTileView.java +++ b/src/com/android/dialer/list/PhoneFavoriteTileView.java @@ -27,6 +27,7 @@ import android.util.Log; import android.view.GestureDetector; import android.view.MotionEvent; import android.view.View; +import android.widget.ImageView; import com.android.contacts.common.MoreContactUtils; import com.android.contacts.common.list.ContactEntry; @@ -58,6 +59,8 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { private View mUndoRemovalButton; /** The view that holds the list view row. */ protected ContactTileRow mParentRow; + /** The view that indicates whether the contact is a favorate. */ + protected ImageView mStarView; /** Users' most frequent phone number. */ private String mPhoneNumberString; @@ -81,6 +84,7 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { mRemovalDialogue = findViewById(com.android.dialer.R.id.favorite_remove_dialogue); mUndoRemovalButton = findViewById(com.android.dialer.R.id .favorite_remove_undo_button); + mStarView = (ImageView) findViewById(com.android.dialer.R.id.contact_favorite_star); mUndoRemovalButton.setOnClickListener(new OnClickListener() { @Override @@ -118,6 +122,8 @@ public abstract class PhoneFavoriteTileView extends ContactTileView { if (entry != null) { // Grab the phone-number to call directly... see {@link onClick()} mPhoneNumberString = entry.phoneNumber; + + mStarView.setVisibility(entry.isFavorite ? VISIBLE : GONE); // If this is a blank entry, don't show anything. // TODO krelease:Just hide the view for now. For this to truly look like an empty row // the entire ContactTileRow needs to be hidden. diff --git a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java index 6969f6f6c..1247d35ed 100644 --- a/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java +++ b/src/com/android/dialer/list/PhoneFavoritesTileAdapter.java @@ -287,6 +287,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements final String lookupKey = cursor.getString(mLookupIndex); final int pinned = cursor.getInt(mPinnedIndex); final String name = cursor.getString(mNameIndex); + final boolean isStarred = cursor.getInt(mStarredIndex) > 0; final ContactEntry contact = new ContactEntry(); @@ -296,7 +297,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements contact.photoUri = (photoUri != null ? Uri.parse(photoUri) : null); contact.lookupKey = ContentUris.withAppendedId( Uri.withAppendedPath(Contacts.CONTENT_LOOKUP_URI, lookupKey), id); - + contact.isFavorite = isStarred; // Set phone number, label and status final int phoneNumberType = cursor.getInt(mPhoneNumberTypeIndex); @@ -618,8 +619,7 @@ public class PhoneFavoritesTileAdapter extends BaseAdapter implements if (changed && mDropEntryIndex < PIN_LIMIT) { final ContentValues cv = getReflowedPinnedPositions(mContactEntries, mDraggedEntry, mDraggedEntryIndex, mDropEntryIndex); - final Uri pinUri = PinnedPositions.UPDATE_URI.buildUpon().appendQueryParameter( - PinnedPositions.STAR_WHEN_PINNING, "true").build(); + final Uri pinUri = PinnedPositions.UPDATE_URI.buildUpon().build(); // update the database here with the new pinned positions mContext.getContentResolver().update(pinUri, cv, null, null); } -- cgit v1.2.3