Commit Graph

64079 Commits

Author SHA1 Message Date
Beverly
280fc8a00f Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1 am: 32084d621d am: 52ebf23076 am: 7a06c1e76f
Change-Id: I03ce11f42d3519953c518ebec0b4e15dc61e4a91
2020-04-02 18:59:34 +00:00
Beverly
f935c6d9d5 Add conversations image to People DND setting page am: e646b28e26 am: 791f2426e9 am: bfffe1063d am: f4ad21ec0a
Change-Id: Id5cf159223d81f0aaa880782c9043b140a1d28ba
2020-04-02 18:55:22 +00:00
Beverly
7aac5c5214 Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1 am: dd7d201712 am: 00258ba7ab
Change-Id: I592f23b609964a7abff58ec39c12586a180f948d
2020-04-02 18:49:41 +00:00
Beverly
7a06c1e76f Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1 am: 32084d621d am: 52ebf23076
Change-Id: I9ae0cc145bdbc0e9fad8a4e83ce9f28da4ba1e32
2020-04-02 18:38:25 +00:00
Beverly
f4ad21ec0a Add conversations image to People DND setting page am: e646b28e26 am: 791f2426e9 am: bfffe1063d
Change-Id: Ia7ed5137bb3656b9aa4de16e545510ba5ee4a17d
2020-04-02 18:16:43 +00:00
Beverly
52ebf23076 Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1 am: 32084d621d
Change-Id: Iff6db27e7b538c1d9c5583949bb9be243aeb99d9
2020-04-02 18:16:34 +00:00
Beverly
00258ba7ab Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1 am: dd7d201712
Change-Id: I78a9a8739ba0f266eb7d40df4c5ba8e95409d201
2020-04-02 18:16:05 +00:00
Beverly
bfffe1063d Add conversations image to People DND setting page am: e646b28e26 am: 791f2426e9
Change-Id: I45cf8a5e264bf973eac6d594c2a25c864feacc8d
2020-04-02 17:57:00 +00:00
Beverly
32084d621d Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1
Change-Id: I8265d40d56c38c87bbf127ee88aab8bb30e60ffd
2020-04-02 17:56:52 +00:00
Beverly
dd7d201712 Add conversations image to People DND setting page am: e646b28e26 am: 3afe367fa1
Change-Id: Ia1f7952cd118233bdf9614ecd3671e205e0d9bb6
2020-04-02 17:56:52 +00:00
Beverly
791f2426e9 Add conversations image to People DND setting page am: e646b28e26
Change-Id: Icfcc24699a41d3a878f1635fd8ce941ce236b438
2020-04-02 17:45:39 +00:00
Beverly
3afe367fa1 Add conversations image to People DND setting page am: e646b28e26
Change-Id: I28dfa7645ad754e3fe43b89f92119a77ba5c09f8
2020-04-02 17:45:36 +00:00
Beverly
e646b28e26 Add conversations image to People DND setting page
Previously the image was only on the Conversations settings page, but it
should also be included on the People settings page too.

Test: manual
Bug: 151845457
Change-Id: I99af85b3dcc266a1a5743755fe3cb31fc16ccfba
2020-04-02 16:08:31 +00:00
Arc Wang
9a759d9c62 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54 am: 76d263bdfc am: 5a055207a0 am: e29b265e6d
Change-Id: I7b2b4f30869bd5538d64e91311cb133447d22e43
2020-04-02 11:10:08 +00:00
Arc Wang
e29b265e6d Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54 am: 76d263bdfc am: 5a055207a0
Change-Id: I689507c6263776017d2514043088db81704aa856
2020-04-02 11:01:37 +00:00
Arc Wang
8fda48017b Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: 40397e6007 am: 9dac8dc2b5 am: 7dc90815ce
Change-Id: I535330cea417b7cd9a3720ba24270c8b243af7d8
2020-04-02 11:00:54 +00:00
Arc Wang
025d09d609 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54 am: 790d4b85b3 am: a40ce86c5b
Change-Id: Iba4ae723e6bc535bd707365341f7db88421ed5aa
2020-04-02 11:00:39 +00:00
Arc Wang
7dc90815ce Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: 40397e6007 am: 9dac8dc2b5
Change-Id: I060fd7475ae1842217b9531f2f4656915884b19b
2020-04-02 10:44:20 +00:00
Arc Wang
5a055207a0 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54 am: 76d263bdfc
Change-Id: I03d1c4b41bfff5a75fe07a4ffb18e056981f0a50
2020-04-02 10:44:11 +00:00
Arc Wang
a40ce86c5b Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54 am: 790d4b85b3
Change-Id: I9b237a38644ccd1992beaf87ee43db3dcb7a6890
2020-04-02 10:44:05 +00:00
Arc Wang
76d263bdfc Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54
Change-Id: I9b26189d4bc0dd46c80043bd0f08cb268d4c4f08
2020-04-02 10:23:26 +00:00
Arc Wang
9dac8dc2b5 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: 40397e6007
Change-Id: I492d3a54ca7e0cbce7b108bad54bb2a1564d38e6
2020-04-02 10:23:25 +00:00
Arc Wang
790d4b85b3 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955 am: fffa6d3a54
Change-Id: I34b5b80a4872fbd6027682f72522d88318e90a7b
2020-04-02 10:22:35 +00:00
Arc Wang
40397e6007 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955
Change-Id: I7770bccb1094898fae9c2e36526958fd1ca3246d
2020-04-02 10:04:29 +00:00
Arc Wang
fffa6d3a54 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev am: e1839d2955
Change-Id: I4059d4563980a4481b8bc20622b48266d963138c
2020-04-02 10:04:13 +00:00
Arc Wang
e1839d2955 Merge "Add null check for config when clicking on wifi picker entry" into rvc-dev 2020-04-02 09:48:06 +00:00
TreeHugger Robot
f7391b322e [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: dd5ea62c49 -s ours am: dc195db59a -s ours am: 7fb5dfb4ad -s ours am: eea6eac929 -s ours
am skip reason: subject contains skip directive

Change-Id: Ia8016c954ca0a4293238ebf25b14b5720dbef238
2020-04-02 06:14:00 +00:00
Bill Yi
b9668f8f74 [automerger skipped] Import translations. DO NOT MERGE am: f639851869 -s ours am: f97ff85cc0 -s ours am: 9a52e1f5af -s ours am: 0abcfc6010 -s ours am: 08fd0a620e -s ours am: c3381b1896 -s ours
am skip reason: subject contains skip directive

Change-Id: Id050dc0d914fe0188c94908aefbb19ee76af18f4
2020-04-02 06:13:48 +00:00
TreeHugger Robot
95c00fefd4 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: db76ac605e -s ours am: 714a31a413 -s ours am: cf1ad70abb -s ours am: d456787410 -s ours am: 3c07b94e4c -s ours
am skip reason: subject contains skip directive

Change-Id: I64f4ee0234b0cbf13f69db708dcd1c6b2165ae80
2020-04-02 06:13:27 +00:00
TreeHugger Robot
15247d2f24 Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb am: a99009ccff am: 3fb9ac994d am: 315143478b am: b30052a072
Change-Id: Ic1bb6cc65cc396a02c7c1378182921cbe609c295
2020-04-02 06:13:04 +00:00
TreeHugger Robot
d25a277ee6 Merge "Import translations. DO NOT MERGE" 2020-04-02 06:10:00 +00:00
TreeHugger Robot
eea6eac929 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: dd5ea62c49 -s ours am: dc195db59a -s ours am: 7fb5dfb4ad -s ours
am skip reason: subject contains skip directive

Change-Id: I3b99a4700fb95e0133a861086ca4cf5677912730
2020-04-02 05:54:05 +00:00
Bill Yi
c3381b1896 [automerger skipped] Import translations. DO NOT MERGE am: f639851869 -s ours am: f97ff85cc0 -s ours am: 9a52e1f5af -s ours am: 0abcfc6010 -s ours am: 08fd0a620e -s ours
am skip reason: subject contains skip directive

Change-Id: I08898fca1bbbaf7ce4043a34a2b6074fe7660395
2020-04-02 05:53:58 +00:00
TreeHugger Robot
3c07b94e4c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: db76ac605e -s ours am: 714a31a413 -s ours am: cf1ad70abb -s ours am: d456787410 -s ours
am skip reason: subject contains skip directive

Change-Id: I3a366c6865a07fdac571f1c2c332523f08ffad36
2020-04-02 05:53:49 +00:00
TreeHugger Robot
b30052a072 Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb am: a99009ccff am: 3fb9ac994d am: 315143478b
Change-Id: Id5fde9b20e4f9c56ae8d851c6851915dd5339222
2020-04-02 05:53:44 +00:00
TreeHugger Robot
ef7e71af66 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: 405fd2eeba -s ours am: 1fdf42430a -s ours am: ac51b9e890 -s ours
am skip reason: subject contains skip directive

Change-Id: I0d5b267f0dd0b98e46242f084490a0d92cfd8b17
2020-04-02 05:53:20 +00:00
Bill Yi
e969262a10 [automerger skipped] Import translations. DO NOT MERGE am: f639851869 -s ours am: f97ff85cc0 -s ours am: 5b81996458 -s ours am: af5c16e420 -s ours am: 4eddfb265f -s ours
am skip reason: subject contains skip directive

Change-Id: I54a5319d5acceefae600c5ad2395ffaca3ba5d7e
2020-04-02 05:53:09 +00:00
TreeHugger Robot
e8cb2f0406 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: db76ac605e -s ours am: 2bf0b05023 -s ours am: 890d48ea53 -s ours am: b1402ab110 -s ours
am skip reason: subject contains skip directive

Change-Id: I907292bfe7ca2cfa5db1659c82ea47cb6482ede6
2020-04-02 05:52:54 +00:00
TreeHugger Robot
17f4bfe6cd Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb am: 5b144b6a33 am: ce3d31f707 am: 2857e0f558
Change-Id: Ie286728466b6f84ca00f23782b651734c7e9cd60
2020-04-02 05:52:47 +00:00
TreeHugger Robot
292bdc6611 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: dd5ea62c49 -s ours am: 1986d1bdcb -s ours am: 1b0223a747 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic5208d461f85b77c7cd4e0bb081bf5a582dd0441
2020-04-02 05:52:35 +00:00
Bill Yi
95e57220e8 [automerger skipped] Import translations. DO NOT MERGE am: f639851869 -s ours am: f97ff85cc0 -s ours am: 9a52e1f5af -s ours am: f1819f8f03 -s ours am: c1bfe197ad -s ours
am skip reason: subject contains skip directive

Change-Id: Iccf475345fc3b1d22522cdbf9ff2999202ecd87d
2020-04-02 05:52:28 +00:00
TreeHugger Robot
c1851fa5aa [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: db76ac605e -s ours am: 714a31a413 -s ours am: db1ca519c0 -s ours am: 1397b29d41 -s ours
am skip reason: subject contains skip directive

Change-Id: I0d1c9aee653c54a86280699d05c16709baababab
2020-04-02 05:52:17 +00:00
TreeHugger Robot
ab156487d7 Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb am: a99009ccff am: d9d679182d am: 5dd44a8907
Change-Id: Ibc1d8e48b4252c6dfde083308de462beb0be8dba
2020-04-02 05:51:57 +00:00
TreeHugger Robot
5f273c9289 Merge "Import translations. DO NOT MERGE" 2020-04-02 05:46:03 +00:00
TreeHugger Robot
ac51b9e890 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: 405fd2eeba -s ours am: 1fdf42430a -s ours
am skip reason: subject contains skip directive

Change-Id: Ie1f0703f9390fc793a6b6d3e277a5b03fec82faa
2020-04-02 05:31:32 +00:00
Bill Yi
4eddfb265f [automerger skipped] Import translations. DO NOT MERGE am: f639851869 -s ours am: f97ff85cc0 -s ours am: 5b81996458 -s ours am: af5c16e420 -s ours
am skip reason: subject contains skip directive

Change-Id: Ic4903ed9975104267b650af0acdf834a0e831905
2020-04-02 05:31:25 +00:00
TreeHugger Robot
b1402ab110 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: db76ac605e -s ours am: 2bf0b05023 -s ours am: 890d48ea53 -s ours
am skip reason: subject contains skip directive

Change-Id: If498001f303b6c4138586aec4230626231978174
2020-04-02 05:31:19 +00:00
TreeHugger Robot
2857e0f558 Merge "Fix SupportDashboardActivityTest" into rvc-dev am: 542746dadb am: 5b144b6a33 am: ce3d31f707
Change-Id: I53ae621d5d0771f30a1fcb9e8205d8c4340cdf40
2020-04-02 05:31:13 +00:00
TreeHugger Robot
1b0223a747 [automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: dd6e85b216 -s ours am: 1245d88a9f -s ours am: dd5ea62c49 -s ours am: 1986d1bdcb -s ours
am skip reason: subject contains skip directive

Change-Id: I931f71129b73e1c6ebc278e264f6551b9f3fd6a5
2020-04-02 05:31:04 +00:00
Bill Yi
c1bfe197ad [automerger skipped] Import translations. DO NOT MERGE am: f639851869 -s ours am: f97ff85cc0 -s ours am: 9a52e1f5af -s ours am: f1819f8f03 -s ours
am skip reason: subject contains skip directive

Change-Id: I629fb254429403caa5e0d89ca703ef6a1221c021
2020-04-02 05:30:39 +00:00