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

Commit 8a528adb authored by Michael Chan's avatar Michael Chan
Browse files

Rename calendarcommon to calendarcommon2 to workaround OEM silliness

Change-Id: I4c23023efd9df768da15160e007a0452ac23f7d6
parent 5474850d
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@
package com.android.calendar;

import com.android.calendar.event.EditEventHelper;
import com.android.calendarcommon.EventRecurrence;
import com.android.calendarcommon2.EventRecurrence;

import android.app.Activity;
import android.app.AlertDialog;
+1 −1
Original line number Diff line number Diff line
@@ -103,7 +103,7 @@ import com.android.calendar.event.AttendeesView;
import com.android.calendar.event.EditEventActivity;
import com.android.calendar.event.EditEventHelper;
import com.android.calendar.event.EventViewUtils;
import com.android.calendarcommon.EventRecurrence;
import com.android.calendarcommon2.EventRecurrence;

import java.util.ArrayList;
import java.util.Arrays;
+1 −1
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@

package com.android.calendar;

import com.android.calendarcommon.EventRecurrence;
import com.android.calendarcommon2.EventRecurrence;

import android.content.res.Resources;
import android.text.format.DateUtils;
+2 −2
Original line number Diff line number Diff line
@@ -38,8 +38,8 @@ import android.text.TextUtils;
import android.util.Base64;
import android.util.Log;

import com.android.calendarcommon.DateException;
import com.android.calendarcommon.Duration;
import com.android.calendarcommon2.DateException;
import com.android.calendarcommon2.Duration;

public class GoogleCalendarUriIntentFilter extends Activity {
    private static final String TAG = "GoogleCalendarUriIntentFilter";
+4 −4
Original line number Diff line number Diff line
@@ -41,10 +41,10 @@ import com.android.calendar.CalendarEventModel;
import com.android.calendar.CalendarEventModel.Attendee;
import com.android.calendar.CalendarEventModel.ReminderEntry;
import com.android.calendar.Utils;
import com.android.calendarcommon.DateException;
import com.android.calendarcommon.EventRecurrence;
import com.android.calendarcommon.RecurrenceProcessor;
import com.android.calendarcommon.RecurrenceSet;
import com.android.calendarcommon2.DateException;
import com.android.calendarcommon2.EventRecurrence;
import com.android.calendarcommon2.RecurrenceProcessor;
import com.android.calendarcommon2.RecurrenceSet;
import com.android.common.Rfc822Validator;

import java.util.ArrayList;
Loading