summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'goog/ub-deskclock-dazzle_nyc' into masterJustin Klaassen2016-02-22509-23442/+18225
* Import translations. DO NOT MERGEGeoff Mendal2016-02-222-22/+22
* resolve merge conflicts of 2c535e2792 to nyc-dev-plus-aospJustin Klaassen2016-02-200-0/+0
|\
| * resolve merge conflicts of 2c535e2792 to nyc-dev-plus-aospJustin Klaassen2016-02-19509-23421/+18204
| |\
| | * Merge remote-tracking branch 'goog/ub-deskclock-dazzle_nyc' into nyc-devJustin Klaassen2016-02-19509-23422/+18207
| | |\
| | | * Add android.support.design proguard flagsJustin Klaassen2016-02-191-0/+2
| | | * Do not assume current stopwatch lap has positive durationJames Lemieux2016-02-172-16/+15
| | | |\
| | | | * Do not assume current stopwatch lap has positive durationJames Lemieux2016-02-122-16/+15
| | | * | Use ACTION_LOCKED_BOOT_COMPLETED on API 24+ - DO NOT MERGEJustin Klaassen2016-02-171-8/+10
| | | * | Teach DeskClock about file-based encryption. - DO NOT MERGEJeff Sharkey2016-02-165-20/+71
| | | * | Refactoring SharedPreferences to common location. - DO NOT MERGEJustin Klaassen2016-02-1613-21/+33
| | | * | Use AppCompat's imageButtonStyle attribute - DO NOT MERGEJustin Klaassen2016-02-161-2/+2
| | | * | Use SimpleItemAnimator - DO NOT MERGEJustin Klaassen2016-02-161-2/+3
| | | * | Bump version to 4.5.0 - DO NOT MERGEJustin Klaassen2016-02-162-47/+2
| | | |/
| | | * Avoid IndexOutOfBounds when deleting timer - DO NOT MERGEJames Lemieux2016-02-041-1/+1
* | | | Add android.support.design proguard flags am: 581aa2ea14 am: 071dd0b525Justin Klaassen2016-02-191-0/+2
|\| | |
| * | | Add android.support.design proguard flags am: 581aa2ea14Justin Klaassen2016-02-191-0/+2
| |\ \ \
| | * \ \ Add android.support.design proguard flagsJustin Klaassen2016-02-191-0/+2
| | |\ \ \
| | | * | | Add android.support.design proguard flagsJustin Klaassen2016-02-181-0/+2
* | | | | | Bump version to 4.3.0 - DO NOT MERGE am: 051b5c241b -s ours am: 852ceec9ca ...Justin Klaassen2016-02-190-0/+0
|\| | | | |
| * | | | | Bump version to 4.3.0 - DO NOT MERGE am: 051b5c241b -s oursJustin Klaassen2016-02-190-0/+0
| |\| | | |
| | * | | | Bump version to 4.3.0 - DO NOT MERGEJustin Klaassen2016-02-190-0/+0
| | |\| | |
| | | * | | Bump version to 4.3.0 - DO NOT MERGEJustin Klaassen2016-02-181-1/+1
* | | | | | Use AppCompat\'s imageButtonStyle attribute am: 3003b28b22 am: e0e7795d09 -s...Justin Klaassen2016-02-190-0/+0
|\| | | | |
| * | | | | Use AppCompat\'s imageButtonStyle attribute am: 3003b28b22Justin Klaassen2016-02-190-0/+0
| |\| | | |
| | * | | | Use AppCompat\'s imageButtonStyle attributeJustin Klaassen2016-02-191-2/+2
| | |\| | |
| | | * | | Use AppCompat's imageButtonStyle attributeJustin Klaassen2016-02-181-2/+2
* | | | | | Use SimpleItemAnimator am: 5f21995a89 am: 425848307b -s oursJustin Klaassen2016-02-190-0/+0
|\| | | | |
| * | | | | Use SimpleItemAnimator am: 5f21995a89Justin Klaassen2016-02-190-0/+0
| |\| | | |
| | * | | | Use SimpleItemAnimatorJustin Klaassen2016-02-191-2/+3
| | |\| | |
| | | * | | Use SimpleItemAnimatorJustin Klaassen2016-02-181-2/+3
* | | | | | Merge commit \'b790e6bad6a260def5872dcbf5cd9f2631f0e2cc\' into manual_merge_b...Justin Klaassen2016-02-190-0/+0
|\| | | | |
| * | | | | Merge commit \'b790e6bad6a260def5872dcbf5cd9f2631f0e2cc\' into manual_merge_b...Justin Klaassen2016-02-190-0/+0
| |\| | | |
| | * | | | Merge commit 'b790e6bad6a260def5872dcbf5cd9f2631f0e2cc' into manual_merge_b79...Justin Klaassen2016-02-18353-16540/+10304
| | |\| | |
| | | * | | Merge remote-tracking branch 'goog/ub-deskclock-dazzle' into masterJustin Klaassen2016-02-18353-19009/+13727
| | | |\ \ \ | | | | | |/ | | | | |/|
| | | | * | Fix snooze event trackingJames Lemieux2016-01-211-1/+1
| | | | * | Rebuild notifications after app upgradeJames Lemieux2016-01-202-0/+16
| | | | * | Fire timers as scheduled after app upgradeJames Lemieux2016-01-202-0/+51
| | | | * | Create AlarmObserverPreL in onCreateJustin Klaassen2016-01-201-12/+13
| | | | * | Handle deleted timers gracefullyJames Lemieux2016-01-192-9/+14
| | | | * | Fix alarm not firing in memory-pressure situationsJames Lemieux2016-01-146-59/+57
| | | | * | Promote TimerService to the foreground while expired timers existJames Lemieux2016-01-113-66/+98
| | | | * | Match firing alarms for SEARCH_MODE == alarm.nextJustin Klaassen2015-12-171-1/+15
| | | | * | Merge "Fix alarm icon cut off in 1x4 digital widget on nexus 5" into ub-deskc...Dylan Phan2015-12-151-1/+1
| | | | |\ \
| | | | | * | Fix alarm icon cut off in 1x4 digital widget on nexus 5Dylan Phan2015-12-151-1/+1
| | | | * | | Import translations. DO NOT MERGEGeoff Mendal2015-12-141-2/+2
| | | | * | | Merge "Attempt to avoid early death of AlarmService" into ub-deskclock-dazzleJames Lemieux2015-12-102-19/+19
| | | | |\ \ \
| | | | | * | | Attempt to avoid early death of AlarmServiceJames Lemieux2015-12-092-19/+19
| | | | * | | | Import translations. DO NOT MERGEGeoff Mendal2015-12-091-1/+1
| | | | |/ / /
| | | | * | | Pausing an expired timer should reset itJames Lemieux2015-12-082-4/+6