Bill Yi
5e2e603eef
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours am: 110067aa96 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ib8fa535463005d4a35eecf52d4fc1497cb8e4f8f
2020-05-22 16:12:17 +00:00
Bill Yi
42e614ea94
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours am: 115a3e2a47 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I2bf5cd1565069c44024d6c10b4be1b7616c65e22
2020-05-22 16:11:59 +00:00
Bill Yi
110067aa96
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ic2b7a93e22922a9b6c5c878bd1cd60cba3a0f838
2020-05-22 16:00:19 +00:00
Bill Yi
41f149889e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 12072f339e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5933c17de23b934e37075c76937767dc33aa1180
2020-05-22 16:00:00 +00:00
Bill Yi
115a3e2a47
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours am: 131a9cb96e -s ours
...
am skip reason: subject contains skip directive
Change-Id: I5f1ec20ea861b8cb6f930ba89207409170bdb777
2020-05-22 15:59:54 +00:00
Bill Yi
131a9cb96e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I3ad0501601df178a732a73b318ba9104374d27ea
2020-05-22 15:47:26 +00:00
Bill Yi
12072f339e
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 8019c16a14 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I9cb17d06ec70b135859f8e2c5f61f56e86839972
2020-05-22 15:47:26 +00:00
Bill Yi
8019c16a14
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-22 15:20:44 +00:00
Julia Reynolds
cc52f7858a
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e8cf759ece
...
Change-Id: I930dc1647ced5e84ee4c2cf3989e59eb49d6df10
2020-05-22 12:19:35 +00:00
Automerger Merge Worker
b9ea92cb77
Merge "Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: cb57feba56" into rvc-qpr-dev-plus-aosp
2020-05-22 12:19:29 +00:00
Julia Reynolds
0035fac0d4
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4fbaf23958 am: c50639ab32
...
Change-Id: Ie56d103052293c4de79486610e074bc339424c72
2020-05-22 12:19:20 +00:00
Julia Reynolds
110c2f7bb8
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: cb57feba56
...
Change-Id: I643ef2b93a7219d18b1a1721adbddd4b869c60b4
2020-05-22 12:19:18 +00:00
Julia Reynolds
30412ccf99
Update conversation-related strings am: 9e78ec75d1 am: f7eade72c6 am: c5570305d8
...
Change-Id: I4bed80e64f5b61e3fa7800d5426a20295ff30a6f
2020-05-22 12:19:13 +00:00
Julia Reynolds
8b1d3fc28e
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e5fc3bb57c
...
Change-Id: If5c22b0fdcbcf9799fc7887e19a9880a2540c4b7
2020-05-22 12:19:06 +00:00
Julia Reynolds
0051068fcb
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb
...
Change-Id: I01fa401ce81d6c6f50b4fa4cbf04d621401f899b
2020-05-22 12:19:00 +00:00
Julia Reynolds
e8cf759ece
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8
...
Change-Id: I7e590f2902bae5c385121d2d41121437c846be13
2020-05-22 12:04:19 +00:00
Julia Reynolds
c50639ab32
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4fbaf23958
...
Change-Id: I854f495cf222ca7a3d10d99e654a519427de8b88
2020-05-22 12:04:17 +00:00
Julia Reynolds
cb57feba56
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d
...
Change-Id: Ib934269cce4f953461160f53cb020cb6fedf6862
2020-05-22 12:04:11 +00:00
Julia Reynolds
c5570305d8
Update conversation-related strings am: 9e78ec75d1 am: f7eade72c6
...
Change-Id: I071211b233ce480fea38f069470bfe9441603cd0
2020-05-22 12:04:11 +00:00
Julia Reynolds
e5fc3bb57c
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8
...
Change-Id: I7c8da87f67f1306425677b6de82498cab2f3b45f
2020-05-22 12:04:02 +00:00
Julia Reynolds
423fdfa8bb
Update conversation-related strings am: 9e78ec75d1 am: 61e956443d
...
Change-Id: I124b22d123aa7abf5bbc3adc264478e166cd900d
2020-05-22 12:03:49 +00:00
Julia Reynolds
4fbaf23958
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
...
Change-Id: I3c7138e8e806aeed78da7a1c0807790af8b519f0
2020-05-22 11:48:42 +00:00
Julia Reynolds
f7eade72c6
Update conversation-related strings am: 9e78ec75d1
...
Change-Id: I11b6a55cffee069a1aef0df8d2ca9be0ca141161
2020-05-22 11:48:36 +00:00
Julia Reynolds
4b78d753b8
Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67
...
Change-Id: I2a163df1ff0574518804bcff3be2f9650357f73a
2020-05-22 11:48:34 +00:00
Julia Reynolds
61e956443d
Update conversation-related strings am: 9e78ec75d1
...
Change-Id: I9fb42f08125dcfd078045c5737bae429870022d5
2020-05-22 11:48:26 +00:00
Julia Reynolds
edca211a67
Merge "clean up layout & styling of notification history" into rvc-dev
2020-05-22 11:23:59 +00:00
Julia Reynolds
9e78ec75d1
Update conversation-related strings
...
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
2020-05-21 20:49:53 +00:00
Grace Jia
f203a66a74
Close and disable SIM lock dialogs when SIM removed from device.
...
Bug: 157102550
Test: Manually open the PIN toggle dialog and PIN edit dialog, then
remove SIM from DUT
Change-Id: Ied875909e9cbcb1cad1ae045578747a0a5810491
2020-05-21 13:47:09 -07:00
Bill Yi
0cc77c1db8
Import translations. DO NOT MERGE
...
BUG:154363304
Auto-generated-cl: translation import
Change-Id: I5e504e86b52fa341e03a497003190ca2e250bb01
2020-05-21 20:26:49 +00:00
Automerger Merge Worker
beecea6aec
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020
...
Change-Id: I3233d44bb75457662fca639cbf24cc4d04c15c55
2020-05-21 19:55:49 +00:00
Automerger Merge Worker
e33d4e6512
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae" into rvc-qpr-dev-plus-aosp
2020-05-21 19:55:19 +00:00
Julia Reynolds
84fcccfe1f
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae
...
Change-Id: Idee4f92953e81e9882ba06ee12c3097273390431
2020-05-21 19:54:53 +00:00
Julia Reynolds
25d1b428bf
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445
...
Change-Id: I96e1f7e0a925443f9ad4429f1d4482c0da58198f
2020-05-21 19:54:38 +00:00
Automerger Merge Worker
74ddcbe020
Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp
2020-05-21 19:34:45 +00:00
Julia Reynolds
34e0ebd5dc
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d
...
Change-Id: I75d636b27d67ce8a549d4d8287755c60c110677e
2020-05-21 19:34:39 +00:00
Julia Reynolds
a98f5e1445
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d
...
Change-Id: Iabb72c8e018cf568ae43ac1a24f7d1b7fafbfad7
2020-05-21 19:34:33 +00:00
Julia Reynolds
06554d19ae
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d
...
Change-Id: I86b8f73b5df03d2e57cb45dc848fbe43301ee8c6
2020-05-21 19:34:26 +00:00
Julia Reynolds
0dc740b13d
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
...
Change-Id: Ic642152c044aed6a4778ae38b449eabae4f77eb5
2020-05-21 19:17:25 +00:00
Julia Reynolds
22ac6baf3d
Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295
...
Change-Id: I84fb7adb02d4b7731327e531cddd48171bd4329b
2020-05-21 19:16:53 +00:00
Julia Reynolds
2679bf5af0
clean up layout & styling of notification history
...
Test: manual
Fixes: 157161601
Fixes: 157162238
Fixes: 157160265
Fixes: 157161125
Fixes: 157160611
Fixes: 157158944
Change-Id: I9853426987549898b7996e9db43f7767e4c41641
2020-05-21 14:55:51 -04:00
Julia Reynolds
6d63120295
Merge "Switch from shortlabel to label" into rvc-dev
2020-05-21 18:53:24 +00:00
Bill Yi
cd9694bd2f
Import translations. DO NOT MERGE
...
Auto-generated-cl: translation import
Change-Id: I3f42416bc415f259eaaaf87aeb8d273523e47989
2020-05-21 11:53:23 -07:00
Robert Luo
b88826ad1b
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: fa85b4e1f6 am: c47bdeb62f
...
Change-Id: Id77ae49659ba09a5bf9d2a493b3b0d2e25875e8e
2020-05-21 15:59:42 +00:00
Robert Luo
1a7f615f53
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: 09751770db
...
Change-Id: I074b93b3a1998ce89e89132ca7d15993402f2c4a
2020-05-21 15:58:31 +00:00
Robert Luo
d6fd16d704
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425 am: b15149a1eb
...
Change-Id: I0e875b6117d1c3a6afde37f6e9c6c8aa696bc053
2020-05-21 15:58:22 +00:00
Robert Luo
c47bdeb62f
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: fa85b4e1f6
...
Change-Id: I28cf36ad0dc3c278af23cca880075bf7ffc79e07
2020-05-21 15:33:16 +00:00
Robert Luo
b15149a1eb
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425
...
Change-Id: I5557b6c9dc3eeb82497f16ea1fdf912e26cfaa86
2020-05-21 15:33:03 +00:00
Robert Luo
09751770db
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6 am: 83fa4e6425
...
Change-Id: I6ebc46eb67ea2e97d1c51774a7bc4f68d828032b
2020-05-21 15:32:56 +00:00
Robert Luo
fa85b4e1f6
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
...
Change-Id: I0e65ecc63313558f55c4ed1d0b6a4e263913610b
2020-05-21 15:08:49 +00:00
Robert Luo
83fa4e6425
Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev am: 31f96bbcf6
...
Change-Id: I9c81a2973ffcb3416390417c48a72e3635bec0c4
2020-05-21 15:08:31 +00:00
