commit e3dd6812f8d78eb91c2415192f0130030e0c0eb3
author Daisuke Miyakawa <dmiyakawa@google.com> Thu Jan 07 08:10:52 2010 +0900
committer Daisuke Miyakawa <dmiyakawa@google.com> Thu Jan 07 08:41:09 2010 +0900
tree fd7bece3dcb41dc1813415eb87144d0349316778
parent ac6005389e9cae78086ee2360bfeeececa48d827

Uncomment JapaneseContactListIndexer, using SORT_KEY_PRIMARY.

This change seems incomplete; it seems all contacts with only ascii text
become in front of contact list, which is different from the behavior
in Donut.

But anyway, the class basically works fine with SORT_KEY_PRIMARY.

Bug: 2075641

src/com/android/contacts/ContactsListActivity.java

diff --git a/src/com/android/contacts/ContactsListActivity.java b/src/com/android/contacts/ContactsListActivity.java
index 727da61..cba3015 100644
--- a/src/com/android/contacts/ContactsListActivity.java
+++ b/src/com/android/contacts/ContactsListActivity.java
@@ -259,6 +259,7 @@
         Contacts.PHOTO_ID, //5
         Contacts.LOOKUP_KEY, //6
         Contacts.HAS_PHONE_NUMBER, //7
+        Contacts.SORT_KEY_PRIMARY, //8
     };
     static final String[] CONTACTS_SUMMARY_PROJECTION_FROM_EMAIL = new String[] {
         Contacts._ID, // 0
@@ -285,6 +286,7 @@
     static final int SUMMARY_PHOTO_ID_COLUMN_INDEX = 5;
     static final int SUMMARY_LOOKUP_KEY = 6;
     static final int SUMMARY_HAS_PHONE_COLUMN_INDEX = 7;
+    static final int SUMMARY_SORT_KEY_PRIMARY = 8;
 
     static final String[] PHONES_PROJECTION = new String[] {
         Phone._ID, //0
@@ -2301,11 +2303,11 @@
         }
 
         private SectionIndexer getNewIndexer(Cursor cursor) {
-            /* if (Locale.getDefault().getLanguage().equals(Locale.JAPAN.getLanguage())) {
-                return new JapaneseContactListIndexer(cursor, SORT_STRING_INDEX);
-            } else { */
+            if (Locale.getDefault().getLanguage().equals(Locale.JAPAN.getLanguage())) {
+                return new JapaneseContactListIndexer(cursor, SUMMARY_SORT_KEY_PRIMARY);
+            } else {
                 return new AlphabetIndexer(cursor, SUMMARY_NAME_COLUMN_INDEX, mAlphabet);
-            /* } */
+            }
         }
 
         /**