commit 71b4676e2da328b27f656c8670a99a90a6194d02
author Yorke Lee <yorkelee@google.com> Wed Jul 31 16:21:48 2013 -0700
committer Yorke Lee <yorkelee@google.com> Thu Aug 01 08:00:21 2013 -0700
tree 676a002731710388c9a2a91c71a5ba89ad38e4d3
parent 152ad4974501d5f423ad7988d6812aaa14edf17a

Changes to ContactCommon to support drag and drop

Change-Id: I6bbed9527a3f3cf0583a3f9ddf2bb6438f5a5eb1

src/com/android/contacts/common/ContactTileLoaderFactory.java

diff --git a/src/com/android/contacts/common/ContactTileLoaderFactory.java b/src/com/android/contacts/common/ContactTileLoaderFactory.java
index 19eac76..c930102 100644
--- a/src/com/android/contacts/common/ContactTileLoaderFactory.java
+++ b/src/com/android/contacts/common/ContactTileLoaderFactory.java
@@ -40,6 +40,12 @@
     public final static int PHONE_NUMBER = 5;
     public final static int PHONE_NUMBER_TYPE = 6;
     public final static int PHONE_NUMBER_LABEL = 7;
+    public final static int PINNED = 8;
+    // The _ID field returned for frequent items actually contains data._id instead of
+    // contacts._id because the query is performed on the data table. In order to obtain the
+    // contact id for frequent items (in order to pin/hide frequent contacts), we thus have
+    // to use Phone.contact_id instead.
+    public final static int CONTACT_ID_FOR_FREQUENT = 9;
 
     private static final String[] COLUMNS = new String[] {
         Contacts._ID, // ..........................................0
@@ -65,7 +71,9 @@
         Contacts.LOOKUP_KEY, // ...................................4
         Phone.NUMBER, // ..........................................5
         Phone.TYPE, // ............................................6
-        Phone.LABEL // ............................................7
+        Phone.LABEL, // ...........................................7
+        Contacts.PINNED, // .......................................8
+        Phone.CONTACT_ID //........................................9
     };
 
     private static final String STARRED_ORDER = Contacts.DISPLAY_NAME+" COLLATE NOCASE ASC";

src/com/android/contacts/common/list/ContactEntry.java

diff --git a/src/com/android/contacts/common/list/ContactEntry.java b/src/com/android/contacts/common/list/ContactEntry.java
index 095bf54..188459d 100644
--- a/src/com/android/contacts/common/list/ContactEntry.java
+++ b/src/com/android/contacts/common/list/ContactEntry.java
@@ -18,11 +18,12 @@
 
 import android.graphics.drawable.Drawable;
 import android.net.Uri;
+import android.provider.ContactsContract.PinnedPositions;
 
 /**
  * Class to hold contact information
  */
-public class ContactEntry {
+public class ContactEntry implements Comparable<ContactEntry> {
     public String name;
     public String status;
     public String phoneLabel;
@@ -30,4 +31,14 @@
     public Uri photoUri;
     public Uri lookupKey;
     public Drawable presenceIcon;
+    public long id;
+    public int pinned = PinnedPositions.UNPINNED;
+
+    /*
+     * This is implemented to allow sorting pinned contacts within the Dialer
+     */
+    @Override
+    public int compareTo(ContactEntry another) {
+        return this.pinned - another.pinned;
+    }
 }
\ No newline at end of file