diff options
| author | Sara Ting <sarating@google.com> | 2012-09-18 11:12:51 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2012-09-18 11:12:51 -0700 |
| commit | dc59b0bc0125f5045eeed46ec21257141ed1cccc (patch) | |
| tree | 8251fdfbeb33958e04dee8545cb45b2054c3db8a /src | |
| parent | 6648ecc4f40b78c1c03389f8563c812a952aa235 (diff) | |
| parent | 844cac068835d7d8a80ec118da8019535c0d7450 (diff) | |
| download | android_packages_apps_Calendar-dc59b0bc0125f5045eeed46ec21257141ed1cccc.tar.gz android_packages_apps_Calendar-dc59b0bc0125f5045eeed46ec21257141ed1cccc.tar.bz2 android_packages_apps_Calendar-dc59b0bc0125f5045eeed46ec21257141ed1cccc.zip | |
am 844cac06: Skip local account types when picking default calendar.
* commit '844cac068835d7d8a80ec118da8019535c0d7450':
Skip local account types when picking default calendar.
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/android/calendar/event/EditEventHelper.java | 2 | ||||
| -rw-r--r-- | src/com/android/calendar/event/EditEventView.java | 6 |
2 files changed, 7 insertions, 1 deletions
diff --git a/src/com/android/calendar/event/EditEventHelper.java b/src/com/android/calendar/event/EditEventHelper.java index 98549658..03773fda 100644 --- a/src/com/android/calendar/event/EditEventHelper.java +++ b/src/com/android/calendar/event/EditEventHelper.java @@ -170,6 +170,7 @@ public class EditEventHelper { Calendars.ALLOWED_ATTENDEE_TYPES, // 9 Calendars.ALLOWED_AVAILABILITY, // 10 Calendars.ACCOUNT_NAME, // 11 + Calendars.ACCOUNT_TYPE, //12 }; static final int CALENDARS_INDEX_ID = 0; static final int CALENDARS_INDEX_DISPLAY_NAME = 1; @@ -183,6 +184,7 @@ public class EditEventHelper { static final int CALENDARS_INDEX_ALLOWED_ATTENDEE_TYPES = 9; static final int CALENDARS_INDEX_ALLOWED_AVAILABILITY = 10; static final int CALENDARS_INDEX_ACCOUNT_NAME = 11; + static final int CALENDARS_INDEX_ACCOUNT_TYPE = 12; static final String CALENDARS_WHERE_WRITEABLE_VISIBLE = Calendars.CALENDAR_ACCESS_LEVEL + ">=" + Calendars.CAL_ACCESS_CONTRIBUTOR + " AND " + Calendars.VISIBLE + "=1"; diff --git a/src/com/android/calendar/event/EditEventView.java b/src/com/android/calendar/event/EditEventView.java index 928281ff..3ef527e2 100644 --- a/src/com/android/calendar/event/EditEventView.java +++ b/src/com/android/calendar/event/EditEventView.java @@ -37,6 +37,7 @@ import android.provider.CalendarContract.Attendees; import android.provider.CalendarContract.Calendars; import android.provider.CalendarContract.Events; import android.provider.CalendarContract.Reminders; +import android.provider.CalendarContract; import android.provider.Settings; import android.text.InputFilter; import android.text.TextUtils; @@ -1547,6 +1548,7 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa int calendarsOwnerColumn = calendarsCursor.getColumnIndexOrThrow(Calendars.OWNER_ACCOUNT); int accountNameIndex = calendarsCursor.getColumnIndexOrThrow(Calendars.ACCOUNT_NAME); + int accountTypeIndex = calendarsCursor.getColumnIndexOrThrow(Calendars.ACCOUNT_TYPE); int position = 0; calendarsCursor.moveToPosition(-1); while (calendarsCursor.moveToNext()) { @@ -1555,7 +1557,9 @@ public class EditEventView implements View.OnClickListener, DialogInterface.OnCa // There is no stored default upon the first time running. Use a primary // calendar in this case. if (calendarOwner != null && - calendarOwner.equals(calendarsCursor.getString(accountNameIndex))) { + calendarOwner.equals(calendarsCursor.getString(accountNameIndex)) && + !CalendarContract.ACCOUNT_TYPE_LOCAL.equals( + calendarsCursor.getString(accountTypeIndex))) { return position; } } else if (defaultCalendar.equals(calendarOwner)) { |