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

Commit be527c20 authored by Michael Chan's avatar Michael Chan Committed by Android (Google) Code Review
Browse files

Merge "Fixed the problem where the current time stopped updating after... 

Merge "Fixed the problem where the current time stopped updating after scrolling 2 days/weeks. Also vertical fling has momentum again" into ics-mr1
parents b43bd553 58f5055e

src/com/android/calendar/DayView.java

+4 −4
Original line number Diff line number Diff line
@@ -1828,6 +1828,7 @@ public class DayView extends View implements View.OnCreateContextMenuListener, 
        view.requestFocus();

        view.reloadEvents();

        view.updateTitle();

        view.restartCurrentTimeUpdates();



        return view;

    }
@@ -4587,10 +4588,9 @@ public class DayView extends View implements View.OnCreateContextMenuListener, 
        }

        mPaused = true;

        mLastPopupEventID = INVALID_EVENT_ID;

        Handler handler = mHandler;

        if (handler != null) {

            handler.removeCallbacks(mDismissPopup);

            handler.removeCallbacks(mUpdateCurrentTime);

        if (mHandler != null) {

            mHandler.removeCallbacks(mDismissPopup);

            mHandler.removeCallbacks(mUpdateCurrentTime);

        }



        Utils.setSharedPreference(mContext, GeneralPreferences.KEY_DEFAULT_CELL_HEIGHT,