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

Commit 867ba9f4 authored by Annie Chin's avatar Annie Chin Committed by Android Git Automerger
Browse files

am 005e8af3: am 7cd60432: Handle timer fab button when timer state is STATE_DELETED.

* commit '005e8af3':
  Handle timer fab button when timer state is STATE_DELETED.
parents 85e4dd06 005e8af3
Loading
Loading
Loading
Loading
+6 −0
Original line number Diff line number Diff line
@@ -364,6 +364,9 @@ public class TimerFragment extends DeskClockFragment implements OnSharedPreferen
                break;
            case TimerObj.STATE_STOPPED:
            case TimerObj.STATE_RESTART:
            // It is possible for a Timer from an older version of Clock to be in STATE_DELETED and
            // still exist in the list
            case TimerObj.STATE_DELETED:
                mFab.setVisibility(View.VISIBLE);
                mFab.setContentDescription(r.getString(R.string.timer_start));
                mFab.setImageResource(R.drawable.ic_fab_play);
@@ -477,6 +480,9 @@ public class TimerFragment extends DeskClockFragment implements OnSharedPreferen
                    break;
                case TimerObj.STATE_STOPPED:
                case TimerObj.STATE_RESTART:
                // It is possible for a Timer from an older version of Clock to be in STATE_DELETED and
                // still exist in the list
                case TimerObj.STATE_DELETED:
                    // Reset the remaining time and continue timer
                    t.setState(TimerObj.STATE_RUNNING);
                    t.mStartTime = Utils.getTimeNow() - (t.mOriginalLength - t.mTimeLeft);