commit c6ad3abd847682c07d52c97f04ae8a5885148a0b
author Jeff Sharkey <jsharkey@android.com> Tue Jul 21 19:30:15 2009 -0700
committer Jeff Sharkey <jsharkey@android.com> Tue Jul 21 19:34:19 2009 -0700
tree 3361d0c654e6f8ba7e0ba4a2a00af6096602c39c
parent 48cf72be9daba8cc0fbe37666d68c2868eb34285

Refactored to StructuredPostal and RES_PACKAGE.

Matched framework change that refactored StructuredPostal
and RES_PACKAGE, also removal of Groups.PACKAGE_ID.

src/com/android/contacts/DisplayGroupsActivity.java

diff --git a/src/com/android/contacts/DisplayGroupsActivity.java b/src/com/android/contacts/DisplayGroupsActivity.java
index c468655..269ed0b 100644
--- a/src/com/android/contacts/DisplayGroupsActivity.java
+++ b/src/com/android/contacts/DisplayGroupsActivity.java
@@ -366,12 +366,12 @@
             mCursor.moveToPosition(-1);
             while (mCursor.moveToNext()) {
                 final int position = mCursor.getPosition();
-                final long packageId = mCursor.getLong(Projections.COL_PACKAGE_ID);
+                final long packageId = mCursor.getLong(Projections.COL_ID);
                 totalContacts += mCursor.getInt(Projections.COL_SUMMARY_COUNT);
                 if (group == null || packageId != group.packageId) {
                     group = new Group();
                     group.packageId = packageId;
-                    group.packageName = mCursor.getString(Projections.COL_PACKAGE);
+                    group.packageName = mCursor.getString(Projections.COL_RES_PACKAGE);
                     group.firstPos = position;
                     group.label = group.packageName;
 
@@ -517,9 +517,9 @@
 
             // Read title, but override with string resource when present
             CharSequence title = mCursor.getString(Projections.COL_TITLE);
-            if (!mCursor.isNull(Projections.COL_TITLE_RESOURCE)) {
-                final String packageName = mCursor.getString(Projections.COL_PACKAGE);
-                final int titleRes = mCursor.getInt(Projections.COL_TITLE_RESOURCE);
+            if (!mCursor.isNull(Projections.COL_RES_TITLE)) {
+                final String packageName = mCursor.getString(Projections.COL_RES_PACKAGE);
+                final int titleRes = mCursor.getInt(Projections.COL_RES_TITLE);
                 try {
                     title = mExternalRes.getText(packageName, titleRes);
                 } catch (NameNotFoundException e) {
@@ -610,25 +610,24 @@
 
         public static final String[] PROJ_SUMMARY = new String[] {
             Groups._ID,
-            Groups.PACKAGE_ID,
-            Groups.PACKAGE,
             Groups.TITLE,
-            Groups.TITLE_RESOURCE,
+            Groups.RES_PACKAGE,
+            Groups.TITLE_RES,
             Groups.GROUP_VISIBLE,
             Groups.SUMMARY_COUNT,
             Groups.SUMMARY_WITH_PHONES,
         };
 
-        public static final String SORT_ORDER = Groups.PACKAGE + " ASC";
+        public static final String SORT_ORDER = Groups.ACCOUNT_TYPE + " ASC, "
+                + Groups.ACCOUNT_NAME + " ASC";
 
         public static final int COL_ID = 0;
-        public static final int COL_PACKAGE_ID = 1;
-        public static final int COL_PACKAGE = 2;
-        public static final int COL_TITLE = 3;
-        public static final int COL_TITLE_RESOURCE = 4;
-        public static final int COL_GROUP_VISIBLE = 5;
-        public static final int COL_SUMMARY_COUNT = 6;
-        public static final int COL_SUMMARY_WITH_PHONES = 7;
+        public static final int COL_TITLE = 1;
+        public static final int COL_RES_PACKAGE = 2;
+        public static final int COL_RES_TITLE = 3;
+        public static final int COL_GROUP_VISIBLE = 4;
+        public static final int COL_SUMMARY_COUNT = 5;
+        public static final int COL_SUMMARY_WITH_PHONES = 6;
 
     }