Commit Graph

67056 Commits

Author SHA1 Message Date
TreeHugger Robot
a9ba9c02a5 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6471bef55c am: 0009d317fa
Change-Id: I99e80f51c027bc0239a008fa6b81df7ffb3d6c9a
2020-04-28 03:57:40 +00:00
TreeHugger Robot
0009d317fa Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97 am: 6471bef55c
Change-Id: Icb842b19dba816ca4566e8af900adbbc5527061c
2020-04-28 03:35:31 +00:00
TreeHugger Robot
6471bef55c Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389 am: 7cf00c8a97
Change-Id: I727061ec65629bf410aafdf953893ab0092e7db0
2020-04-28 03:19:03 +00:00
TreeHugger Robot
7cf00c8a97 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev am: 6fcac1d389
Change-Id: Id1c919ccbe9570d1e724e55f9d738782542fc12b
2020-04-28 03:03:08 +00:00
TreeHugger Robot
6fcac1d389 Merge "Fix broken tests in RedactionInterstitialTest" into rvc-dev 2020-04-28 02:43:55 +00:00
TreeHugger Robot
1536c9bb92 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548 am: e194ca5528 am: 01f33c6c37
Change-Id: I68817fa40939f057d4f6269e3e907d2e50b5731e
2020-04-27 21:33:59 +00:00
TreeHugger Robot
6d78aa97cc Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: f6ab80044d am: 91585bd8a5 am: e97ebdac4f
Change-Id: Ia80c9628412f87a21bc6000d83ceda54af86ab77
2020-04-27 21:33:42 +00:00
TreeHugger Robot
2747fbb275 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: de07ac05d8 am: 479366ccd5
Change-Id: I833d8c09d079806f7ef7763db3d6e38e02e92f30
2020-04-27 21:33:24 +00:00
TreeHugger Robot
01f33c6c37 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548 am: e194ca5528
Change-Id: I50ddd520b1b1aa786bf1f5b6751a48b222818f6a
2020-04-27 21:33:12 +00:00
TreeHugger Robot
e97ebdac4f Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: f6ab80044d am: 91585bd8a5
Change-Id: I24a088e9c69dba5cadce7eea9fdd6e2e100b34f1
2020-04-27 21:11:48 +00:00
TreeHugger Robot
479366ccd5 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: de07ac05d8
Change-Id: Iacaf61c2105d20a6c09707833234920c525e0c22
2020-04-27 21:11:30 +00:00
TreeHugger Robot
e194ca5528 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201 am: eab97e5548
Change-Id: I39b9eee2e6edb9b24b5216ff0c77258ed289de8c
2020-04-27 21:10:27 +00:00
TreeHugger Robot
91585bd8a5 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: f6ab80044d
Change-Id: I6132ee88c9944f706a77a74305eb35e8a2e99a98
2020-04-27 20:52:17 +00:00
TreeHugger Robot
eab97e5548 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201
Change-Id: Icff3bab54b6b26f68ee83c451abd3b9e24105a23
2020-04-27 20:52:03 +00:00
TreeHugger Robot
de07ac05d8 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e am: 7aa3131201
Change-Id: I4e7f836bef89d2c2f4a8dbf6005a22ac0ff17896
2020-04-27 20:51:46 +00:00
TreeHugger Robot
f6ab80044d Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e
Change-Id: Iff94af0e29f4537aefcb3905452efd4c34927331
2020-04-27 20:38:25 +00:00
TreeHugger Robot
7aa3131201 Merge "Allow > 1 line title for DND duration preference" into rvc-dev am: 5c3f71859e
Change-Id: I91b09f88338864003ce982eb37f8cd42e1ee6971
2020-04-27 20:37:53 +00:00
TreeHugger Robot
5c3f71859e Merge "Allow > 1 line title for DND duration preference" into rvc-dev 2020-04-27 20:21:50 +00:00
TreeHugger Robot
1e99580e7a Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: a84e0cb241 am: 36b7fd7322 am: b47ab4f6b7
Change-Id: Ia39db2cb8b9ae2934ae6e7feae5e78aedeba6682
2020-04-27 18:35:59 +00:00
TreeHugger Robot
dbc53c97d5 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: e0b855898a am: a0823cbb6c am: 2946308622
Change-Id: If1a775d7a9e9778291225b185f3f3d632ced4f9d
2020-04-27 18:35:43 +00:00
TreeHugger Robot
0df02dd6c5 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: f150f8b606 am: 766a0be03f
Change-Id: Id23d5ca2a668439ecedb4d66d2ddb4b328c3d013
2020-04-27 18:35:31 +00:00
TreeHugger Robot
32047912f6 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: 0c76c7cba0 am: 3dc9692c7a
Change-Id: Ibd78b1fecfb6f3368820c63dabc4b0b82f1ab8e2
2020-04-27 18:34:51 +00:00
TreeHugger Robot
53f27efde2 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: d120058c87 am: f9ddba1a51 am: 98789a079b
Change-Id: I9d06f8b1f0594734c9f19eb25a1fdb650e320bb7
2020-04-27 18:34:25 +00:00
TreeHugger Robot
b47ab4f6b7 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: a84e0cb241 am: 36b7fd7322
Change-Id: Ied09b68db8378be2711f5ca09068ea7e2964ba75
2020-04-27 18:33:48 +00:00
TreeHugger Robot
2946308622 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: e0b855898a am: a0823cbb6c
Change-Id: Ic42ad593450113b243dc8a68cc84af2399947b5f
2020-04-27 18:33:19 +00:00
TreeHugger Robot
37720caadf Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b am: 6acc3d6c95 am: 86e170790a
Change-Id: Ibea550337d422fd56f2960396f9fbbc0f437004a
2020-04-27 18:32:53 +00:00
Beverly
f939976367 Allow > 1 line title for DND duration preference
Test: manual
Fixes: 154694705
Change-Id: I9eaffb21e5d5902782beb5e9f845394015ba23be
2020-04-27 14:23:54 -04:00
TreeHugger Robot
766a0be03f Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: f150f8b606
Change-Id: I4f50c378c728eb2ace4f4a31a48582d022dece21
2020-04-27 18:22:42 +00:00
TreeHugger Robot
3dc9692c7a Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: 0c76c7cba0
Change-Id: I120b58b31b17f110cfb58aef2df8ac97afe25a8f
2020-04-27 18:22:36 +00:00
TreeHugger Robot
36b7fd7322 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b am: a84e0cb241
Change-Id: I4cc6c791999c42fa46dcb30e722883b06c2da9b8
2020-04-27 18:22:34 +00:00
TreeHugger Robot
98789a079b Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: d120058c87 am: f9ddba1a51
Change-Id: I4d975f41a84a180c1a3643690cd55d3032b46c43
2020-04-27 18:22:29 +00:00
TreeHugger Robot
a0823cbb6c Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df am: e0b855898a
Change-Id: I1d271b9fb31b38f874d6459daa5b9c7b67a8d22b
2020-04-27 18:22:24 +00:00
TreeHugger Robot
86e170790a Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b am: 6acc3d6c95
Change-Id: I2bef6148918693ff54d505551940df6e5945287b
2020-04-27 18:21:40 +00:00
TreeHugger Robot
a84e0cb241 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b
Change-Id: I8eab9035ceacc23c3f8deabadcb0ad88ecb28387
2020-04-27 18:04:09 +00:00
TreeHugger Robot
e0b855898a Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df
Change-Id: I4cf2d49a51639240483eb162f386a5ca1b7b4710
2020-04-27 18:03:57 +00:00
TreeHugger Robot
f150f8b606 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: 1e84f0252b
Change-Id: I235dc0a55178e646502f987f62ad95deed6d00ea
2020-04-27 18:03:45 +00:00
TreeHugger Robot
0c76c7cba0 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: e1617681df
Change-Id: I538434bb22af23b06da7b927daa2b8408bd1b6f1
2020-04-27 18:03:39 +00:00
TreeHugger Robot
f9ddba1a51 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462 am: d120058c87
Change-Id: Ic35bececf0122e56e6716a4e05094fc83e2c9cb4
2020-04-27 18:03:15 +00:00
TreeHugger Robot
6acc3d6c95 Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182 am: 001dcc9a5b
Change-Id: I1a04aef01625aae848e26dd94e5fe23f2fd17b98
2020-04-27 18:02:57 +00:00
TreeHugger Robot
d120058c87 Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462
Change-Id: Ia6dcc5c5f142838bceac1b170669be939f7065e2
2020-04-27 17:39:13 +00:00
TreeHugger Robot
001dcc9a5b Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182
Change-Id: I2479c711420447d02e7742a00e4b1002c18dcff5
2020-04-27 17:39:07 +00:00
TreeHugger Robot
1e84f0252b Merge "Separate dnd categories in a list" into rvc-dev am: 50a5a0c462
Change-Id: I515b17b9408bdb84b5dc0d0f951f0bf167b27132
2020-04-27 17:39:06 +00:00
TreeHugger Robot
e1617681df Merge "Separate call/messages dnd summary string" into rvc-dev am: d28fca9182
Change-Id: I98945495e8b451863faeb5bd18ee01b7f8ca0de2
2020-04-27 17:38:57 +00:00
TreeHugger Robot
50a5a0c462 Merge "Separate dnd categories in a list" into rvc-dev 2020-04-27 17:38:06 +00:00
TreeHugger Robot
d28fca9182 Merge "Separate call/messages dnd summary string" into rvc-dev 2020-04-27 17:26:16 +00:00
Beverly
ae2d681faf Separate dnd categories in a list
For translations purposes, separate strings that are the first element
in a list of sound categories from the stand alone category titles.

Test: manual
Bug: 154694384
Change-Id: I1ba5a487f179103ccfa881fdc57b10b6ec2560ad
2020-04-27 12:08:11 -04:00
TreeHugger Robot
cd311bbfa2 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours am: 0b338dd383 -s ours am: 2ac1f2cfa7 -s ours am: 2707263f0f -s ours
am skip reason: subject contains skip directive

Change-Id: Ibab6946ee0914faf9a5b8b9a72e90a2bd7aed220
2020-04-27 15:41:17 +00:00
TreeHugger Robot
f3e6890c92 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 5d8f6ee782 -s ours am: 093ce3ce46 -s ours am: f81f7193ce -s ours
am skip reason: subject contains skip directive

Change-Id: Icfda61bc6b861229135a91851e75d2931a4dd400
2020-04-27 15:41:10 +00:00
Menghan Li
5b39132321 Merge "Fix formats and internationalization of the string "0.6 seconds" in sk language" into rvc-dev am: 24f71c6e91 am: 8afeaa1fa7 am: dc0196627d am: 7ad40cc9e4 am: e59157413e
Change-Id: Iaa34f81c93c9be58313b1816e7140c731cdc7144
2020-04-27 15:40:43 +00:00
TreeHugger Robot
506b6e106d [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 7f15836d47 -s ours am: 9ecf1649fb -s ours am: c96e38337e -s ours am: 961510b374 -s ours
am skip reason: subject contains skip directive

Change-Id: I466ed28115e6e075435469ce3591426ed861f126
2020-04-27 15:40:23 +00:00