diff options
author | James Lemieux <jplemieux@google.com> | 2015-11-23 11:40:39 -0800 |
---|---|---|
committer | James Lemieux <jplemieux@google.com> | 2015-11-23 14:46:01 -0800 |
commit | bdcbdd7e5af5adb40948af3d1926b23dc06973bd (patch) | |
tree | 9dbd6e7b3f1d3c235f50b6ffeede3062d3425f63 /src/com/android/deskclock/timer/TimerSetupView.java | |
parent | dcc746ea793621b7d0bf4a3f3e66bd969e74fe64 (diff) |
Fix creation of first timer via voice
Bug: 25843144
Attempting to view a specific timer trumps the timer setup screen
in all cases. onResume() now enforces that policy. The timer setup
screen is still displayed in all other cases, including:
- no timers exist
- the intent indicates a new timer should be created
- the last visible timer screen was the timer setup screen
Change-Id: I28d147cadeb29055fa0c68a44da6648f6ad33238
Diffstat (limited to 'src/com/android/deskclock/timer/TimerSetupView.java')
-rw-r--r-- | src/com/android/deskclock/timer/TimerSetupView.java | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/src/com/android/deskclock/timer/TimerSetupView.java b/src/com/android/deskclock/timer/TimerSetupView.java index 150f49648..d85437924 100644 --- a/src/com/android/deskclock/timer/TimerSetupView.java +++ b/src/com/android/deskclock/timer/TimerSetupView.java @@ -201,7 +201,7 @@ public class TimerSetupView extends LinearLayout implements Button.OnClickListen } /** - * @return an opaque representation of the state of timer setup. + * @return an opaque representation of the state of timer setup */ public Serializable getState() { return Arrays.copyOf(mInput, mInput.length); |