Etar-Group/Etar-Calendar
1
1
Fork 0
mirror of https://github.com/Etar-Group/Etar-Calendar.git synced 2024-09-11 10:05:47 +03:00
Code Issues Packages Projects Releases Wiki Activity

Relocate common Calendar classes

Browse Source 
Move some classes from android.pim to com.android.calendarcommon.

Switch Calendar app to build unbundled.

Bug 4575374

Change-Id: I3c344364b8fa82be1fbc21b0d1d2628957d8d07e
This commit is contained in:
Andy McFadden 2011-07-06 15:17:54 -07:00
parent bf44d0f3a8
commit 8ed988fbac
7 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Android.mk
View File

@ -12,11 +12,17 @@ LOCAL_MODULE_TAGS := optional
LOCAL_SRC_FILES := $(call all-java-files-under,src)
# bundled
LOCAL_STATIC_JAVA_LIBRARIES += android-common android-common-chips
#LOCAL_STATIC_JAVA_LIBRARIES += \
# android-common \
# android-common-chips \
# calendar-common
# unbundled
#LOCAL_STATIC_JAVA_LIBRARIES := android-common android-common-chips
#LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := \
android-common \
android-common-chips \
calendar-common
LOCAL_SDK_VERSION := current
LOCAL_RESOURCE_DIR := $(addprefix $(LOCAL_PATH)/, $(res_dirs))

2
src/com/android/calendar/DeleteEventHelper.java
View File

@ -17,6 +17,7 @@
package com.android.calendar;
import com.android.calendar.event.EditEventHelper;
import com.android.calendarcommon.EventRecurrence;
import android.app.Activity;
import android.app.AlertDialog;
@ -26,7 +27,6 @@ import android.content.Context;
import android.content.DialogInterface;
import android.database.Cursor;
import android.net.Uri;
import android.pim.EventRecurrence;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Events;
import android.text.TextUtils;

2
src/com/android/calendar/EventInfoFragment.java
View File

@ -21,6 +21,7 @@ import com.android.calendar.CalendarController.EventType;
import com.android.calendar.CalendarEventModel.Attendee;
import com.android.calendar.event.AttendeesView;
import com.android.calendar.event.EditEventHelper;
import com.android.calendarcommon.EventRecurrence;
import android.app.Activity;
import android.app.Dialog;
@ -39,7 +40,6 @@ import android.graphics.Rect;
import android.graphics.Typeface;
import android.net.Uri;
import android.os.Bundle;
import android.pim.EventRecurrence;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Attendees;
import android.provider.CalendarContract.Calendars;

3
src/com/android/calendar/EventRecurrenceFormatter.java
View File

@ -16,9 +16,10 @@
package com.android.calendar;
import com.android.calendarcommon.EventRecurrence;
import android.content.res.Resources;
import android.text.format.DateUtils;
import android.pim.EventRecurrence;
import java.util.Calendar;

2
src/com/android/calendar/event/EditEventHelper.java
View File

@ -23,6 +23,7 @@ import com.android.calendar.CalendarEventModel.Attendee;
import com.android.calendar.CalendarEventModel.ReminderEntry;
import com.android.calendar.R;
import com.android.calendar.Utils;
import com.android.calendarcommon.EventRecurrence;
import com.android.common.Rfc822Validator;
import android.content.ContentProviderOperation;
@ -32,7 +33,6 @@ import android.content.Context;
import android.database.Cursor;
import android.graphics.drawable.Drawable;
import android.net.Uri;
import android.pim.EventRecurrence;
import android.provider.CalendarContract.Attendees;
import android.provider.CalendarContract.Calendars;
import android.provider.CalendarContract.Events;

2
src/com/android/calendar/event/EditEventView.java
View File

@ -28,6 +28,7 @@ import com.android.calendar.TimezoneAdapter;
import com.android.calendar.TimezoneAdapter.TimezoneRow;
import com.android.calendar.Utils;
import com.android.calendar.event.EditEventHelper.EditDoneRunnable;
import com.android.calendarcommon.EventRecurrence;
import com.android.common.Rfc822InputFilter;
import com.android.common.Rfc822Validator;
import com.android.ex.chips.AccountSpecifier;
@ -52,7 +53,6 @@ import android.database.Cursor;
import android.graphics.Bitmap;
import android.graphics.BitmapFactory;
import android.graphics.drawable.Drawable;
import android.pim.EventRecurrence;
import android.provider.CalendarContract.Attendees;
import android.provider.CalendarContract.Calendars;
import android.provider.CalendarContract.Reminders;

4
tests/Android.mk
View File

@ -16,7 +16,7 @@ LOCAL_PACKAGE_NAME := CalendarTests
LOCAL_INSTRUMENTATION_FOR := Calendar
# unbundled
#LOCAL_STATIC_JAVA_LIBRARIES := android-common
#LOCAL_SDK_VERSION := current
LOCAL_STATIC_JAVA_LIBRARIES := android-common calendar-common
LOCAL_SDK_VERSION := current
include $(BUILD_PACKAGE)