commit 157b87432760b2f988990e7f68e39c51628193f3
author Sam Blitzstein <sblitz@google.com> Tue Jun 04 01:26:18 2013 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Jun 04 01:26:18 2013 +0000
tree 7ab87b30f5f39a6fe802af918d33c91a79465c21
parent f6017873e1056b0d9ec0932eb49af77f8ce8814c
parent b2d117c908066290ea8174bed39c9f101af20999

Merge "Prevent silent ringtone to be the default one." into jb-mr2-dev

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

diff --git a/src/com/android/deskclock/timer/TimerReceiver.java b/src/com/android/deskclock/timer/TimerReceiver.java
index b0c6a6d..70eda98 100644
--- a/src/com/android/deskclock/timer/TimerReceiver.java
+++ b/src/com/android/deskclock/timer/TimerReceiver.java
@@ -190,12 +190,13 @@
         long now = Utils.getTimeNow();
         if (timersInUse.size() == 1) {
             TimerObj timer = timersInUse.get(0);
+            boolean timerIsTicking = timer.isTicking();
             String label = timer.mLabel.equals("") ?
                     context.getString(R.string.timer_notification_label) : timer.mLabel;
-            title = timer.isTicking() ? label : context.getString(R.string.timer_stopped);
-            long timeLeft = timer.isTicking() ? timer.getTimesupTime() - now : timer.mTimeLeft;
+            title = timerIsTicking ? label : context.getString(R.string.timer_stopped);
+            long timeLeft = timerIsTicking ? timer.getTimesupTime() - now : timer.mTimeLeft;
             contentText = buildTimeRemaining(context, timeLeft);
-            if (timeLeft > 60) {
+            if (timerIsTicking && timeLeft > 60 * 1000) {
                 nextBroadcastTime = getBroadcastTime(now, timeLeft);
             }
         } else {
@@ -213,7 +214,7 @@
                 long timeLeft = completionTime - now;
                 contentText = String.format(context.getString(R.string.next_timer_notif),
                         buildTimeRemaining(context, timeLeft));
-                if (timeLeft <= 60) {
+                if (timeLeft <= 60 * 1000) {
                     TimerObj timerWithUpdate = getNextRunningTimer(timersInUse, true, now);
                     if (timerWithUpdate != null) {
                         completionTime = timerWithUpdate.getTimesupTime();