Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 844cac06 authored by Sara Ting's avatar Sara Ting
Browse files

Skip local account types when picking default calendar. 

Bug:7148804
Change-Id: I491151840bc874a634c57f52d0dddf5d4a0fb922
parent 21049d25

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

+2 −0
Original line number Diff line number Diff line
@@ -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";

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

+5 −1
Original line number Diff line number Diff line
@@ -35,6 +35,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;
@@ -1417,6 +1418,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()) {
@@ -1425,7 +1427,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)) {