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

Commit dc3e827d authored by Daria Evdokimova's avatar Daria Evdokimova Committed by Android Git Automerger
Browse files

am 8d915492: Merge "Fixing bug for STOP_TIMER" into ub-deskclock-business 

* commit '8d915492':
  Fixing bug for STOP_TIMER
parents 2bce5a9d 8d915492

src/com/android/deskclock/HandleDeskClockApiCalls.java

+9 −1
Original line number Diff line number Diff line
@@ -303,7 +303,15 @@ public class HandleDeskClockApiCalls extends Activity { 
                    final String reason = mContext.getString(R.string.timer_stopped);

                    LogUtils.i(reason);

                    Voice.notifySuccess(mActivity, reason);

                    if (timer.mState == TimerObj.STATE_RUNNING) {

                        timer.setState(TimerObj.STATE_STOPPED);

                    }

                    else {

                        // if the time is up on the timer

                        // restart it and reset the length

                        timer.setState(TimerObj.STATE_RESTART);

                        timer.mTimeLeft = timer.mOriginalLength;

                    }

                    timer.writeToSharedPref(prefs);

                    Events.sendTimerEvent(R.string.action_stop, R.string.label_intent);

                    break;