Commit Graph

70790 Commits

Author SHA1 Message Date
Julia Reynolds
95378bc650 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e8cf759ece am: cc52f7858a am: bbc37e545e
Change-Id: I4d0dd53c568b2e72b058b60016eeefc443ea4c4c
2020-05-22 12:56:05 +00:00
Automerger Merge Worker
0e8f4d05ab Merge "Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: cb57feba56" into rvc-qpr-dev-plus-aosp am: b9ea92cb77 am: 23fab3cd4b
Change-Id: I1dc05dc99d3fe1e7d2c1e776f100c63ea9d3915d
2020-05-22 12:55:59 +00:00
Julia Reynolds
afb8d2aff1 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4fbaf23958 am: c50639ab32 am: 0035fac0d4 am: 0788bfbced
Change-Id: Ic59bdc1dcb118f623559897cb0c32b14a652244e
2020-05-22 12:55:52 +00:00
Julia Reynolds
50c291b3ed Update conversation-related strings am: 9e78ec75d1 am: f7eade72c6 am: c5570305d8 am: 30412ccf99 am: e5a0f78a32
Change-Id: I9aec2596d1b58504346191bd393a85bd3efeb9fb
2020-05-22 12:55:46 +00:00
Julia Reynolds
085a8d4098 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e5fc3bb57c am: 8b1d3fc28e am: bcad163cb5
Change-Id: Ic282df8a03255e8db12c8cf4cac5862854e0274b
2020-05-22 12:55:39 +00:00
Julia Reynolds
af918b8041 Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb am: 0051068fcb am: 087c3f5bf6
Change-Id: I6d712f7c388bc8bf72559677d7e003960963808e
2020-05-22 12:55:30 +00:00
Julia Reynolds
bbc37e545e Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e8cf759ece am: cc52f7858a
Change-Id: If97be961577ddce06f4d3b304d14c06571889d70
2020-05-22 12:32:04 +00:00
Automerger Merge Worker
23fab3cd4b Merge "Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: cb57feba56" into rvc-qpr-dev-plus-aosp am: b9ea92cb77
Change-Id: I97a8108dc12e9624662a713b96eedf941472e17f
2020-05-22 12:31:57 +00:00
Julia Reynolds
0788bfbced Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4fbaf23958 am: c50639ab32 am: 0035fac0d4
Change-Id: I062ed460bda5005fd739c283e239f1c33b7cf297
2020-05-22 12:31:50 +00:00
Julia Reynolds
e5a0f78a32 Update conversation-related strings am: 9e78ec75d1 am: f7eade72c6 am: c5570305d8 am: 30412ccf99
Change-Id: I8f9302019581968c628b6c2fecf3b2f85d04d5e3
2020-05-22 12:31:43 +00:00
Julia Reynolds
bcad163cb5 Merge "clean up layout & styling of notification history" into rvc-dev am: edca211a67 am: 4b78d753b8 am: e5fc3bb57c am: 8b1d3fc28e
Change-Id: I629fbdce7c0e4d5209ec99f5681d367a8b0bda32
2020-05-22 12:31:36 +00:00
Julia Reynolds
087c3f5bf6 Update conversation-related strings am: 9e78ec75d1 am: 61e956443d am: 423fdfa8bb am: 0051068fcb
Change-Id: I5da6a7997f960ca6a112ce6958c20197447a4846
2020-05-22 12:31:26 +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
TreeHugger Robot
1f6783d674 Merge "Add an exported flag in manifest" am: 3954cce0c3
Change-Id: If94db6479f0574ca4d725821a6cbb3e294a0c1e8
2020-05-21 21:22:40 +00:00
Automerger Merge Worker
6e5fdb0b25 Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020 am: beecea6aec am: 9602ca167f
Change-Id: I95398007fa040f2efceac80643d336aba5face8b
2020-05-21 20:59:20 +00:00
TreeHugger Robot
3954cce0c3 Merge "Add an exported flag in manifest" 2020-05-21 20:50:37 +00:00
Julia Reynolds
9e78ec75d1 Update conversation-related strings
Test: atest
Bug: 157215227
Change-Id: Iba279bb285e53918a1e1b43c04d6ec7576cd48a0
2020-05-21 20:49:53 +00:00
Automerger Merge Worker
9602ca167f Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 0dc740b13d" into rvc-d1-dev-plus-aosp am: 74ddcbe020 am: beecea6aec
Change-Id: Ied267fa99c5c09b4740614f8671290ac9aea4b8d
2020-05-21 20:46:22 +00:00
Automerger Merge Worker
9e6f52a5b6 Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae" into rvc-qpr-dev-plus-aosp am: e33d4e6512 am: a3ca5aac9c
Change-Id: I82135435a912a959044631395f7c7bb8c012b13f
2020-05-21 20:35:34 +00:00
Julia Reynolds
b6132f33e1 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445 am: 25d1b428bf am: 75aba32e27
Change-Id: Iba275298b1b3cabad34d457b43bc0311c1905ebe
2020-05-21 20:34:54 +00:00
Automerger Merge Worker
a3ca5aac9c Merge "Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: 06554d19ae" into rvc-qpr-dev-plus-aosp am: e33d4e6512
Change-Id: I696182967389c2deccf749607a879b36c38b0875
2020-05-21 20:12:23 +00:00
Julia Reynolds
75aba32e27 Merge "Switch from shortlabel to label" into rvc-dev am: 6d63120295 am: 22ac6baf3d am: a98f5e1445 am: 25d1b428bf
Change-Id: Iddbf702265aa3c17cdd7ad9997f2b76aa22d0b36
2020-05-21 20:11:16 +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