Revert "Load events when scrolling in month view" (eb0ecb47) · Commits · e / os / android_packages_apps_Etar

app/src/main/java/com/android/calendar/month/MonthByWeekFragment.java

+7 −13

Original line number	Diff line number	Diff line
		@@ -71,7 +71,7 @@ public class MonthByWeekFragment extends SimpleDayPickerFragment implements
		private static final String WHERE_CALENDARS_VISIBLE = Calendars.VISIBLE + "=1";
		private static final String INSTANCES_SORT_ORDER = Instances.START_DAY + ","
		+ Instances.START_MINUTE + "," + Instances.TITLE;
		private static final int WEEKS_BUFFER = 6;
		private static final int WEEKS_BUFFER = 1;
		// How long to wait after scroll stops before starting the loader
		// Using scroll duration because scroll state changes don't update
		// correctly when a scroll is triggered programmatically.
		@@ -105,11 +105,12 @@ public class MonthByWeekFragment extends SimpleDayPickerFragment implements
		private CreateEventDialogFragment mEventDialog;
		private CursorLoader mLoader;
		private Uri mEventUri;
		private volatile boolean mShouldLoad = true;
		private final Runnable mUpdateLoader = new Runnable() {
		@Override
		public void run() {
		synchronized (this) {
		if (mLoader == null) {
		if (!mShouldLoad \|\| mLoader == null) {
		return;
		}
		// Stop any previous loads while we update the uri
		@@ -479,26 +480,19 @@ public class MonthByWeekFragment extends SimpleDayPickerFragment implements
		\| DateUtils.FORMAT_SHOW_YEAR, null, null);
		}
		}
		@Override
		public void onScroll(AbsListView view, int firstVisibleItem, int visibleItemCount, int totalItemCount) {
		super.onScroll(view, firstVisibleItem, visibleItemCount, totalItemCount);

		synchronized (mUpdateLoader) {
		mHandler.removeCallbacks(mUpdateLoader);
		mHandler.postDelayed(mUpdateLoader, LOADER_DELAY);
		}
		}

		@Override
		public void onScrollStateChanged(AbsListView view, int scrollState) {

		synchronized (mUpdateLoader) {
		if (scrollState != OnScrollListener.SCROLL_STATE_IDLE) {
		mDesiredDay.set(System.currentTimeMillis());
		mShouldLoad = false;
		stopLoader();
		mDesiredDay.set(System.currentTimeMillis());
		} else {
		mHandler.removeCallbacks(mUpdateLoader);
		mHandler.postDelayed(mUpdateLoader, 0);
		mShouldLoad = true;
		mHandler.postDelayed(mUpdateLoader, LOADER_DELAY);
		}
		}
		if (scrollState == OnScrollListener.SCROLL_STATE_TOUCH_SCROLL) {