History log of /packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
Revision Date Author Comments (<<< Hide modified files) (Show modified files >>>)
b30ec39dcb5d4fb392d4090c346e0f8c57c995de 10-Oct-2013 Isaac Katzenelson <isaackatz@google.com> Make sure TimerReceiver gets intents on time

Bug: 11122055
Change-Id: I6c061646a8f111c0e67ee9b296b4149965a9634d
(cherry picked from commit 7ec0bb65037767fc39c9d737380a900c8fca7173)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
d5202b46aaf96b1d217cedba645f28aa1fee04c6 27-Nov-2012 Robyn Coultas <coultasr@android.com> Adding Timer times-up notification

Bug: 7498098
Bug: 7564768

Complies with Section K of wireframes with the agreed exceptions:
(1) Show "Done" instead of "Stop" when timer is delete after use
(2) Clicking on stop does not launch DeskClock
Features to QA:
- Updating label, updates notification
- Selecting +1m when desk clock not running updates the in-use notification
- Times-up notifications appear if and only if the Timer Buzzing Activity is not shown
- Selecting +1m or Stop(or Done) updates the desk clock timer tab

Change-Id: Ia27f86ad6ba1a3bdba50403a6fdb86208f911637
(cherry picked from commit e332c5744e5741a6149afd226e1f193111dcb7de)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
148c8e33b6ad80f51163d06786628a0e303b3a40 07-Sep-2013 Sam Blitzstein <sblitz@google.com> Fix timer gridview animations.

Bug: 10516184
Change-Id: I75fe04af25281179a11c7118ab844b23d5bec3bb
(cherry picked from commit 1aa24a276dd7aa4f92f6e443bcd8279cf70d14a8)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
f772f7438f4a98ddde6eaf49d73d551e46425d93 30-Aug-2013 Sam Blitzstein <sblitz@google.com> Use Keep's StaggeredGridView for timers.

Also update header and background layouts.

Bug: 10516184
Change-Id: Ibe73ce965acb11796c21e9df4b35e6bb830aabb3
(cherry picked from commit 4c68a4b737d7776fd23e857eb612f89c6dba3ec0)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
f9540358dacec5e6f8e2004e9fe3791107ee3f3c 04-Sep-2013 Isaac Katzenelson <isaackatz@google.com> Reset timer setup after adding a timer

Bug: 10610622
Change-Id: Ia13947d3ddb034106fa87e5e4be625755f93190c
(cherry picked from commit 4473c43d00cede0fb7a0d6b9836c84a7d39e23f3)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
b2e25c2811320be6f719d3dfe9931cdc06212759 29-Aug-2013 Isaac Katzenelson <isaackatz@google.com> Disable +1m button when cannot add a minute

Bug: 10152084
Added a disabled asset.
Disable +1m button is the timer is less than 60 seconds below the max

Change-Id: Ib6dc57ffddf267b5bd8bac7d45e3b1b2af2695ea
(cherry picked from commit 74be96baee671f1f62b4ed543ba793336012ef24)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
bee91a36b8cb7195b3d92f52c68654d947f3e17f 28-Aug-2013 Isaac Katzenelson <isaackatz@google.com> Fix delete after use implementation for timers

Bug: 10517026
Change-Id: I35f450dcfa379df92dbdfd997a351056e9233f41
(cherry picked from commit e7c4dc56335d2c0f56b7c3373f8b648b8c1afcba)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
504ed1aa7d11c7667d089af4bccbf18b255b36d5 28-Aug-2013 Isaac Katzenelson <isaackatz@google.com> Stop ringtone after timer deletion

Bug: 10451666
Change-Id: I4a53958aafa46e87ba0471d5d9090f7afe16f6fe
(cherry picked from commit d62917cb297b0d6d918bf997da96b002a8c21f1b)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
ebfe81b30c57972557d262bcd12622e0513a0d11 27-Aug-2013 Robyn Coultas <coultasr@android.com> Pre-redline changes for adding a timer

Removed unused time picker code for alarms.

Change-Id: Id61ab416a51db044de7ac29a3263f0db51d73083
(cherry picked from commit 56be6dac87bd9735cef70da1b39ce8c9d89148f0)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
04d0eaaf489d08c56104d9b71d0d2edecb4e27a5 27-Aug-2013 Isaac Katzenelson <isaackatz@google.com> Add support for SET_TIMER api

Bug: 7497400, 8131590
Fixes alarm not created when using the API with SKIP_UI is false

Change-Id: If401c88d2d4945a1d5b85b421f7c52a329b63c49
(cherry picked from commit 91ffb2a0726a56213c0649c864a56bf120896e80)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
de58829c88927b4eb9c7b483da7f0394c538a071 23-Aug-2013 Robyn Coultas <coultasr@android.com> Preparation for animations if Timer and Stopwatch

Converted CircleButtonsLinearLayout to FrameLayout and renamed
CircleTimerView: always draw circle in view center
CountingTimerView: remeasure text size if view's size changed
StopwatchFragment: some lint cleanup
in the layouts:
remove unneeded layout id and attributes
remove unneeded layout layer in timer_list_item
remove unneeded landscape timer_list_item

Change-Id: Id67e1120c86679c03b55f5b6d714cac233d37842
(cherry picked from commit c9524f8b8216c7854de4c69c44c9bb63e4097a18)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
3bc02950da8c14ec04199043f41a9ffc13290c8d 12-Aug-2013 Sam Blitzstein <sblitz@google.com> Move alarm to its own tab.

Also animate alarm expansion.

Change-Id: Icdebc6a18f34cfe55af70491d07dde4b1dc675c5
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
a0bd6355c8f9f7f3009315661d219c231622044d 04-Aug-2013 Robyn Coultas <coultasr@android.com> timer cleanup

This change ensures the buttons are visible at the right times and
overloads return values from BaseAdapter to simplify the code.
(This cleanup was once part of c/255295 which was abandonded.)

Change-Id: Ic35e70d4045e28c74f30e156975151fde5c57a9f
(cherry picked from commit e55413e93d36454df7dd1de3380083244d7a8675)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
b1cb5141f896726c16e2ca7c2a0c9f564f9b07ba 07-Aug-2013 Sam Blitzstein <sblitz@google.com> Send the delete timer broadcast immediately after deleting

Instead of delaying until after the animation, because if the activity
is null when the animation is done we can't as easily have a context
available to send the broadcast.

Bug: 9313826
Change-Id: I659dd7dd89779c7ee15e291e9537187dc2dbe411
(cherry picked from commit cd8877e6bf6a1381ff7eb7c96b300cd686dd5a6c)
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
e20035484e5a0425c5fd2ee2ad57a0eab64d96cb 10-May-2013 Isaac Katzenelson <isaackatz@google.com> Hide fragements onPause

Bug: 8838745
Hide fragment's view in onPause to prevent showing stale time in onResume

Change-Id: I7f15fcc38a54ca0a8f48657ceeb2a54217157cc9
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
1e685e5c5b60069e08b685954d0d8de5bfbb7734 14-Feb-2013 Isaac Katzenelson <isaack@android.com> Add header to TimersList for expired timers

Bug: 7564639

Transparent header in TimersList is now always added.

Change-Id: Ia18afd737aca83ea18320eb2c474335c728c7135
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
7a361eeb75d2b0760d19cbf20e5978ca0bbdede5 12-Feb-2013 Isaac Katzenelson <isaack@android.com> Prevent race condition when clearing timers

Bug: 8181803
Change-Id: Iab8b471b70f5fa91fd857ea7a83d4249ff015c0f
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
e41a1a5c11e75f36c5f1d1ec7e7cc332e2ec7836 04-Oct-2012 Robyn Coultas <coultasr@android.com> Timers: Sort order and auto-scrolling behavior

Bug: 7248981
Change-Id: Ie706df490d146c284213962cfde55388726ebf37
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
3df1d0eeadfc6a4e95514e10203a3b776c934c8d 25-Oct-2012 Itzhak Katzenelson <isaack@android.com> Fix NPE crash on timer deletion

Bug: 7406765
Change-Id: I4c03238942b3c3b3ed00d42621ae54d6bc8046ef
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
2bf39f770633f87dd5cd669b0a373298956fd6d6 23-Oct-2012 Isaac Katzenelson <isaack@android.com> Timers animations

Bug: 7336925, 7309608
Change-Id: If2891d59287e24cf8c643deaacfd1270a2df4e63
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
7bcc2d8ce2951a8f5451e93a5192b7ae04564de0 18-Oct-2012 Sam Blitzstein <sblitz@google.com> Replace lights out mode with screensaver.

Removed the lights out code.
Added in explicit screensaver mode.
Also fixed bug related to timer labels on device rotation.

Bug: 7328141
Bug: 7339168
Change-Id: I7df3567888ee04ad9a335c34d51384bfaf24e6b3
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
feabb7a335fb8c7644783d2dca53b864009054d8 12-Oct-2012 Robyn Coultas <coultasr@android.com> Show TimerAlertFullScreen upon any timer expiry

Bug: 7333666
Change-Id: If4f3583e4963d75a88ba8a4967475dbde76a7868
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
eb4781af67d44098d12d64ae474e431572702d37 16-Oct-2012 Sam Blitzstein <sblitz@google.com> Fixed bugs for time pickers.

Start button is disabled when no time is entered.
Delete button is disabled when no time is entered.
Long press delete button clears input.

Bug: 7251629
Bug: 7224907
Change-Id: I4f2be2f7b93e6c582dd997e12fe1ee63e69021a2
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
74aeadcbea52d36dab5c6be214dba67200393853 16-Oct-2012 Robyn Coultas <coultasr@android.com> Fix NPE when stopping off-screen times-up timers

Bug: 7352792
Change-Id: I802681b268cef027e183587482d5366c5c212ddc
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
a65d3eb00d543735305221f86ce630c8650e65e2 15-Oct-2012 Isaac Katzenelson <isaack@android.com> Change timers to use system clock

Bug: 7344200
Change-Id: I10e09828b720a0101afc76391faf3357987684f8
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
0f6e3350fed144e3909ba4e45f3006f042c0187c 11-Oct-2012 Sam Blitzstein <sblitz@google.com> Adding ability to label timers.

Bug: 7203259
Bug: 7324818
Change-Id: I482f4500bfab29ec0ace9b661d72e79473c40f25
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
15fe965a481e7be1d8cb5f73dd67fd936568a994 11-Oct-2012 Sam Blitzstein <sblitz@google.com> Fixed start/stop button bugs.

Prevented start/stop from turning grey if you exited the tab.
Changed start to hidden after stopping an expired timer.

Bug: 7324542
Bug: 7319174
Change-Id: I850fc57d5ec0e6f20be7c31f7146129ca819e382
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
243e97b48679beee97c04890605e0b2722a855f8 11-Oct-2012 Robyn Coultas <coultasr@android.com> No light's out for full-screen Timer activity

Bug: 7324818
Change-Id: I759b06486f3b51ce45653accc13f60a7b182cb7e
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
357497c341662c56945e22e458852f52a977efdf 09-Oct-2012 Sam Blitzstein <sblitz@google.com> Implemented lights out and dimming.

Bug: 7234512
Change-Id: I808d992bc58febc0d13d32e95531b6211d598792
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
da56b596b065fdfc4e74ff2c34ec26263a2ea76d 05-Oct-2012 Robyn Coultas <coultasr@android.com> Preserve TimerFragment state

Bug: 7248640
Change-Id: Ia0ec910f87910c351cbf1accd0a14fbd81f81033
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
386d8b05069c95899149c4b18542fc18c3761314 05-Oct-2012 Sam Blitzstein <sblitz@google.com> Moving buttons for timer and stopwatch to the circle.

Also:
Ifa31068794c1bd94dfe2cf0d9234a80082375617
Fixed merge and usability problem in red-line.

Bug: 7257616
Bug: 7238147
Bug: 7238185
Bug: 7271163
Change-Id: I0ec99a83ba5bdefbd175361829fd96e48c1d5a32
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
ca667955d68458729481d50881ca2925838c86ef 06-Oct-2012 Isaac Katzenelson <isaack@android.com> Layout fixes

Bug: 7265721
Change-Id: I3891bae699c25e65f7217a071d07309056c4dafb
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
22ad7c9ea127b06ee0dc0cb809b59bab33afbf42 04-Oct-2012 Robyn Coultas <coultasr@android.com> Visual distinction for the five timer states

Bug: 7271163
Change-Id: I2c878efec0cb550b9e1c15a7949ff0eae0de7802
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
646258f02bdeb2f9436b8d844514fa8feca383dd 05-Oct-2012 Peter Ng <petergng@google.com> removing box press states and changing icon color instead

Bug: 7238185
Change-Id: I86d7ced51b080d085de3b04ea62ae2daf9303682
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
e40b31200dee36341e5697b2774799555ca79c9b 05-Oct-2012 Sara Ting <sarating@google.com> Make timer text into a virtual button that starts/stop timer.

Bug: 7238147
Change-Id: I2d68975c6e1d5001b662897787856e241646f010
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
fc5cce3453c5b6c08814b1c1ba85612399466c0b 05-Oct-2012 Isaac Katzenelson <isaack@android.com> Add analog clock to world clock

Bug: 7265721
Change-Id: Ia3807341deb1cb17e481fab4d0a3bf936e3a87f6
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
6b9508b70d9bb11590f96ef4ff6d5dfc703ac868 04-Oct-2012 Isaac Katzenelson <isaack@android.com> Move buttons to icons.

Bug: 7257710, 7238147

Converted all buttons to image buttons.
New layouts for timer to tie together the time display with the buttons

Change-Id: I0fbddd1050f98a1a2f1f542bef8cdfb80f005c23
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
64575cfee07cf0ec38f65a12055692f542e78e70 04-Oct-2012 Sam Blitzstein <sblitz@google.com> Several bug fixes for timer notification.

A buzzing timer notification wasn't getting removed when the timer was deleted, or when +1minute was hit.
Timer notification was overlapping with stopwatch notification.
Ongoing timer notification didn't disappear immediately when a timer went off.
Small typo in timer notification.

Bug: 7282162
Bug: 7274564
Change-Id: I3e9f992f23c0739ed356f738b182ea3d09590524
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
647353dd437f8c075aa96f3b98efb84442e8b7bf 30-Sep-2012 Robyn Coultas <coultasr@android.com> Adding full-screen timer alert activity.

Bug: 7230202
Change-Id: I3e9a0fcf21837a54703af386f8e69b93a789edfc
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
7d44b054055c9491570a58f14f2ae5b5e077c05a 01-Oct-2012 Sam Blitzstein <sblitz@google.com> Fix bugs pertaining to timer +1 button.

Bug: 7233619
Change-Id: Ib4181a5ef9724a9d86aff74f1b6ba3ba226cee79
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
644a5d887d7033e669ac362a8ed6e79197d13c72 02-Oct-2012 Itzhak Katzenelson <isaack@android.com> Fixed bugs to maintain timer state after quitting.

Bug: 7216816
Bug: 7233619
Change-Id: Ie2e4e06c60a8836e1a315f20c866595311b68a67
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
1ce69abc1f8bea2d7903f24ee32fec42cee83634 02-Oct-2012 Itzhak Katzenelson <isaack@android.com> Adding timer notifications.

Bug: 7255233
Change-Id: Id4d91a0e857d4553bd42a878a21c8a3e1bb9bf06
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
113e1daddd8cb0e890084aa4b6ea3194d8ad4826 26-Sep-2012 Sam Blitzstein <sblitz@google.com> Add notification for timer.

Change-Id: I22bec04942ab46fd7d446c2aaf27d29b07052df3
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
bed1a89f743ec8b343803a44b938aad97ba0f16e 25-Sep-2012 Isaac Katzenelson <isaack@android.com> New time picker

Change-Id: I805316cc11f6a8b3e4dd40f1368f386df536d612
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
9aa3876adbfe2bbe8f21b3db4222892b73fe8d27 24-Sep-2012 Isaac Katzenelson <isaack@android.com> Fix crash in .TimerFragment.setTimerButtons

Bug: 7193713
Change-Id: Ic444e2914cddf0108b4e5e6ea7d31eba68db3cc1
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
860de0e94f5588369985063127512dc2270cd7de 23-Sep-2012 Itzhak Katzenelson <isaack@android.com> Timer fixes

Bug: 7216059, 7203753, 7202843, 7195186, 7184324
Change-Id: I4e5532d13ec062a7c3ad55da929fbce6d9994327
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
fc177987092f72f84f0833f80600d4bbf20d0b87 22-Sep-2012 Isaac Katzenelson <isaack@android.com> Fixes to help menu button

Bug: 7198428
Change-Id: If19d83b9919dc7a4070a0b15f6f497513c1eecfe
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
a80f15ded8c0be8bf2268bc4cf7b0ce125b07d1b 20-Sep-2012 Isaac Katzenelson <isaack@android.com> landscape layouts

Change-Id: I672b70fb9aef1862e45e44dd8ed89778c687af98
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
a2fa90632f01c208f7aa5d4cc5bd4538003ef10e 21-Sep-2012 Isaac Katzenelson <isaack@android.com> Fix START/STOP button disappears when timer expire

Bug: 7203751
Change-Id: Iff41df2be53a9f3372593317eb2ac9c76a003096
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
a71a82dabd099d2ee16ce7cda6821ebf08db8b80 20-Sep-2012 Isaac Katzenelson <isaack@android.com> Fix crash in Timer fragment

Bug: 7193713
Change-Id: If7a5665d86126136207ed3904a08229a0e1960b7
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
69d0b27d5a3f7f80d5fadd687ce8bb69ea426999 20-Sep-2012 Isaac Katzenelson <isaack@android.com> Add cancel button to timer setup view

Change-Id: If681df09f3ba3e25b573f70a866bcd4a24c1f419
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
a4faa0547d888cb8bc94a903c36c5a1370ca23b2 18-Sep-2012 Isaac Katzenelson <isaack@android.com> Timer and stopwatch fixes

Change-Id: Ida3ac4ccfdad7972fb4b4555e8a3059f7999863d
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
871d7d00b561dc0e100c5ac7f79542d20ae9578d 17-Sep-2012 Isaac Katzenelson <isaack@android.com> Add alert ring when a timer expires.

Change-Id: Id98275d27640d0de7a06bfada63986c2d34afff7
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java
63211efa1565b5dc171938740ba183302d0e46f3 14-Sep-2012 Isaac Katzenelson <isaack@android.com> Merge clock to JB-MR1

Change-Id: Ic2b550adb16f593a037939b2d1a2d4f60f4c5a5d
/packages/apps/DeskClock/src/com/android/deskclock/timer/TimerFragment.java