commit 9662675dc0765ab347d1786e3d5a86ce9f3f5b84
author Isaac Katzenelson <isaackatz@google.com> Tue May 14 17:55:09 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 14 17:55:09 2013 +0000
tree 9799e5e6798bbda196b18be6df88172987cab53d
parent 3f0521e93a94ac7fb927926ef3eab410bd6c83e3
parent b4f28b8e72f63e48102a6688ff5576e02c14069e

Merge "Query for Colors in parallel with all other queries" into ics-ub-calendar-denim

src/com/android/calendar/event/EditEventFragment.java

diff --git a/src/com/android/calendar/event/EditEventFragment.java b/src/com/android/calendar/event/EditEventFragment.java
index 6b350b0..e1d59f8 100644
--- a/src/com/android/calendar/event/EditEventFragment.java
+++ b/src/com/android/calendar/event/EditEventFragment.java
@@ -246,6 +246,11 @@
                             EditEventHelper.CALENDARS_PROJECTION, EditEventHelper.CALENDARS_WHERE,
                             selArgs /* selection args */, null /* sort order */);
 
+                    // TOKEN_COLORS
+                    mHandler.startQuery(TOKEN_COLORS, null, Colors.CONTENT_URI,
+                            EditEventHelper.COLORS_PROJECTION,
+                            Colors.COLOR_TYPE + "=" + Colors.TYPE_EVENT, null, null);
+
                     setModelIfDone(TOKEN_EVENT);
                     break;
                 case TOKEN_ATTENDEES:
@@ -335,9 +340,6 @@
                             EditEventHelper.setModelFromCalendarCursor(mModel, cursor);
                             EditEventHelper.setModelFromCalendarCursor(mOriginalModel, cursor);
                         }
-                        startQuery(TOKEN_COLORS, null, Colors.CONTENT_URI,
-                                EditEventHelper.COLORS_PROJECTION,
-                                Colors.COLOR_TYPE + "=" + Colors.TYPE_EVENT, null, null);
                     } finally {
                         cursor.close();
                     }
@@ -525,12 +527,16 @@
             mModel.mCalendarId = mCalendarId;
             mModel.mSelfAttendeeStatus = Attendees.ATTENDEE_STATUS_ACCEPTED;
 
-            // Start a query in the background to read the list of calendars
+            // Start a query in the background to read the list of calendars and colors
             mHandler.startQuery(TOKEN_CALENDARS, null, Calendars.CONTENT_URI,
                     EditEventHelper.CALENDARS_PROJECTION,
                     EditEventHelper.CALENDARS_WHERE_WRITEABLE_VISIBLE, null /* selection args */,
                     null /* sort order */);
 
+            mHandler.startQuery(TOKEN_COLORS, null, Colors.CONTENT_URI,
+                    EditEventHelper.COLORS_PROJECTION,
+                    Colors.COLOR_TYPE + "=" + Colors.TYPE_EVENT, null, null);
+
             mModification = Utils.MODIFY_ALL;
             mView.setModification(mModification);
         }