summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge tag 'LA.UM.5.5.r1-00900-8x96.0' of ↵cm-14.0Steve Kondik2016-10-172-1/+30
|\ | | | | | | | | | | git://codeaurora.org/platform/packages/apps/DeskClock into cm-14.0 "LA.UM.5.5.r1-00900-8x96.0"
| * Merge 34f9de6c71ea9956a1336238522179de1cd0bd19 on remote branchLinux Build Service Account2016-10-102-1/+30
| |\ | | | | | | | | | Change-Id: Ia65d5836fd1bb5d065c0c5bc5af9516ec1c71ce3
| | * Promotion of android_ui.lnx.2.1-00016.Linux Build Service Account2016-10-011-0/+29
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 1062713 I7594d0e18eaeedf1c569f65b49aef961ca359e3e DeskClock: Fix Force close caused by IllegalStateExcepti Change-Id: I8363c4f4f29ad145d556806fec78ce94bf071d33 CRs-Fixed: 1062713
| | | * Merge "DeskClock: Fix Force close caused by IllegalStateException error."Linux Build Service Account2016-09-281-0/+29
| | | |\
| | | | * DeskClock: Fix Force close caused by IllegalStateException error.hoffc2016-09-261-0/+29
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The content of the mCityAdapter has changed but ListView did not receive a notification, which results in app force close. So here to make sure mCityAdapter calls NotifyDataSetChanged when its content changes. Change-Id: I7594d0e18eaeedf1c569f65b49aef961ca359e3e CRs-Fixed: 1062713
| | * | | Promotion of android_ui.lnx.2.1-00011.Linux Build Service Account2016-09-231-1/+1
| | |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 1063863 I48527bdb7ca1ffbe4d95e3234e948d5e3d1e4940 Remove alarm boot check when alarm time is after current Change-Id: I9335cadddf266873fe26da1fc3ff1851dc56c550 CRs-Fixed: 1063863
| | | * | Remove alarm boot check when alarm time is after current timeMao Jinlong2016-09-201-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | If there are two alarms, one is snoozed alarm and the other is going to fire. When boot-complete, these two alarms will be registered again. One of them will be set as power off alarm to fire. And the other one will be kept as original state. And once the firing one is snoozed or dismissed, the other one will be set as next power off alarm. But its time is missed, the power off alarm will be disabled. And it is not necessary to add alarm boot check here because power off alarm instance will be set to fired state after setting to missed state in current design. Change-Id: I48527bdb7ca1ffbe4d95e3234e948d5e3d1e4940 CRs-Fixed: 1063863
* | | | | Make new menu entry to link to cLock widget settings.Martin Brabham2016-10-164-2/+110
|/ / / / | | | | | | | | | | | | | | | | | | | | * slightly modified for N Change-Id: I13ca3156c34eccdd8f60d8585281ae0585aac58e
* | | | Merge 335a32dcc3227bd5aa7a92a35e0a8a12be9d3a59 on remote branchLinux Build Service Account2016-09-223-3/+34
|\| | | | | | | | | | | | | | | Change-Id: I7d611b413166cf68650d5b7f773d26b2e0803039
| * | | Promotion of android_ui.lnx.2.1-00009.Linux Build Service Account2016-09-182-2/+30
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 1063853 I18325e04432c0172dee4541b073067bc75d744a2 Start alarm when boot is complete Change-Id: I492c282f0fab5311eb89663ac44fb45b5aaa9a54 CRs-Fixed: 1063853
| | * | Start alarm when boot is completeMao Jinlong2016-09-132-2/+30
| | |/ | | | | | | | | | | | | | | | | | | | | | | | | There are some resources for power off alarm that will be ready only after system is boot completed. So start alarm when boot is complete. CRs-Fixed: 1063853 Change-Id: I18325e04432c0172dee4541b073067bc75d744a2
| * / Promotion of android_ui.lnx.2.1-00006.Linux Build Service Account2016-09-091-1/+4
|/| | | |/ | | | | | | | | | | | | | | CRs Change ID Subject -------------------------------------------------------------------------------------------------------------- 1045044 Ib008b8e92f894146572fb666aab361d10c27ef92 DeskClock: Fix Clock style Analog doesn't work in Daydre Change-Id: I7a30711283951f497caa2796997c3a1435e02a3c CRs-Fixed: 1045044
| * DeskClock: Fix Clock style Analog doesn't work in Daydream settings.pezhan2016-09-071-1/+4
|/ | | | | | | | | | | | After start screen saver and enter Dream setting again, the default preference xml file was moved (moveSharedPreferencesFrom()), the preference fragment will create a new default xml file, the default Style is still digital,while actual has be change to Analog. setStorageDeviceProtected for PreferenceFragment. Change-Id: Ib008b8e92f894146572fb666aab361d10c27ef92 CRs-Fixed: 1045044
* Take persistable uri permission for document providerstaging/cm-14.0-cafMao Jinlong2016-08-243-2/+75
| | | | | | | | | | | | | | ACTION_GET_CONTENT is to simply read/import data.ACTION_OPEN_DOCUMENT is to have long term, persistent access to documents owned by a document provider. When user select music as alarm ringtone from external storage, the music file is possible to be a document provider file. DeskClock will lose access to document provider file after reboot. DeskClock need long term, persistent access to documents owned by document provider. So Take persistable uri permission for document provider. Change-Id: I110873d4c49eed34d9cabc8bd457e12eba9ced1f CRs-Fixed: 1046238
* DeskClock: Fix the issue of auto silence setting do not take effect.hoffc2016-08-241-1/+1
| | | | | | | | Enter clock setting activity, change the value of "silence after", and then add a new alarm, the alarm do not auto silence after the given time. Change-Id: I93fbc0424ad3fb094868e886768f5e66b0fcb641 CRs-Fixed: 1052745
* DeskClock: Fix the issue of duplicate city&timezone pair.hoffc2016-08-243-15/+19
| | | | | | | | World clock can select the same city&timezone pair multiple times,which results in duplicate records in cities list. Change-Id: Idf97e85061b61548a026698bf73269477c3efdc9 CRs-Fixed: 1046190
* Clock: Customize Alarm Snooze Duration for carrierFang Yunong2016-08-242-1/+3
| | | | | | | Sets the default value for the Alarm Snooze Duration. Change-Id: I9834028d17ab0e196076ade31d6982c25ba0a979 CRs-Fixed: 1043367
* DeskClock: Set Ringtone fail switching between Landscape and Portraithoffc2016-08-241-0/+3
| | | | | | | Set Ringtone fail switching between Landscape and Portrait. Change-Id: I94fb81c9104e84b00a7fcf3d798a3914b7736d26 CRs-Fixed: 1043304
* Alarm: Use dedicated alarm type for poweroff alarm.Mao Jinlong2016-08-246-3/+182
| | | | | | | | | | | | | RTC_POWEROFF_WAKEUP is a new alarm type introduced by framework to perform poweroff alarm. The time (RTC_WAKEUP) set to framework is not the same as the alarm time set in deskclock. In this case the RTC register might not be correctly set. So both RTC_WAKEUP and RTC_POWEROFF_WAKEUP types need to be set at the same time: RTC_WAKEUP type will handle the normal alarm process, and RTC_POWEROFF_WAKEUP is used to set the correct alarm time to RTC register. Change-Id: Ic03f87018e163adf6f6e6013963a497d340fbec7
* DeskClock: Fix flicker and blackscreen issue.hoffc2016-08-242-9/+9
| | | | | | | | | | | (1) When enter the deskclock at first time, and can see + in actionBar in short time. this is a flicker issue. (2) Change the items in SettingsActivity and then exit, you can see flick or blackscreen in short time. Change-Id: Id02318cd9562367bf8b5daec4d54b3a7bb6bca21 CRs-Fixed: 1032811
* DeskClock: Fix the FC when tapping worldclock imageButtonhoffc2016-08-242-0/+33
| | | | | | | When tapping worldclock image button, clock will FC. Change-Id: I8a2852cb8c8e3478eb604dc2585cef835e19bc2f CRs-Fixed: 1031529
* DeskClock: Fix the flip and Shake feature no action issuehoffc2016-08-241-2/+2
| | | | | | | | Setting the flip and shake action when during alarm alerting, and in fact, no action executed Change-Id: I4207bdb7e14eb66559f7d0fbad0702a1725ace39 CRs-Fixed: 1022134
* DeskClock: add runtime permission control and ringtone fallback processhoffc2016-08-2413-51/+296
| | | | | | | | | | | | | | | | (1) when one alarm alert ringtone has been deleted, and its ringtone should be fallback to default ringtone (2) when ringtone need storage runtime permission, but the permission is denied, and should fallback too (3) optimize the ringtone title display for such as audio ringtone type (4) during setting ringtone and if user denied permission, fail current settting and give user toast prompt Change-Id: I310ad9c81657f6b1a09a1bc53098e9c204bb3bae CRs-Fixed: 1021348
* DeskClock: Fix the ringtone item are not selected in RingTone list when existhoffc2016-08-243-5/+6
| | | | | | | | click the ringtone setting in alarm tab, and select the RingTone, the item is not selected when exist at the first time Change-Id: Ic0a33e2f2c2cd00b4476eeaca35ffa0915b4caf4 CRs-Fixed: 1019997
* DeskClock: Implement QTI Enchanced features for Android Nhoffc2016-08-2451-491/+1429
| | | | | | | | | | | | | | | (1) support delay alarm feature when phone_hook state (2) support force alarm alert when device volume is zero (3) support missed the alarm feature when phone_hook state (4) Ux enhance feature: support audio media in SDCard as the alarm alert feature (5) Ux enhance feature: add default alarm alert setting item to Setting Actitiy (6) Ux enhance feature: support manual add city&timezone pair to City DB (7) Ux enhance feature: shake do specified action when alarm alerting (8) Ux enhance feature: flip do specified action when alarm alerting CRs-Fixed: 1014635 Change-Id: I8b027479025e535248dd3e575bc062cedb7c33ae
* DeskClock: User-defined world citiesJorge Ruesga2016-08-2424-1/+1742
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support for add user-defined cities to the world clock Patchset 2: Added GPS query Patchset 3: Added GPS drawables Call requestGpsLocation in background Patchset 4: Added timezone resolution through Google Api Added Marco suggestions Rebased Patchset 5: Remove trailing whitespaces Patchset 6: Moved cm strings to the end of the file Rebased Patchset 7: Export DbCityProvider. Enforce write permission to DeskClock only Patchset 8: Fix FC when there is no default timezone Add content description to GPS button Don't create a new city record of city name + city tz already exists Patchset 9: Rebased Patchset 10: Rebased (Moved string to cm_string) Patchset 11: Cleanup Patchset 12: Use localized time zone names Patchset 13: Fix online timezone lookup Patchset 14: CleanUp. Save dialog state Patchset 15: Kill of async tasks when closing dialog Signed-off-by: Jorge Ruesga <jorge@ruesga.com> Conflicts: AndroidManifest.xml res/menu/cities_menu.xml res/values/cm_strings.xml src/com/android/deskclock/Utils.java src/com/android/deskclock/worldclock/CitiesActivity.java src/com/android/deskclock/worldclock/CityObj.java CRs-Fixed: 1014635 Change-Id: I99de103ce18dd009846689f5f2018072fd0e91bb
* DeskClock: Add back flip and shake actionsArtem Chep2016-08-243-0/+232
| | | | | | | | | | | | | | | | Cherry-picked and ported from: * http://review.cyanogenmod.org/#/c/29894/ Signed-off-by: Jorge Ruesga <jorge@ruesga.com> Conflicts: res/xml/settings.xml src/com/android/deskclock/SettingsActivity.java src/com/android/deskclock/alarms/AlarmService.java CRs-Fixed: 1014635 Change-Id: I9be82187559ccd483b8e4da068890f532e60b8f7
* Clock: Customize Alarm for carrierkaiyiz2016-08-246-9/+45
| | | | | | | | | | | | | | | - Customize the default auto silience value and alarm behavier in a call. - Ring alarm in all user profiles even in silent and meeting mode. Conflicts: res/values/config.xml src/com/android/deskclock/alarms/AlarmService.java src/com/android/deskclock/provider/AlarmInstance.java CRs-Fixed: 1014635 Change-Id: I1b617f8f97ab6e271dcaaf854800aaae083e8b1e
* DeskClock: re-write delayAlarm for intercepting alarms when in-callRaj Yengisetty2016-08-243-36/+161
| | | | | | | | | | | | 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. Conflicts: src/com/android/deskclock/alarms/AlarmStateManager.java CRs-Fixed: 1014635 Change-Id: I27056d12f3b65c9c01329891623c38b0bbb4b107
* merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-090-0/+0
|\
| * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-06-050-0/+0
| |\
| | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-230-0/+0
| | |\
| | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-05-040-0/+0
| | | |\
| | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-03-200-0/+0
| | | | |\
| | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-280-0/+0
| | | | | |\
| | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-210-0/+0
| | | | | | |\
| | | | | | | * merge in nyc-release history after reset to nyc-devThe Android Automerger2016-02-090-0/+0
| | | | | | | |\
| | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-040-0/+0
| | | | | | | | |\
| | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | |\
| | | | | | | | | | * merge in nyc-release history after reset to masterThe Android Automerger2016-02-020-0/+0
| | | | | | | | | | |\ | | | | | | | | | | |/ | | | | | | | | | |/|
* | | | | | | | | / | Import translations. DO NOT MERGEBaligh Uddin2016-06-075-12/+12
|/ / / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 29169863 Change-Id: Icd6e1972a63c0bcebe6a058ce144b6c6d9d5b664
* / / / / / / / / / Import translations. DO NOT MERGEBill Yi2016-06-0347-234/+234
|/ / / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I36f204193c291475ebbd837f5a71b6f0677f259d Auto-generated-cl: translation import
* / / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2016-05-2155-370/+370
|/ / / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28857042 Change-Id: I9b8353b0806efcfe0d593590c365aa99cb7de3f0
* / / / / / / / Import translations. DO NOT MERGEBaligh Uddin2016-05-0344-155/+451
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Auto-generated-cl: translation import Bug: 28463229 Change-Id: Ic7faf9c327ba94baa4bf686ac777be3a9cf1db65
* | | | | | | Import translations. DO NOT MERGEGeoff Mendal2016-03-1810-32/+1948
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: I23f14c0fe8982b4e1bed150fcf2e4ed08d799e61 Auto-generated-cl: translation import
* | | | | | | Follow framework refactoring.Jeff Sharkey2016-03-174-19/+18
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | Bug: 27531029 Change-Id: I1abfb08f8bcef310d25840101e92a237eccccceb
* / / / / / Remove targetSdkVersion from AndroidManifest.xmlJustin Klaassen2016-02-251-1/+1
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Bug: 27350753 The build system will inject the correct targetSdkVersion. Change-Id: I4473336d02d1421c19c425899af1fd7b8b2af767 (cherry picked from commit c45787fae0a3e016c2b1cc87042266d323a9a3f6)
* | | | | Merge remote-tracking branch 'goog/ub-deskclock-dazzle_nyc' into nyc-devJustin Klaassen2016-02-19509-23422/+18207
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * goog/ub-deskclock-dazzle_nyc: (122 commits) Add android.support.design proguard flags Use ACTION_LOCKED_BOOT_COMPLETED on API 24+ - DO NOT MERGE Teach DeskClock about file-based encryption. - DO NOT MERGE Refactoring SharedPreferences to common location. - DO NOT MERGE Use AppCompat's imageButtonStyle attribute - DO NOT MERGE Use SimpleItemAnimator - DO NOT MERGE Bump version to 4.5.0 - DO NOT MERGE Do not assume current stopwatch lap has positive duration Avoid IndexOutOfBounds when deleting timer - DO NOT MERGE Fix snooze event tracking Rebuild notifications after app upgrade Fire timers as scheduled after app upgrade Create AlarmObserverPreL in onCreate Handle deleted timers gracefully Fix alarm not firing in memory-pressure situations Promote TimerService to the foreground while expired timers exist Match firing alarms for SEARCH_MODE == alarm.next Fix alarm icon cut off in 1x4 digital widget on nexus 5 Import translations. DO NOT MERGE Attempt to avoid early death of AlarmService ... Change-Id: I422291e92ca76a901aba0d192749789916495711
| * | | | Add android.support.design proguard flagsJustin Klaassen2016-02-191-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | Change-Id: Ib56c2edf4f37eaf90b442e0e2c4342046fe839c1 (cherry picked from commit 581aa2ea147f49b1fd7292ba07aa893429ac5de3)
| * | | | Do not assume current stopwatch lap has positive durationJames Lemieux2016-02-172-16/+15
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | am: f8e562f69d * commit 'f8e562f69dd6547f7386956eea2edab361913cc0': Do not assume current stopwatch lap has positive duration
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-07 11:15:30 +0000