diff options
| author | Isaac Katzenelson <isaackatz@google.com> | 2013-05-14 11:05:19 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2013-05-14 11:05:19 -0700 |
| commit | 90c41b8f12471043f2f590217d823872e8dc865e (patch) | |
| tree | c4b2a7ac0edb286c341bec33804e7a7dd679867d /src | |
| parent | aed8480fed1827681106a202ff0f4d96ee0eb554 (diff) | |
| parent | 9662675dc0765ab347d1786e3d5a86ce9f3f5b84 (diff) | |
| download | android_packages_apps_Calendar-90c41b8f12471043f2f590217d823872e8dc865e.tar.gz android_packages_apps_Calendar-90c41b8f12471043f2f590217d823872e8dc865e.tar.bz2 android_packages_apps_Calendar-90c41b8f12471043f2f590217d823872e8dc865e.zip | |
am 9662675d: Merge "Query for Colors in parallel with all other queries" into ics-ub-calendar-denim
* commit '9662675dc0765ab347d1786e3d5a86ce9f3f5b84':
Query for Colors in parallel with all other queries
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/calendar/event/EditEventFragment.java | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/src/com/android/calendar/event/EditEventFragment.java b/src/com/android/calendar/event/EditEventFragment.java index 6b350b03..e1d59f8e 100644 --- a/src/com/android/calendar/event/EditEventFragment.java +++ b/src/com/android/calendar/event/EditEventFragment.java @@ -246,6 +246,11 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor 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 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor 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 @@ public class EditEventFragment extends Fragment implements EventHandler, OnColor 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); } |