summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importstable/cm-12.1-YOG4PAbhisek Devkota2016-06-13112-301/+7484
| | | | | Change-Id: I5b196688774e74606d3555cacd697adecd1e211a Ticket: RM-154
* res/values: Catch up with mainline on translation valuesJessica Wagantall2015-12-041-0/+41
| | | | | | RM-190 Change-Id: I559b8218cbe3db703470a60a760d9bfd91706f55
* Proguard causing RuntimeExceptionKeith Mok2015-10-281-0/+4
| | | | | | | | | | | This fixes: Parcel android.os.Parcel@3d522b0e: Unmarshalling unknown type code 7536751 at offset 808 LETTUCE-810 Change-Id: I0c735bf4c3d9e73af554f9c052a8e4a5e9dea095 (cherry picked from commit 3cc92a9e4edf8f28b6f0633b1be60d947b275741)
* Expose FAB elevation value for themes.Dave Kover2015-09-102-1/+22
| | | | | | | | | | FAB elevation value was hardcoded in layout. Expose to a value in cm_dimens. Ticket: CYNGNOS-971 Change-Id: I72685230a612987ccc60ca404d520220c52dac7c (cherry picked from commit a01047d4ecd19ddb78f74457ea310ff1a8122929)
* Automatic translation importTom Powell2015-08-213-27/+41
| | | | | Change-Id: I55e10809a7dae2a5abdb18d2f988aea46fe796ee CYNGNOS-264
* Automatic translation importTom Powell2015-08-211-0/+7
| | | | | Change-Id: Idf338474e7be68f681916111be9e875aa9f4edd6 CYNGNOS-264
* Automatic translation importTom Powell2015-08-211-0/+7
| | | | | Change-Id: I2a0fc8c9c5dbfc252a0a5f33588ab8080b4cc6f7 CYNGNOS-264
* Automatic translation importTom Powell2015-08-216-1/+43
| | | | | Change-Id: I95f60417386aa77eccfa10cbf4e5a70b7fc06ffc CYNGNOS-264
* Automatic translation importMichael Bestas2015-08-217-0/+43
| | | | | Change-Id: I1876833293a118afa510f1ef12bad11e19b0489c CYNGNOS-264
* Automatic translation importTom Powell2015-08-211-0/+6
| | | | | Change-Id: I4d27bb968d8e8ee5960e4fd1e1644538cd7ce501 CYNGNOS-264
* Automatic translation importTom Powell2015-08-218-1/+49
| | | | | Change-Id: I79850e2bf5f674579da8098a59d1be5f4ee49265 CYNGNOS-264
* Automatic translation importMichael Bestas2015-08-211-6/+6
| | | | | Change-Id: Ie93200d8beeb7c10554f709836ef8252fafeaa07 CYNGNOS-264
* Automatic translation importMichael Bestas2015-07-286-1/+135
| | | | | | CYNGNOS-264 Change-Id: I95035458579e4e8c5c660cd4fd7c899386939e24 (cherry picked from commit f68291df115b8b0fdc684f8400d5d6f7ffc80a8b)
* Automatic translation importMichael Bestas2015-07-281-0/+1
| | | | | | CYNGNOS-264 Change-Id: I684998b543687f3d45442b39390f113a5b1da5d2 (cherry picked from commit 036796577d34f871e51232bb850663f2e4b2e65c)
* Automatic translation importMichael Bestas2015-07-283-18/+19
| | | | | | CYNGNOS-264 Change-Id: I740a4583496364a30a4e1bc6e08ce700949aa255 (cherry picked from commit bc4da3823d386aeb12ddcc1f6b1e6de48f58b679)
* Automatic translation importMichael Bestas2015-07-284-2/+11
| | | | | | CYNGNOS-264 Change-Id: I5cc557a2b874bdf8d12b39246cb5fd7e1b79c3e2 (cherry picked from commit 9c89be4dc4a60431e389456fb3d4a09b6362d422)
* Automatic translation importMichael Bestas2015-07-281-0/+31
| | | | | | CYNGNOS-264 Change-Id: Ie5e5895b6de1d07c6b30017389f95ebaa14e2b61 (cherry picked from commit 3fec8254cb0490bf63a2a5bab48c035d10abbd86)
* Fix rescheduling of alarms that are snoozedd34d2015-07-272-1/+6
| | | | | | | | | | | | | | | | | | | | | | When AlarmInitReceiver recieves android.intent.action.TIME_SET, a call is made to AlarmStateManager.fixAlarmInstances() which will update all alarm instances based on the newly set time. This updates the AlarmInstance based on the Alarm time and not the current time for the given AlarmInstance. This causes snoozed alarms to be scheduled the next time the Alarm is suppose to fire off, if the alarm a repeating alarm. This patch fixes this behavior by passing in a Calendar instance based on the AlarmInstance's time. Steps to repro: 1) Set an alarm for 1 minute from current time 2) Snooze alarm when it goes off 3) Go to Settings -> Date & Time and set the time to 2 minutes ahead 4) The snoozed alarm should be rescheduled to the next day the alarm would fire. Change-Id: Id7e2d5c7b5d2b9d3b92eb51a2e14d70639d56761 (cherry picked from commit d815eef9d102140ff3b0320ea89a4d5cf6e3d9cf) Issue-Id: CYNGNOS-420
* Allow theming numpadYadrishnikov Yaroslav2015-07-222-1/+6
| | | | | Ticket: CYNGNOS-499 Change-Id: I8932f5f163b3dbe53d89116ccb877fdff093c2d4
* DeskClock: fix behavior with alarms when device is offRaj Yengisetty2015-06-172-3/+51
| | | | | | | | | | | | | The current behavior causes an NPE and prevents the alarm from firing. Determine if this a boot alarm and if the alarm needs to be fired immediately. If not, proceed with normal alarm handling. Also, adding some checks to prevent NPEs and FCs when handling an intent without data() and querying for an AlarmInstance with an invalid id. Change-Id: I0d5ee998c43207905875a0272fe70596a3877587
* Automatic translation importMichael Bestas2015-06-131-0/+60
| | | | Change-Id: I4ab7317b35241d01a41db4bc05c7afd72be300e7
* DeskClock: Correctly reschedule alarms on system time changeAnnie Chin2015-06-092-13/+20
| | | | | | | | | | | | | | | | | | Reported issue: AlarmManager would not properly reschedule repeat alarm if the user manually adjusted date/time to before the next scheduled instance of the alarm. Steps to repro issue: 1.Set an alarm for 18:00 when system time is 19:00. 2.Modify the system time to 17:50 3.Note that alarm does not fire at 18:00 Thanks to Guotao Deng for identification and initial fix. Based on this patch, and adapted for CM: https://android-review.googlesource.com/#/c/147815/ Change-Id: Ifa7b85ab93583afaf4a248e13d726997b68822ed
* Automatic translation importMichael Bestas2015-06-093-0/+27
| | | | Change-Id: I622b599a71d245d1d3d712e1e01f0daf0fb4b00a
* Automatic translation importMichael Bestas2015-05-313-1/+4
| | | | Change-Id: I7461823ccafdfa99468a3b364840ccf15a5a01e3
* Automatic translation importMichael Bestas2015-05-2412-14/+40
| | | | Change-Id: I716d3168a0f1c5094899d2f143cea49e28f8e437
* Automatic translation importMichael Bestas2015-05-1628-58/+103
| | | | Change-Id: Ia4d54fa8d110473b839d2b0725a2b59569856609
* Expose background colors for theming.Dave Kover2015-05-089-18/+100
| | | | | | | | The background colors are currently defined as a hard coded array in Utils.java. This patch moves this array to cm_arrays.xml and exposes the colors of the array in cm_colors.xml for theming Change-Id: Id72867ee82edd28bc120223be96c34448d79f1ae
* Automatic translation importMichael Bestas2015-05-021-0/+58
| | | | Change-Id: Ie08388de6681960f659eac36e9d121f0d9a7050f
* Make new menu entry to link to cLock widget settings.Martin Brabham2015-04-243-0/+23
| | | | Change-Id: I13ca3156c34eccdd8f60d8585281ae0585aac58e
* TimerReceiver: Correctly show the remaining time for 100 hoursDiogo Ferreira2015-04-201-3/+0
| | | | | | | | | | | | | | If you open the Clock countdown time and input 99h99m99s it will actually translate to 100 hours, 40 minutes and 39 seconds as expected. When leaving the app it will show a notification with the remaining time and if there are more than 100 hours it will fail to show that part and only show "40 minutes remaining". This patch fixes allows for 100 as a valid input. Change-Id: Ib3621691aaa3a449262cb9e3601d39283bb808f8
* Automatic translation importMichael Bestas2015-04-175-24/+43
| | | | Change-Id: Ic759c91e323fb7aca533d3146ad663c3c6c7c59f
* Hide flip setting if the phone doesn't have the required hardware sensor.Martin Brabham2015-04-162-6/+36
| | | | | | | (╯°□°)╯ sʞɔolɔ Change-Id: Iba38e37bffe91d0d5bd9bb8922b4c168386ebfd9 (cherry picked from commit 106cfa2bca37303a93e1826c04d88783aa15b52d)
* Automatic translation importMichael Bestas2015-04-171-6/+6
| | | | Change-Id: I61edf4f84b6955e0622923d25e3a793461da8bba
* Automatic translation importMichael Bestas2015-04-173-1/+117
| | | | Change-Id: I2aa7ca953980f1983cbcb65a53dba4d03ee3cb70
* Automatic translation importMichael Bestas2015-04-172-0/+95
| | | | Change-Id: I213fee9f3009771a35b5a48c3ea4037b167b07df
* DeskClock: re-write delayAlarm for intercepting alarms when in-callRaj Yengisetty2015-04-083-75/+153
| | | | | | | | While the previous clean-up was necessary, it no longer meets the spec. This feature needs to trigger the alarm immediately after the call finishes. Change-Id: I71107277926c891f79b1e46fb27878994ac15ce0 (cherry picked from commit 544c5e8365499611d627d84ebc6b899f1860811b)
* deskclock: Fix missing importstaging/cm-12.1Steve Kondik2015-03-221-0/+1
| | | | Change-Id: Ib13bfd8be5415cc4e5566d37de53998407875589
* Merge tag 'android-5.1.0_r1' into merge-5.1Tom Marshall2015-03-12268-974/+1803
|\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Android 5.1.0 release 1 Conflicts: res/layout/stopwatch_notif_collapsed.xml res/layout/stopwatch_notif_expanded.xml res/values-en-rIN/array.xml res/values-zh-rCN/array.xml res/values/array.xml src/com/android/deskclock/AlarmClockFragment.java src/com/android/deskclock/SettingsActivity.java src/com/android/deskclock/worldclock/CitiesActivity.java Change-Id: Ic861c90216b82290378be7072d6be760ef5be372
| * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2015-01-120-0/+0
| |\
| | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-220-0/+0
| | |\
| | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-110-0/+0
| | | |\
| | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-12-040-0/+0
| | | | |\
| | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-270-0/+0
| | | | | |\
| | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-240-0/+0
| | | | | | |\
| | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-200-0/+0
| | | | | | | |\
| | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-190-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-180-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-170-0/+0
| | | | | | | | | | |\
| | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-100-0/+0
| | | | | | | | | | | |\
| | | | | | | | | | | | * merge in lmp-mr1-release history after reset to lmp-mr1-devThe Android Automerger2014-11-090-0/+0
| | | | | | | | | | | | |\