PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
67,404 Commits 1 Branch 0 Tags
0051068fcb6768d8889058d0964cc0f59f88c37e
Commit Graph

67404 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
423fdfa8bb Update conversation-related strings am: 9e78ec75d1 am: 61e956443d 
Change-Id: I124b22d123aa7abf5bbc3adc264478e166cd900d
 2020-05-22 12:03:49 +00:00
Julia Reynolds
61e956443d Update conversation-related strings am: 9e78ec75d1 
Change-Id: I9fb42f08125dcfd078045c5737bae429870022d5
 2020-05-22 11:48:26 +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
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
6d63120295 Merge "Switch from shortlabel to label" into rvc-dev 2020-05-21 18:53:24 +00: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
Robert Luo
31f96bbcf6 Merge "Add data collection and metrics for Media Output Switcher - 2/n" into rvc-dev 2020-05-21 14:56:54 +00:00
Automerger Merge Worker
22bcdc79cd Merge "Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7" into rvc-qpr-dev-plus-aosp 2020-05-21 12:46:42 +00:00
TreeHugger Robot
640f3cec66 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 am: b29c7c49e7 
Change-Id: I31e51425df7c1156b1a5266d665f0d60ce82e5c2
 2020-05-21 12:46:37 +00:00
TreeHugger Robot
9316cd31e7 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9a9490e6b9 
Change-Id: I97499ad374d60634f6d71f6bb76c76307718da4c
 2020-05-21 12:46:31 +00:00
TreeHugger Robot
37f19e547d Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 am: 9e5d3a8805 
Change-Id: I86a4c1678b1566135d0c1d3e8ef519598bc4e100
 2020-05-21 12:46:10 +00:00
TreeHugger Robot
b29c7c49e7 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: e65b99bce2 
Change-Id: I4ad18d5526b18a4eb862f77f379736fbd0e8a0e2
 2020-05-21 12:35:02 +00:00
TreeHugger Robot
9a9490e6b9 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 
Change-Id: Idae86bae7cf14e65d72a3e9ef4073bdbee1557df
 2020-05-21 12:34:59 +00:00
TreeHugger Robot
9e5d3a8805 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 am: 1560e89128 
Change-Id: I05397c331eadd9841fd8c2ba935b75ad5861dbc8
 2020-05-21 12:34:32 +00:00
TreeHugger Robot
e65b99bce2 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 
Change-Id: I9a5a8969ec1998d0988ce1acc0ed68e3ec24d8a8
 2020-05-21 12:21:01 +00:00
TreeHugger Robot
1560e89128 Merge "Only show work profile notifs if enabled" into rvc-dev am: 43d6bd38f5 
Change-Id: I97bc8f4fa39ca1fef9bbce21d1fb48832d948fba
 2020-05-21 12:20:57 +00:00
TreeHugger Robot
43d6bd38f5 Merge "Only show work profile notifs if enabled" into rvc-dev 2020-05-21 12:09:37 +00:00
Robert Luo
b7d1aa8efa Add data collection and metrics for Media Output Switcher - 2/n 
Fixes: 147792668
Test: ./out/host/linux-x86/bin/statsd_testdrive Atom_ID
Change-Id: I1a34228da75c197663bcfe909c961e57665590d4
 2020-05-21 18:00:50 +08:00
Jeff Tinker
c8baa3edf7 [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd am: 70aa2882a6 
Change-Id: Ic649d0d9dc9884139343a6017d600e3e1065c91f
 2020-05-20 20:46:54 +00:00
Jeff Tinker
70aa2882a6 [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours am: 01b3da1dbd 
Change-Id: I0a367b53e4c85ea3db4b8452073c64d836aa721e
 2020-05-20 20:33:02 +00:00
Jeff Tinker
01b3da1dbd [automerger skipped] Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c am: a5f7479f5a -s ours 
am skip reason: skipped by user jtinker

Change-Id: I41cccce692c4cd294c74054cb072e0ada6f41941
 2020-05-20 20:14:25 +00:00
Jeff Tinker
a5f7479f5a Merge "Revert "[Settings] Remove mobile network v1"" am: 9e974afd4c 
Change-Id: I980e0dba1556a28d683ffb3e5a40da52974c062e
 2020-05-20 19:50:57 +00:00
Jeff Tinker
9e974afd4c Merge "Revert "[Settings] Remove mobile network v1"" 2020-05-20 19:37:56 +00:00
Jeff Tinker
9c657c34f4 Revert "[Settings] Remove mobile network v1" 
This reverts commit daf6c9e85b.

Reason for revert: Broken build 6513883 on aosp-master on errorprone

Change-Id: I5e473863c2669a3c89014e12cc952c5c72a12cb7
bug:157138919
 2020-05-20 19:14:57 +00:00
Julia Reynolds
04d50c9709 Switch from shortlabel to label 
Test: atest
Bug: 157140669
Change-Id: Iebcb2f076fef33b6f3ce16326af4e4c5c6770459
 2020-05-20 14:23:43 -04:00
TreeHugger Robot
d384741938 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: 8ebbe4db5c -s ours 
am skip reason: subject contains skip directive

Change-Id: I726fa5c772a31d7b45b93554d0499b819629e686
 2020-05-20 16:35:01 +00:00
TreeHugger Robot
5446562899 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours am: ac648d6916 -s ours 
am skip reason: subject contains skip directive

Change-Id: I313496899c2833bb4238d6c2c024c0bce89b067b
 2020-05-20 16:34:22 +00:00
Julia Reynolds
39ceee9e00 Only show work profile notifs if enabled 
Test: manual, turn off profile
Fixes: 157137055
Change-Id: Ic042300297c09d132e793d13fec18b23d24f2cc8
 2020-05-20 12:29:39 -04:00
TreeHugger Robot
ac648d6916 [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours 
am skip reason: subject contains skip directive

Change-Id: I1a6119bcc82c95a996d762eb9a28e6a2878f1ca1
 2020-05-20 16:22:06 +00:00
TreeHugger Robot
8ebbe4db5c [automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 42a6154347 -s ours 
am skip reason: subject contains skip directive

Change-Id: If1a628dce575776369bb61847735e7a6951fbe6e
 2020-05-20 16:22:02 +00:00
TreeHugger Robot
42a6154347 Merge "Import translations. DO NOT MERGE" into rvc-d1-dev 2020-05-20 16:00:46 +00:00
TreeHugger Robot
f6d7ce24b0 Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: 3ba40628fc am: ba98f11c56 
Change-Id: I05a82bbf4ef6f294ee887d2497dd62dad6ab8811
 2020-05-20 15:03:04 +00:00
Automerger Merge Worker
f2e45400fc Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda am: d06d373674" into rvc-d1-dev-plus-aosp am: a06ef7b194 
Change-Id: I15801851140bacc91006a5f2f9791eebc2534e2c
 2020-05-20 15:02:58 +00:00