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

Commit 705928dc authored by Justin Klaassen's avatar Justin Klaassen
Browse files

Add support to set Timer length / remainingTime 

Bug: 30076796

- EXPIRED / MISSED timers now have their totalLength reset to 0L and
  remainingTime set to <= 0L at the time of expire() or miss().

Change-Id: I8dc954da6b271c61d9a64305a77ecb7edb6fb0fd
parent b3d3ccaa

src/com/android/deskclock/data/DataModel.java

+23 −0
Original line number Diff line number Diff line
@@ -473,6 +473,29 @@ public final class DataModel { 
        mTimerModel.updateTimer(timer.setLabel(label));

    }



    /**

     * @param timer  the timer whose {@code length} to change

     * @param length the new length of the timer in milliseconds

     */

    public void setTimerLength(Timer timer, long length) {

        enforceMainLooper();

        mTimerModel.updateTimer(timer.setLength(length));

    }



    /**

     * @param timer         the timer whose {@code remainingTime} to change

     * @param remainingTime the new remaining time of the timer in milliseconds

     */

    public void setRemainingTime(Timer timer, long remainingTime) {

        enforceMainLooper();



        final Timer updated = timer.setRemainingTime(remainingTime);

        mTimerModel.updateTimer(updated);

        if (timer.isRunning() && timer.getRemainingTime() <= 0) {

            mContext.startService(TimerService.createTimerExpiredIntent(mContext, updated));

        }

    }



    /**

     * Updates the timer notifications to be current.

     */

src/com/android/deskclock/data/Timer.java

+50 −19
Original line number Diff line number Diff line
@@ -218,8 +218,9 @@ public final class Timer { 
            return this;

        }



        return new Timer(mId, EXPIRED, mLength, mTotalLength, mLastStartTime,

                mLastStartWallClockTime, mRemainingTime, mLabel, mDeleteAfterUse);

        final long remainingTime = Math.min(0L, getRemainingTime());

        return new Timer(mId, EXPIRED, mLength, 0L, now(), wallClock(), remainingTime, mLabel,

                mDeleteAfterUse);

    }



    /**
@@ -230,8 +231,9 @@ public final class Timer { 
            return this;

        }



        return new Timer(mId, MISSED, mLength, mTotalLength, mLastStartTime,

                mLastStartWallClockTime, mRemainingTime, mLabel, mDeleteAfterUse);

        final long remainingTime = Math.min(0L, getRemainingTime());

        return new Timer(mId, MISSED, mLength, 0L, now(), wallClock(), remainingTime, mLabel,

                mDeleteAfterUse);

    }



    /**
@@ -294,38 +296,67 @@ public final class Timer { 
    }



    /**

     * @return a copy of this timer with an additional minute added to the remaining time and total

     *      length, or this Timer if adding a minute would exceed the maximum timer duration

     * @return a copy of this timer with the given {@code length}

     */

    Timer addMinute() {

    Timer setLength(long length) {

        if (mLength == length

                || length <= 0L

                || length > MAX_LENGTH) {

            return this;

        }



        final long totalLength;

        final long remainingTime;

        if (mState == RESET) {

            totalLength = length;

            remainingTime = length;

        } else {

            totalLength = mTotalLength;

            remainingTime = mRemainingTime;

        }



        return new Timer(mId, mState, length, totalLength, mLastStartTime,

                mLastStartWallClockTime, remainingTime, mLabel, mDeleteAfterUse);

    }



    /**

     * @return a copy of this timer with the given {@code remainingTime}

     */

    Timer setRemainingTime(long remainingTime) {

        // Do not allow the remaining time to exceed the maximum.

        if (mRemainingTime == remainingTime || remainingTime > MAX_LENGTH) {

            return this;

        }



        final long delta = remainingTime - mRemainingTime;

        final long totalLength = mTotalLength + delta;



        final long lastStartTime;

        final long lastWallClockTime;

        final long remainingTime;

        final long totalLength;

        final State state;

        if (mState == EXPIRED || mState == MISSED) {

        if (remainingTime > 0 && (mState == EXPIRED || mState == MISSED)) {

            state = RUNNING;

            lastStartTime = now();

            lastWallClockTime = wallClock();

            totalLength = MINUTE_IN_MILLIS;

            remainingTime = MINUTE_IN_MILLIS;

        } else {

            state = mState;

            lastStartTime = mLastStartTime;

            lastWallClockTime = mLastStartWallClockTime;

            totalLength = mRemainingTime + MINUTE_IN_MILLIS;

            remainingTime = mRemainingTime + MINUTE_IN_MILLIS;

        }



        // Do not allow the remaining time to exceed the maximum.

        if (remainingTime > MAX_LENGTH) {

            return this;

        }



        return new Timer(mId, state, mLength, totalLength, lastStartTime,

                lastWallClockTime, remainingTime, mLabel, mDeleteAfterUse);

    }



    /**

     * @return a copy of this timer with an additional minute added to the remaining time and total

     *      length, or this Timer if adding a minute would exceed the maximum timer duration

     */

    Timer addMinute() {

        final long remainingTime = (mState == EXPIRED || mState == MISSED) ? 0L : mRemainingTime;

        return setRemainingTime(remainingTime + MINUTE_IN_MILLIS);

    }



    @Override

    public boolean equals(Object o) {

        if (this == o) return true;