summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--AndroidManifest.xml2
-rw-r--r--res/drawable-hdpi/ic_menu_today_no_date_holo_light.pngbin882 -> 0 bytes
-rw-r--r--res/drawable-mdpi/ic_menu_today_no_date_holo_light.pngbin836 -> 0 bytes
-rw-r--r--res/drawable-sw600dp/ic_menu_today_no_date_holo_light.pngbin882 -> 0 bytes
-rw-r--r--res/drawable-xhdpi/ic_menu_today_no_date_holo_light.pngbin1155 -> 0 bytes
-rw-r--r--src/com/android/calendar/AllInOneActivity.java16
-rw-r--r--src/com/android/calendar/Event.java9
-rw-r--r--src/com/android/calendar/EventInfoFragment.java31
-rw-r--r--src/com/android/calendar/agenda/AgendaWindowAdapter.java9
-rw-r--r--src/com/android/calendar/alerts/AlertActivity.java10
-rw-r--r--src/com/android/calendar/alerts/DismissAlarmsService.java12
-rw-r--r--src/com/android/calendar/widget/CalendarAppWidgetService.java8
12 files changed, 24 insertions, 73 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a5ba8949..75be451a 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -37,7 +37,7 @@
<uses-permission android:name="android.permission.USE_CREDENTIALS" />
<uses-permission android:name="android.permission.READ_SYNC_SETTINGS" />
<uses-permission android:name="com.google.android.googleapps.permission.GOOGLE_AUTH.mail" />
- <uses-sdk android:minSdkVersion="15" android:targetSdkVersion="16"></uses-sdk>
+ <uses-sdk android:minSdkVersion="15"></uses-sdk>
<application android:name="CalendarApplication"
android:label="@string/app_label" android:icon="@mipmap/ic_launcher_calendar"
diff --git a/res/drawable-hdpi/ic_menu_today_no_date_holo_light.png b/res/drawable-hdpi/ic_menu_today_no_date_holo_light.png
deleted file mode 100644
index a8cefee1..00000000
--- a/res/drawable-hdpi/ic_menu_today_no_date_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-mdpi/ic_menu_today_no_date_holo_light.png b/res/drawable-mdpi/ic_menu_today_no_date_holo_light.png
deleted file mode 100644
index af04eb88..00000000
--- a/res/drawable-mdpi/ic_menu_today_no_date_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-sw600dp/ic_menu_today_no_date_holo_light.png b/res/drawable-sw600dp/ic_menu_today_no_date_holo_light.png
deleted file mode 100644
index a8cefee1..00000000
--- a/res/drawable-sw600dp/ic_menu_today_no_date_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/res/drawable-xhdpi/ic_menu_today_no_date_holo_light.png b/res/drawable-xhdpi/ic_menu_today_no_date_holo_light.png
deleted file mode 100644
index aeaec2fc..00000000
--- a/res/drawable-xhdpi/ic_menu_today_no_date_holo_light.png
+++ /dev/null
Binary files differ
diff --git a/src/com/android/calendar/AllInOneActivity.java b/src/com/android/calendar/AllInOneActivity.java
index 47d8db93..ed55d6cd 100644
--- a/src/com/android/calendar/AllInOneActivity.java
+++ b/src/com/android/calendar/AllInOneActivity.java
@@ -40,7 +40,9 @@ import android.content.AsyncQueryHandler;
import android.content.BroadcastReceiver;
import android.content.ContentResolver;
import android.content.ContentUris;
+import android.content.Context;
import android.content.Intent;
+import android.content.IntentFilter;
import android.content.SharedPreferences;
import android.content.SharedPreferences.OnSharedPreferenceChangeListener;
import android.content.res.Configuration;
@@ -49,7 +51,6 @@ import android.database.ContentObserver;
import android.database.Cursor;
import android.graphics.drawable.LayerDrawable;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.os.Handler;
import android.provider.CalendarContract;
@@ -757,15 +758,10 @@ public class AllInOneActivity extends Activity implements EventHandler,
mControlsMenu.setTitle(mHideControls ? mShowString : mHideString);
}
- MenuItem menuItem = menu.findItem(R.id.action_today);
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
- menuItem.setIcon(R.drawable.ic_menu_today_no_date_holo_light);
- } else {
- // replace the default top layer drawable of the today icon with a
- // custom drawable that shows the day of the month of today
- LayerDrawable icon = (LayerDrawable) menuItem.getIcon();
- Utils.setTodayIcon(icon, this, mTimeZone);
- }
+ // replace the default top layer drawable of the today icon with a custom drawable
+ // that shows the day of the month of today
+ LayerDrawable icon = (LayerDrawable)menu.findItem(R.id.action_today).getIcon();
+ Utils.setTodayIcon(icon, this, mTimeZone);
return true;
}
diff --git a/src/com/android/calendar/Event.java b/src/com/android/calendar/Event.java
index e0ec8430..ac07658d 100644
--- a/src/com/android/calendar/Event.java
+++ b/src/com/android/calendar/Event.java
@@ -23,7 +23,6 @@ import android.content.SharedPreferences;
import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
-import android.os.Build;
import android.os.Debug;
import android.provider.CalendarContract.Attendees;
import android.provider.CalendarContract.Calendars;
@@ -68,7 +67,7 @@ public class Event implements Cloneable {
Instances.TITLE, // 0
Instances.EVENT_LOCATION, // 1
Instances.ALL_DAY, // 2
- Instances.DISPLAY_COLOR, // 3 If SDK < 16, set to Instances.CALENDAR_COLOR.
+ Instances.DISPLAY_COLOR, // 3
Instances.EVENT_TIMEZONE, // 4
Instances.EVENT_ID, // 5
Instances.BEGIN, // 6
@@ -109,12 +108,6 @@ public class Event implements Cloneable {
private static final int PROJECTION_GUESTS_CAN_INVITE_OTHERS_INDEX = 18;
private static final int PROJECTION_DISPLAY_AS_ALLDAY = 19;
- static {
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
- EVENT_PROJECTION[PROJECTION_COLOR_INDEX] = Instances.CALENDAR_COLOR;
- }
- }
-
private static String mNoTitleString;
private static int mNoColorColor;
diff --git a/src/com/android/calendar/EventInfoFragment.java b/src/com/android/calendar/EventInfoFragment.java
index c0ca0503..95a023fa 100644
--- a/src/com/android/calendar/EventInfoFragment.java
+++ b/src/com/android/calendar/EventInfoFragment.java
@@ -46,7 +46,6 @@ import android.graphics.Rect;
import android.graphics.Typeface;
import android.graphics.drawable.Drawable;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Attendees;
@@ -164,8 +163,8 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
Events.EVENT_TIMEZONE, // 7 do not remove; used in DeleteEventHelper
Events.DESCRIPTION, // 8
Events.EVENT_LOCATION, // 9
- Calendars.CALENDAR_ACCESS_LEVEL, // 10
- Events.DISPLAY_COLOR, // 11 If SDK < 16, set to Calendars.CALENDAR_COLOR.
+ Calendars.CALENDAR_ACCESS_LEVEL, // 10
+ Events.DISPLAY_COLOR, // 11
Events.HAS_ATTENDEE_DATA, // 12
Events.ORGANIZER, // 13
Events.HAS_ALARM, // 14
@@ -194,6 +193,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
private static final int EVENT_INDEX_CUSTOM_APP_PACKAGE = 17;
private static final int EVENT_INDEX_CUSTOM_APP_URI = 18;
+
private static final String[] ATTENDEES_PROJECTION = new String[] {
Attendees._ID, // 0
Attendees.ATTENDEE_NAME, // 1
@@ -211,17 +211,6 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
private static final int ATTENDEES_INDEX_IDENTITY = 5;
private static final int ATTENDEES_INDEX_ID_NAMESPACE = 6;
- static {
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
- EVENT_PROJECTION[EVENT_INDEX_COLOR] = Calendars.CALENDAR_COLOR;
- EVENT_PROJECTION[EVENT_INDEX_CUSTOM_APP_PACKAGE] = Events._ID; // dummy value
- EVENT_PROJECTION[EVENT_INDEX_CUSTOM_APP_URI] = Events._ID; // dummy value
-
- ATTENDEES_PROJECTION[ATTENDEES_INDEX_IDENTITY] = Attendees._ID; // dummy value
- ATTENDEES_PROJECTION[ATTENDEES_INDEX_ID_NAMESPACE] = Attendees._ID; // dummy value
- }
- }
-
private static final String ATTENDEES_WHERE = Attendees.EVENT_ID + "=?";
private static final String ATTENDEES_SORT_ORDER = Attendees.ATTENDEE_NAME + " ASC, "
@@ -861,13 +850,9 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
mCalendarOwnerAttendeeId = mAttendeesCursor.getInt(ATTENDEES_INDEX_ID);
mOriginalAttendeeResponse = mAttendeesCursor.getInt(ATTENDEES_INDEX_STATUS);
} else {
- String identity = null;
- String idNamespace = null;
-
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- identity = mAttendeesCursor.getString(ATTENDEES_INDEX_IDENTITY);
- idNamespace = mAttendeesCursor.getString(ATTENDEES_INDEX_ID_NAMESPACE);
- }
+ String identity = mAttendeesCursor.getString(ATTENDEES_INDEX_IDENTITY);
+ String idNamespace = mAttendeesCursor.getString(
+ ATTENDEES_INDEX_ID_NAMESPACE);
// Don't show your own status in the list because:
// 1) it doesn't make sense for event without other guests.
@@ -1248,9 +1233,7 @@ public class EventInfoFragment extends DialogFragment implements OnCheckedChange
}
// Launch Custom App
- if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.JELLY_BEAN) {
- updateCustomAppButton();
- }
+ updateCustomAppButton();
}
private void updateCustomAppButton() {
diff --git a/src/com/android/calendar/agenda/AgendaWindowAdapter.java b/src/com/android/calendar/agenda/AgendaWindowAdapter.java
index 2cca38e2..0c050646 100644
--- a/src/com/android/calendar/agenda/AgendaWindowAdapter.java
+++ b/src/com/android/calendar/agenda/AgendaWindowAdapter.java
@@ -23,7 +23,6 @@ import android.content.Context;
import android.content.res.Resources;
import android.database.Cursor;
import android.net.Uri;
-import android.os.Build;
import android.os.Handler;
import android.provider.CalendarContract;
import android.provider.CalendarContract.Attendees;
@@ -108,7 +107,7 @@ public class AgendaWindowAdapter extends BaseAdapter
Instances.EVENT_LOCATION, // 2
Instances.ALL_DAY, // 3
Instances.HAS_ALARM, // 4
- Instances.DISPLAY_COLOR, // 5 If SDK < 16, set to Instances.CALENDAR_COLOR.
+ Instances.DISPLAY_COLOR, // 5
Instances.RRULE, // 6
Instances.BEGIN, // 7
Instances.END, // 8
@@ -122,12 +121,6 @@ public class AgendaWindowAdapter extends BaseAdapter
Instances.EVENT_TIMEZONE, // 16
};
- static {
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
- PROJECTION[INDEX_COLOR] = Instances.CALENDAR_COLOR;
- }
- }
-
// Listview may have a bug where the index/position is not consistent when there's a header.
// position == positionInListView - OFF_BY_ONE_BUG
// TODO Need to look into this.
diff --git a/src/com/android/calendar/alerts/AlertActivity.java b/src/com/android/calendar/alerts/AlertActivity.java
index 930b2c5b..668c7f13 100644
--- a/src/com/android/calendar/alerts/AlertActivity.java
+++ b/src/com/android/calendar/alerts/AlertActivity.java
@@ -24,7 +24,6 @@ import android.content.Context;
import android.content.Intent;
import android.database.Cursor;
import android.net.Uri;
-import android.os.Build;
import android.os.Bundle;
import android.provider.CalendarContract;
import android.provider.CalendarContract.CalendarAlerts;
@@ -165,12 +164,9 @@ public class AlertActivity extends Activity implements OnClickListener {
Intent eventIntent = AlertUtils.buildEventViewIntent(AlertActivity.this, id,
startMillis, endMillis);
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
- alertActivity.startActivity(eventIntent);
- } else {
- TaskStackBuilder.create(AlertActivity.this).addParentStack(EventInfoActivity.class)
- .addNextIntent(eventIntent).startActivities();
- }
+ TaskStackBuilder.create(AlertActivity.this)
+ .addParentStack(EventInfoActivity.class).addNextIntent(eventIntent)
+ .startActivities();
alertActivity.finish();
}
diff --git a/src/com/android/calendar/alerts/DismissAlarmsService.java b/src/com/android/calendar/alerts/DismissAlarmsService.java
index eec1015c..dc7de541 100644
--- a/src/com/android/calendar/alerts/DismissAlarmsService.java
+++ b/src/com/android/calendar/alerts/DismissAlarmsService.java
@@ -17,12 +17,13 @@
package com.android.calendar.alerts;
import android.app.IntentService;
+import android.app.NotificationManager;
import android.app.TaskStackBuilder;
import android.content.ContentResolver;
import android.content.ContentValues;
+import android.content.Context;
import android.content.Intent;
import android.net.Uri;
-import android.os.Build;
import android.os.IBinder;
import android.provider.CalendarContract.CalendarAlerts;
@@ -85,13 +86,8 @@ public class DismissAlarmsService extends IntentService {
// Show event on Calendar app by building an intent and task stack to start
// EventInfoActivity with AllInOneActivity as the parent activity rooted to home.
Intent i = AlertUtils.buildEventViewIntent(this, eventId, eventStart, eventEnd);
-
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
- startActivity(i);
- } else {
- TaskStackBuilder.create(this)
- .addParentStack(EventInfoActivity.class).addNextIntent(i).startActivities();
- }
+ TaskStackBuilder.create(this)
+ .addParentStack(EventInfoActivity.class).addNextIntent(i).startActivities();
}
// Stop this service
diff --git a/src/com/android/calendar/widget/CalendarAppWidgetService.java b/src/com/android/calendar/widget/CalendarAppWidgetService.java
index d7199758..00b41631 100644
--- a/src/com/android/calendar/widget/CalendarAppWidgetService.java
+++ b/src/com/android/calendar/widget/CalendarAppWidgetService.java
@@ -28,7 +28,6 @@ import android.content.res.Resources;
import android.database.Cursor;
import android.database.MatrixCursor;
import android.net.Uri;
-import android.os.Build;
import android.os.Handler;
import android.provider.CalendarContract.Attendees;
import android.provider.CalendarContract.Calendars;
@@ -76,7 +75,7 @@ public class CalendarAppWidgetService extends RemoteViewsService {
Instances.EVENT_ID,
Instances.START_DAY,
Instances.END_DAY,
- Instances.DISPLAY_COLOR, // If SDK < 16, set to Instances.CALENDAR_COLOR.
+ Instances.DISPLAY_COLOR,
Instances.SELF_ATTENDEE_STATUS,
};
@@ -91,11 +90,6 @@ public class CalendarAppWidgetService extends RemoteViewsService {
static final int INDEX_COLOR = 8;
static final int INDEX_SELF_ATTENDEE_STATUS = 9;
- static {
- if (Build.VERSION.SDK_INT <= Build.VERSION_CODES.ICE_CREAM_SANDWICH_MR1) {
- EVENT_PROJECTION[INDEX_COLOR] = Instances.CALENDAR_COLOR;
- }
- }
static final int MAX_DAYS = 7;
private static final long SEARCH_DURATION = MAX_DAYS * DateUtils.DAY_IN_MILLIS;
generated by cgit v1.2.3 (git 2.25.1) at 2024-09-27 21:52:40 +0000