summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Automatic translation importblinky@build012016-06-202-2/+2
| | | | Change-Id: Ic633f21166c60d9a537a0f18be6d1c479440e348
* Automatic translation importinky@build012016-06-173-3/+3
| | | | Change-Id: I102bb7218884b43b97167c4cfd0cab59098acf90
* Automatic translation importpinky@build012016-06-093-3/+3
| | | | Change-Id: I7ee9238d5e85542349d466e09992f6b9956f67c2
* fix Dutch translation - On vs OffEddy Witkamp2016-06-071-1/+1
| | | | | | | Turn notifications ON is translated in AOSP as "Meldingen UITschakelen" (Turn OFF). Correct it. Change-Id: I801a0dd8c62880f64250c5c4c31305865a4a772e
* Automatic translation importinky@build012016-06-066-4/+20
| | | | Change-Id: I383b40db9b0ad9f157101da8504585bcd7939903
* Automatic translation importclyde@build012016-06-0395-0/+2722
| | | | Change-Id: I9233aadd201c25321ba7e8f9e61ee373871bc161
* Do not let system keys bypass alertDeepak Kundra2016-06-024-7/+37
| | | | | | Issue-id:FEIJ-507 Change-Id: I276280515a13a263eadff631c823849491049e67
* Revert "Automatic translation import"Abhisek Devkota2016-06-014-4/+0
| | | | | | This reverts commit eadcfcdd7696bc5fd06eac82ac622d45f8e0c04a. Change-Id: Ied466e8af5ee6121ea22be896562e5cfd9a03dd5
* Move the strings to cm_strings.xml for translationDeepak Kundra2016-05-313-4/+41
| | | | | | Issue-id:FEIJ-507 Change-Id: I3dd2aaf5b90488188f606e7a6cf5d160d642917c
* Correct the broadcast channel for ColombiaDeepak Kundra2016-05-271-2/+2
| | | | | | Issue-id:FEIJ-854 Change-Id: I5ad3d01b7b5208a70568f935fe5e5d4d3cded9ee
* Automatic translation importJessica Wagantall2016-05-264-0/+4
| | | | | Change-Id: I892092e0393f8ba9ec7dc5220a81aeea57db3499 Ticket: RM-214
* Enable broadcast channels for ColombiaDeepak Kundra2016-05-242-0/+9
| | | | | | Issue-id:FEIJ-585 Change-Id: I624c4021d28dbc6f1d12820418cfdfe9032d5570
* Support playing the alert and vibrate until dismissedDeepak Kundra2016-05-244-6/+20
| | | | | | Issue-id:FEIJ-507 Change-Id: I647c21ef17c6e41f8b1a74144fa4b19226d21080
* Automatic translation importAbhisek Devkota2016-05-171-0/+3
| | | | Change-Id: Idecf941f643e4617d8ffb89a02e98dd424ed0c30
* Revert "Merge tag 'android-6.0.1_r22' of ↵Michael Bestas2016-05-0118-57/+58
| | | | | | | | | https://android.googlesource.com/platform/packages/apps/CellBroadcastReceiver into cm-13.0" This reverts commit d49a86273a2e63125f6fa8d38b4fd899acd48264, reversing changes made to fedb720edf5c5072f52c0d8cfe146f35099f6dd3. Change-Id: Ifd7cf97357dda9014070d100bc2ea008cd2b3b40
* Automatic translation importMichael Bestas2016-04-161-0/+119
| | | | Change-Id: If9c2a7c7823c8cebe18b19912c13308bdfd0888d
* Automatic translation importMichael Bestas2016-04-061-0/+119
| | | | Change-Id: I0b5c82c205a03f6b63a68fd5b4c21c7522c0ddc6
* Automatic translation importMichael Bestas2016-03-282-0/+238
| | | | Change-Id: I357047a581cb413e6e0944d9b51da41abdcaa047
* Merge tag 'android-6.0.1_r22' of ↵staging/cm-13.0+r22Steve Kondik2016-03-1018-58/+57
|\ | | | | | | | | | | https://android.googlesource.com/platform/packages/apps/CellBroadcastReceiver into cm-13.0 Android 6.0.1 release 22
| * am 94e4b8d0: am 3d91c54e: DO NOT MERGE. Fixed emergency alert TTS not ↵Jack Yu2015-10-171-2/+21
| |\ | | | | | | | | | | | | | | | | | | playing on bluetooth speaker. * commit '94e4b8d098ad16a16f70347a6bf6e261d26c40e0': DO NOT MERGE. Fixed emergency alert TTS not playing on bluetooth speaker.
| | * am 3d91c54e: DO NOT MERGE. Fixed emergency alert TTS not playing on ↵Jack Yu2015-10-171-2/+21
| | |\ | | | | | | | | | | | | | | | | | | | | | | | | bluetooth speaker. * commit '3d91c54e6649ec46ddd728079702aba2f0ae96b8': DO NOT MERGE. Fixed emergency alert TTS not playing on bluetooth speaker.
| * | | am c828e775: am 170b39b3: Fixed that emergency alert reminder does not ↵Jack Yu2015-10-141-1/+3
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | trigger every 2 minutes. * commit 'c828e775050c39755d2faf0a4db3e52d9beb659f': Fixed that emergency alert reminder does not trigger every 2 minutes.
| | * | am 170b39b3: Fixed that emergency alert reminder does not trigger every 2 ↵Jack Yu2015-10-141-1/+3
| | |\ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | minutes. * commit '170b39b30ef6340a99fde0e1e6a46cf935e4cde6': Fixed that emergency alert reminder does not trigger every 2 minutes.
| * | | | am 86483adb: am 0564f700: Merge "Fixed that "Turn on notification" does not ↵Jack Yu2015-09-253-12/+23
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | work." into mnc-dr-dev * commit '86483adb0e377a342ecad84fec74134cef6058b8': Fixed that "Turn on notification" does not work.
| | * | | am 0564f700: Merge "Fixed that "Turn on notification" does not work." into ↵Jack Yu2015-09-253-12/+23
| | |\ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | mnc-dr-dev * commit '0564f700425f767fa5c86e7828ec4f16554c220e': Fixed that "Turn on notification" does not work.
| * | | | | am bfc3dd33: (-s ours) am f38d31a3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'bfc3dd33c34e54e6bf004d46982b704afffe25a4': Import translations. DO NOT MERGE
| | * | | | am f38d31a3: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-250-0/+0
| | |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'f38d31a3012f87b4a5087f8d422c8f4107e76fa6': Import translations. DO NOT MERGE
| * | | | | | am ead7309e: (-s ours) am 776b2f2b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ead7309eb42cbed0a0c203485c9a8f5ef9488511': Import translations. DO NOT MERGE
| | * | | | | am 776b2f2b: (-s ours) Import translations. DO NOT MERGEBaligh Uddin2015-09-190-0/+0
| | |\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '776b2f2be4ea457c2779c1e47a70ac262e5cc49b': Import translations. DO NOT MERGE
| * | | | | | | am e3b63234: am 325f3be3: Merge "Always show "Turn on Notification" for some ↵Jack Yu2015-09-161-1/+33
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | carriers." into mnc-dr-dev * commit 'e3b632343d520382b89273b570d9c58d2c22ba76': Always show "Turn on Notification" for some carriers.
| | * | | | | | am 325f3be3: Merge "Always show "Turn on Notification" for some carriers." ↵Jack Yu2015-09-161-1/+33
| | |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | into mnc-dr-dev * commit '325f3be30df819355b77d32cdf15bb535c219484': Always show "Turn on Notification" for some carriers.
| * | | | | | | | am 55fd5684: am 3f0f50fe: am a0b0023a: Fixed the incorrect audio duration ↵Jack Yu2015-09-161-1/+2
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | used for ETWS messages. * commit '55fd5684dbfa298eef3986a362b025c8d0ee9af7': Fixed the incorrect audio duration used for ETWS messages.
| | * | | | | | | am 3f0f50fe: am a0b0023a: Fixed the incorrect audio duration used for ETWS ↵Jack Yu2015-09-161-1/+2
| | |\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages. * commit '3f0f50fec447cf296a86ebcdfbe8f6e5dada6040': Fixed the incorrect audio duration used for ETWS messages.
| * | | | | | | | | am f7a54c75: am 5c99d6fe: Make CMAS monthly test messages additional ↵Jack Yu2015-09-151-16/+6
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | language enabled for all SIMs. * commit 'f7a54c75214a368b3e9d64a9db1e4cd8ef96c29e': Make CMAS monthly test messages additional language enabled for all SIMs.
| | * | | | | | | | am 5c99d6fe: Make CMAS monthly test messages additional language enabled for ↵Jack Yu2015-09-151-16/+6
| | |\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | all SIMs. * commit '5c99d6fe60b213790fbdaa9d05c5d11fc8a3652c': Make CMAS monthly test messages additional language enabled for all SIMs.
| * | | | | | | | | | am 65cce116: am 1eb6c1cf: Added CMAS monthly test additional language ↵Jack Yu2015-09-101-19/+36
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages support. * commit '65cce1163ef7dc94ed9fe074c1e84ad05c162635': Added CMAS monthly test additional language messages support.
| | * | | | | | | | | am 1eb6c1cf: Added CMAS monthly test additional language messages support.Jack Yu2015-09-101-19/+36
| | |\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '1eb6c1cf7b8f8702a9a313dcdce81d0e12077897': Added CMAS monthly test additional language messages support.
| * | | | | | | | | | | am 4f185e0a: am ec645d67: am 07a6c467: Fixed that severe CMAS messages were ↵Jack Yu2015-09-021-6/+5
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | not disabled. * commit '4f185e0a3c5c403998b49bf11591d97c35358dd1': Fixed that severe CMAS messages were not disabled.
| | * | | | | | | | | | am ec645d67: am 07a6c467: Fixed that severe CMAS messages were not disabled.Jack Yu2015-09-021-6/+5
| | |\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'ec645d67c392c01c639ab7437dcd1a7dec0b95c3': Fixed that severe CMAS messages were not disabled.
| * | | | | | | | | | | | am 43d0b605: am 6489cc4c: am 870b4faa: Merge "Fixed that CMAS duplicate ↵Jack Yu2015-08-041-1/+8
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | detection is not working" into mnc-dev * commit '43d0b605a826214ee981fef02b6debe17da20223': Fixed that CMAS duplicate detection is not working
| | * | | | | | | | | | | am 6489cc4c: am 870b4faa: Merge "Fixed that CMAS duplicate detection is not ↵Jack Yu2015-08-041-1/+8
| | |\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | working" into mnc-dev * commit '6489cc4c466aaed685a2eb3bbff9b2f4bb5ea24c': Fixed that CMAS duplicate detection is not working
| * | | | | | | | | | | | | am f4dda5ef: am 324a5acf: am db67df1f: Don\'t vibrate cell broadcast alerts ↵Julia Reynolds2015-08-031-0/+1
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if phone is on silent. * commit 'f4dda5ef7e8b8fbbfc67901e08434db5c71c4442': Don't vibrate cell broadcast alerts if phone is on silent.
| | * | | | | | | | | | | | am 324a5acf: am db67df1f: Don\'t vibrate cell broadcast alerts if phone is ↵Julia Reynolds2015-08-031-0/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on silent. * commit '324a5acfe84ec9af5f27437d11c6b6d1604f88a9': Don't vibrate cell broadcast alerts if phone is on silent.
| * | | | | | | | | | | | | | am 1571f35e: am 0542672d: am dd9555e7: Allow carriers to force disable ↵Jack Yu2015-07-244-11/+64
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ETWS/CMAS test messages. * commit '1571f35e5a9e67234e89def13e3c488106461785': Allow carriers to force disable ETWS/CMAS test messages.
| | * | | | | | | | | | | | | am 0542672d: am dd9555e7: Allow carriers to force disable ETWS/CMAS test ↵Jack Yu2015-07-244-11/+64
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | messages. * commit '0542672dc1c3e475521eae2c9c018c0845913a0b': Allow carriers to force disable ETWS/CMAS test messages.
| * | | | | | | | | | | | | | | am 4c4ec9a8: am fc3b7d01: am 26f398e2: Added multi-sim support to the test app.Jack Yu2015-07-243-58/+81
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '4c4ec9a8fd808b3dca588bc4ed76ede700209387': Added multi-sim support to the test app.
| | * | | | | | | | | | | | | | am fc3b7d01: am 26f398e2: Added multi-sim support to the test app.Jack Yu2015-07-243-58/+81
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit 'fc3b7d01ac4c3602d046ef6cfe6a4c770dd5fbbc': Added multi-sim support to the test app.
| * | | | | | | | | | | | | | | | am 8f1db275: am 5a02bbf6: am c4ef6116: Make CellBroadCast MSIM awareSanket Padawe2015-07-167-195/+556
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '8f1db275f3c5b02f5e9fc12511a23bff48ace7ed': Make CellBroadCast MSIM aware
| | * | | | | | | | | | | | | | | am 5a02bbf6: am c4ef6116: Make CellBroadCast MSIM awareSanket Padawe2015-07-167-195/+556
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * commit '5a02bbf6ac5d4c3618c3889326539579f176f82b': Make CellBroadCast MSIM aware
| * | | | | | | | | | | | | | | | | am f0dcde1f: (-s ours) am dbd8e9ed: (-s ours) am 343f0512: (-s ours) Import ↵Geoff Mendal2015-07-150-0/+0
| |\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | translations. DO NOT MERGE * commit 'f0dcde1fe9630dda706aa763221368bf418b32cc': Import translations. DO NOT MERGE