Merge "Stop ringtone after timer deletion" into ics-ub-clock-amazon (579b01c9) · Commits · e / os / android_packages_apps_DeskClock

src/com/android/deskclock/timer/TimerFragment.java

+3 −3

Original line number	Diff line number	Diff line
		@@ -736,6 +736,7 @@ public class TimerFragment extends DeskClockFragment
		// Tell receiver the timer was deleted.
		// It will stop all activity related to the
		// timer
		t.mState = TimerObj.STATE_DELETED;
		updateTimersState(t, Timers.DELETE_TIMER);
		break;
		case ClickAction.ACTION_PLUS_ONE:
		@@ -818,6 +819,7 @@ public class TimerFragment extends DeskClockFragment
		// Tell receiver the timer was deleted.
		// It will stop all activity related to the
		// timer
		t.mState = TimerObj.STATE_DELETED;
		updateTimersState(t, Timers.DELETE_TIMER);
		}
		break;
		@@ -966,9 +968,7 @@ public class TimerFragment extends DeskClockFragment
		}

		private void updateTimersState(TimerObj t, String action) {
		if (!Timers.DELETE_TIMER.equals(action)) {
		t.writeToSharedPref(mPrefs);
		}
		Intent i = new Intent();
		i.setAction(action);
		i.putExtra(Timers.TIMER_INTENT_EXTRA, t.mTimerId);

+1 −0

Original line number	Diff line number	Diff line
		@@ -52,6 +52,7 @@ public class TimerObj implements Parcelable {
		public static final int STATE_TIMESUP = 3;
		public static final int STATE_DONE = 4;
		public static final int STATE_RESTART = 5;
		public static final int STATE_DELETED = 6;

		private static final String PREF_TIMER_ID = "timer_id_";
		private static final String PREF_START_TIME = "timer_start_time_";