Merge "Increased widget query size to 100" into jb-dev (d2121199) · Commits · e / os / Calendar

src/com/android/calendar/DayView.java

+4 −5

Original line number	Diff line number	Diff line
		@@ -16,9 +16,6 @@

		package com.android.calendar;

		import com.android.calendar.CalendarController.EventType;
		import com.android.calendar.CalendarController.ViewType;

		import android.animation.Animator;
		import android.animation.AnimatorListenerAdapter;
		import android.animation.ObjectAnimator;
		@@ -80,6 +77,9 @@ import android.widget.PopupWindow;
		import android.widget.TextView;
		import android.widget.ViewSwitcher;

		import com.android.calendar.CalendarController.EventType;
		import com.android.calendar.CalendarController.ViewType;

		import java.util.ArrayList;
		import java.util.Arrays;
		import java.util.Calendar;
		@@ -770,7 +770,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
		mEdgeEffectTop = new EdgeEffect(context);
		mEdgeEffectBottom = new EdgeEffect(context);
		ViewConfiguration vc = ViewConfiguration.get(context);
		mOnDownDelay = vc.getTapTimeout();
		mOnDownDelay = ViewConfiguration.getTapTimeout();
		OVERFLING_DISTANCE = vc.getScaledOverflingDistance();

		init(context);
		@@ -3882,7 +3882,6 @@ public class DayView extends View implements View.OnCreateContextMenuListener,
		boolean hasSelection = mSelectionMode != SELECTION_HIDDEN;
		boolean pressedSelected = (hasSelection \|\| mTouchExplorationEnabled)
		&& selectedDay == mSelectionDay && selectedHour == mSelectionHour;
		boolean noEvent = mTouchExplorationEnabled && mSelectedEvent == null;

		if (pressedSelected && mSavedClickedEvent == null) {
		// If the tap is on an already selected hour slot, then create a new

src/com/android/calendar/EventInfoActivity.java

+0 −2

Original line number	Diff line number	Diff line
		@@ -23,13 +23,11 @@ import android.app.ActionBar;
		import android.app.Activity;
		import android.app.FragmentManager;
		import android.app.FragmentTransaction;
		import android.content.ContentUris;
		import android.content.Intent;
		import android.content.res.Resources;
		import android.net.Uri;
		import android.os.Bundle;
		import android.provider.CalendarContract.Attendees;
		import android.provider.CalendarContract.Events;
		import android.util.Log;

		public class EventInfoActivity extends Activity {

src/com/android/calendar/agenda/AgendaAdapter.java

+0 −1

Original line number	Diff line number	Diff line
		@@ -26,7 +26,6 @@ import android.text.format.DateUtils;
		import android.text.format.Time;
		import android.view.View;
		import android.view.ViewGroup;
		import android.widget.GridLayout;
		import android.widget.LinearLayout;
		import android.widget.ResourceCursorAdapter;
		import android.widget.TextView;

src/com/android/calendar/agenda/AgendaFragment.java

+0 −3

Original line number	Diff line number	Diff line
		@@ -42,11 +42,8 @@ import com.android.calendar.EventInfoFragment;
		import com.android.calendar.GeneralPreferences;
		import com.android.calendar.R;
		import com.android.calendar.StickyHeaderListView;
		import com.android.calendar.StickyHeaderListView.HeaderHeightListener;
		import com.android.calendar.StickyHeaderListView.HeaderIndexer;
		import com.android.calendar.Utils;


		public class AgendaFragment extends Fragment implements CalendarController.EventHandler,
		OnScrollListener {

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

+11 −13

Original line number	Diff line number	Diff line
		@@ -16,18 +16,6 @@

		package com.android.calendar.event;

		import com.android.calendar.AsyncQueryService;
		import com.android.calendar.CalendarController;
		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.common.Rfc822Validator;

		import android.content.ContentProviderOperation;
		import android.content.ContentUris;
		import android.content.ContentValues;
		@@ -46,7 +34,17 @@ import android.text.util.Rfc822Token;
		import android.text.util.Rfc822Tokenizer;
		import android.util.Log;
		import android.view.View;
		import android.widget.QuickContactBadge;

		import com.android.calendar.AsyncQueryService;
		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.common.Rfc822Validator;

		import java.util.ArrayList;
		import java.util.HashMap;