commit afc09c76578f6a04af444f537a61fc1fa4dc9346
author Isaac Katzenelson <isaack@android.com> Fri Sep 23 16:06:24 2011 -0700
committer Android (Google) Code Review <android-gerrit@google.com> Fri Sep 23 16:06:24 2011 -0700
tree a0cbe5c2251fd6e12a12fbda2fa2231c5149b5f7
parent c8513baab9a25a05d749782766268803b4ab9160
parent 4b9b26ec637a171532a679a3cea3afa342caaa37

Merge "Sort people in group view according to sort settings"

src/com/android/contacts/GroupMemberLoader.java

diff --git a/src/com/android/contacts/GroupMemberLoader.java b/src/com/android/contacts/GroupMemberLoader.java
index 9605747..a75da48 100644
--- a/src/com/android/contacts/GroupMemberLoader.java
+++ b/src/com/android/contacts/GroupMemberLoader.java
@@ -16,6 +16,7 @@
 package com.android.contacts;
 
 import com.android.contacts.list.ContactListAdapter;
+import com.android.contacts.preference.ContactsPreferences;
 
 import android.content.Context;
 import android.content.CursorLoader;
@@ -81,7 +82,13 @@
         setProjection(PROJECTION_DATA);
         setSelection(createSelection());
         setSelectionArgs(createSelectionArgs());
-        setSortOrder(Contacts.SORT_KEY_ALTERNATIVE);
+
+        ContactsPreferences prefs = new ContactsPreferences(context);
+        if (prefs.getSortOrder() == ContactsContract.Preferences.SORT_ORDER_PRIMARY) {
+            setSortOrder(Contacts.SORT_KEY_PRIMARY);
+        } else {
+            setSortOrder(Contacts.SORT_KEY_ALTERNATIVE);
+        }
     }
 
     private Uri createUri() {