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
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
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
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
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
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
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
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
42a6154347
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-20 16:00:46 +00:00
Automerger Merge Worker
a06ef7b194
Merge "Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
am: d06d373674" into rvc-d1-dev-plus-aosp
2020-05-20 14:42:44 +00:00
TreeHugger Robot
1518db1927
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
am: d06d373674
...
Change-Id: Ica90e78597092bc44aabd28c5357fbe17ecffafe
2020-05-20 14:42:40 +00:00
TreeHugger Robot
742dd6f60c
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
am: 3ba40628fc
...
Change-Id: I764291b14b76fa7dd24644fe3ae739f324f4f5e9
2020-05-20 14:42:31 +00:00
TreeHugger Robot
d06d373674
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
...
Change-Id: I1867ea8309ed5ec9e8bda40f68cd6e56c69b1755
2020-05-20 14:32:11 +00:00
TreeHugger Robot
3ba40628fc
Merge "Show subtext for previously connected devices on BT card" into rvc-dev am: 946e3adeda
...
Change-Id: Ibc06bd838df06258f98e87fcb3a9da43c47be504
2020-05-20 14:31:50 +00:00
TreeHugger Robot
946e3adeda
Merge "Show subtext for previously connected devices on BT card" into rvc-dev
2020-05-20 14:10:31 +00:00
Bonian Chen
e7495a57dc
[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd
am: 075a17c995
-s ours am: 3d46b0e5ec
-s ours
...
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70
is in history
Change-Id: I0694e2236c4f7ecfb38583f3bb736f416991e434
2020-05-20 13:19:34 +00:00
Bonian Chen
3d46b0e5ec
[automerger skipped] Merge "[Settings] Remove mobile network v1" am: 10799d12fd
am: 075a17c995
-s ours
...
am skip reason: Change-Id Ib365ba712af62729ca35abbc370aef087ce52a90 with SHA-1 1eccd55a70
is in history
Change-Id: Ide8eb53eff3252d31505cc975ea094d76c70bf31
2020-05-20 13:03:03 +00:00
Bonian Chen
075a17c995
Merge "[Settings] Remove mobile network v1" am: 10799d12fd
...
Change-Id: Id17878bd85d8e86f1cb42bc52a78fc5469278376
2020-05-20 12:45:32 +00:00
Bonian Chen
10799d12fd
Merge "[Settings] Remove mobile network v1"
2020-05-20 12:28:20 +00:00
Jason Chiu
07767907d5
Show subtext for previously connected devices on BT card
...
Fixes: 157089483
Test: visual, robotest
Change-Id: If4f2dec9df802a80a686827de7e61115e85d54a7
2020-05-20 17:02:43 +08:00
Automerger Merge Worker
64616b4168
Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
am: cf0ef7ae38" into rvc-d1-dev-plus-aosp
2020-05-20 08:58:17 +00:00
Automerger Merge Worker
e828ebf069
Merge "Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
am: f18ab3712b" into rvc-d1-dev-plus-aosp
2020-05-20 08:58:08 +00:00
Amy Hsu
d1670efe92
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
am: cf0ef7ae38
...
Change-Id: Id8eef41275fc48fe5e84531fd87277189b265f81
2020-05-20 08:58:08 +00:00
Amy Hsu
ce64e46603
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
am: f18ab3712b
...
Change-Id: I8487aa59cacee8a261849dd50d2baafc0cbd5020
2020-05-20 08:57:59 +00:00
TreeHugger Robot
8233c0573f
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c
-s ours am: 4af7cebe18
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia78ce324f66fa421d4eed56ea201ae731d56f618
2020-05-20 08:57:57 +00:00
TreeHugger Robot
ef8dff39c9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c
-s ours am: cb56953dca
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iacb71f66379d50a479671559c830a56a67dce531
2020-05-20 08:57:47 +00:00
Amy Hsu
cf0ef7ae38
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
...
Change-Id: Ife2360ddac1e760471c0ab22f588f344e0d6723d
2020-05-20 08:51:01 +00:00
Amy Hsu
f18ab3712b
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev am: a75dddbf9f
...
Change-Id: I71ba7d138d710e02a7b486940cced02c8dde9e57
2020-05-20 08:50:48 +00:00
Amy Hsu
a75dddbf9f
Merge "Move PeakRefreshRateController to Settings app" into rvc-dev
2020-05-20 08:48:56 +00:00
TreeHugger Robot
4af7cebe18
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I54dc9b432f4b13258c3ff07c789ab4fcc57de45e
2020-05-20 08:43:38 +00:00
TreeHugger Robot
cb56953dca
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: a47d90f59c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I59a7f6597789f6bea36a28cc05e0fdd879cb1ab2
2020-05-20 08:43:28 +00:00
TreeHugger Robot
28621803f4
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-d1-dev am: 3041c88e65
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I765701491e6cebbe89a71942d79cb959fc40d659
2020-05-20 08:32:21 +00:00
TreeHugger Robot
a47d90f59c
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-05-20 08:30:46 +00:00
TreeHugger Robot
3041c88e65
Merge "Import translations. DO NOT MERGE" into rvc-d1-dev
2020-05-20 08:20:55 +00:00
Bonian Chen
daf6c9e85b
[Settings] Remove mobile network v1
...
Cherry-pick of Ib365ba712af62729ca35abbc370aef087ce52a90
Fixes: 142920912
Test: rebuild, robolectric
Merged-In: Ib365ba712af62729ca35abbc370aef087ce52a90
Change-Id: I1554d475e0f34971381dcc42817573f98f958825
2020-05-20 07:49:33 +00:00
Automerger Merge Worker
a88d8f79a6
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 77429677b2
-s ours am: a9bc27d354
-s ours" into rvc-d1-dev-plus-aosp
2020-05-20 07:08:11 +00:00