am cdfe8b93: Merge "Add affinity model for contact names."

* commit 'cdfe8b93ec8098c1c39a156948d9a79963dfd90e':
  Add affinity model for contact names.

1 files changed, 7 insertions, 3 deletions

diff --git a/java/src/com/android/inputmethod/latin/ContactsDictionaryConstants.java b/java/src/com/android/inputmethod/latin/ContactsDictionaryConstants.java
index 8d8faca58..022940910 100644
--- a/java/src/com/android/inputmethod/latin/ContactsDictionaryConstants.java
+++ b/java/src/com/android/inputmethod/latin/ContactsDictionaryConstants.java
@@ -26,7 +26,8 @@ public class ContactsDictionaryConstants {
     /**
      * Projections for {@link Contacts.CONTENT_URI}
      */
-    public static final String[] PROJECTION = { BaseColumns._ID, Contacts.DISPLAY_NAME };
+    public static final String[] PROJECTION = { BaseColumns._ID, Contacts.DISPLAY_NAME,
+            Contacts.TIMES_CONTACTED, Contacts.LAST_TIME_CONTACTED, Contacts.IN_VISIBLE_GROUP };
     public static final String[] PROJECTION_ID_ONLY = { BaseColumns._ID };
 
     /**
@@ -36,13 +37,16 @@ public class ContactsDictionaryConstants {
     public static final int FREQUENCY_FOR_CONTACTS_BIGRAM = 90;
 
     /**
-     *  The maximum number of contacts that this dictionary supports.
+     *  Do not attempt to query contacts if there are more than this many entries.
      */
-    public static final int MAX_CONTACT_COUNT = 10000;
+    public static final int MAX_CONTACTS_PROVIDER_QUERY_LIMIT = 10000;
 
     /**
      * Index of the column for 'name' in content providers:
      * Contacts & ContactsContract.Profile.
      */
     public static final int NAME_INDEX = 1;
+    public static final int TIMES_CONTACTED_INDEX = 2;
+    public static final int LAST_TIME_CONTACTED_INDEX = 3;
+    public static final int IN_VISIBLE_GROUP_INDEX = 4;
 }