Menghan Li
4d8d18f3f9
[automerger skipped] Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee
am: 53cd11ffa3
-s ours
...
am skip reason: Change-Id I714db2a450e34d33e5728cf355136d26bef77e11 with SHA-1 9e1bb0def1
is in history
Change-Id: Id6316ec571ba0c9e693ac7ac5bbf232847fa0974
2020-04-07 04:49:18 +00:00
Menghan Li
017a59b9de
Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999
am: 57f7168c9e
...
Change-Id: Ic9c33b9ca56aacd368591585f50b48049633567d
2020-04-07 04:48:35 +00:00
Menghan Li
f9605f039d
Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee
am: 0f576c7727
...
Change-Id: Ia63da1dfed23a89868250f5041a3790426b7e51e
2020-04-07 04:48:24 +00:00
Menghan Li
57f7168c9e
Merge "Support caption second UI structure (5/n)" into rvc-dev am: c0c522d999
...
Change-Id: Ic76b90acb28cf63bcee7ac953a8f14a5f346c20d
2020-04-07 04:39:10 +00:00
Menghan Li
53cd11ffa3
Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee
...
Change-Id: I0112719eb646353187f1ef8a1138cc85e544f261
2020-04-07 04:38:58 +00:00
Menghan Li
0f576c7727
Merge "Support autoclick secondary action (8/n)" into rvc-dev am: 47b01403ee
...
Change-Id: If142e6cf0b0e979a8cca590523071217cffe4532
2020-04-07 04:38:54 +00:00
Menghan Li
c0c522d999
Merge "Support caption second UI structure (5/n)" into rvc-dev
2020-04-07 04:24:20 +00:00
Menghan Li
47b01403ee
Merge "Support autoclick secondary action (8/n)" into rvc-dev
2020-04-07 04:23:56 +00:00
TreeHugger Robot
67289e624a
Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a
am: 3c88fb72ff
...
Change-Id: I6193d86dcd2ac24845f37f2db9cbc1f1bec42479
2020-04-07 04:09:20 +00:00
Treehugger Robot
9f128a011b
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977
am: 7ca7469230
-s ours am: d8768490af
-s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
is in history
Change-Id: I4540a2b3e17923fc64d16713e047fba5c25fbfb8
2020-04-07 04:09:13 +00:00
Automerger Merge Worker
875b001eb3
Merge "Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a
am: 7008d7a192" into rvc-d1-dev-plus-aosp
2020-04-07 04:08:41 +00:00
TreeHugger Robot
9f3968f2ae
Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a
am: 7008d7a192
...
Change-Id: Iddc4a0b03d26b553cc8a4e7fe9a0410a47ff146d
2020-04-07 04:08:32 +00:00
Zhen Zhang
14fa1b7229
Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35
am: 8e89b0e182
...
Change-Id: Iea0e0b6df6f77bb3bc2a05f3b9dcfd5ab2db0c29
2020-04-07 04:08:29 +00:00
Zhen Zhang
8e541c6272
Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35
am: 0ea7803c18
...
Change-Id: Ib5a5d84cc16fdc3744b1f15a60699694cc15673a
2020-04-07 04:07:33 +00:00
TreeHugger Robot
3c88fb72ff
Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a
...
Change-Id: Iaeb8ef59b9e675dcea137525c1b197b7f7512852
2020-04-07 03:58:21 +00:00
TreeHugger Robot
7008d7a192
Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a
...
Change-Id: I09354573eae552a56444be82e49b4037765e50e7
2020-04-07 03:57:57 +00:00
Treehugger Robot
d8768490af
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977
am: 7ca7469230
-s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
is in history
Change-Id: I5fde0307c8e2789d957498f916c84aff1ac58d34
2020-04-07 03:57:17 +00:00
Zhen Zhang
8e89b0e182
Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35
...
Change-Id: I7b92f3680c07402b73f073df5f346f15804195dc
2020-04-07 03:57:10 +00:00
Zhen Zhang
0ea7803c18
Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35
...
Change-Id: Ic3d6cc903c5b616af73888b5552794f45fbfab00
2020-04-07 03:56:53 +00:00
TreeHugger Robot
76b55e0b0a
Merge "Add a developer setting for conversation enforcement" into rvc-dev
2020-04-07 03:47:02 +00:00
Treehugger Robot
7ca7469230
Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977
...
Change-Id: Ib9bbc21fec23a32a6b6cc425196b1150976c2386
2020-04-07 03:36:56 +00:00
Treehugger Robot
24d96a8977
Merge "Hide unprovisioned MDN (phone number) at select profile dialog"
2020-04-07 03:15:25 +00:00
Daniel Bright
4f4aa0ec07
[automerger skipped] Merge "Revert "access system resources with android.R package"" am: 6bd382b85f
am: 4644c7f0a6
-s ours am: da12a74e84
-s ours
...
am skip reason: Change-Id Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4 with SHA-1 3e26fc0f21
is in history
Change-Id: I9e1af8959b36d2721d60b7176ad62a52cc1d1b4a
2020-04-06 20:45:02 +00:00
Daniel Bright
da12a74e84
[automerger skipped] Merge "Revert "access system resources with android.R package"" am: 6bd382b85f
am: 4644c7f0a6
-s ours
...
am skip reason: Change-Id Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4 with SHA-1 3e26fc0f21
is in history
Change-Id: Ic3565af36a440a21ac535e885f37ca156eead31e
2020-04-06 20:30:51 +00:00
Daniel Bright
4644c7f0a6
Merge "Revert "access system resources with android.R package"" am: 6bd382b85f
...
Change-Id: Icb0a0cdcb759baf30ef97eb418a3fa73642587f9
2020-04-06 20:12:47 +00:00
Daniel Bright
6bd382b85f
Merge "Revert "access system resources with android.R package""
2020-04-06 19:49:55 +00:00
Zhen Zhang
b1d19a8b35
Fix advanced preferences behavior in AllInOneTetherSettings
...
In AllInOneTetherSettings, advanced preferences should not be hidden
again after user have expanded them.
Bug: 151954343
Test: CodeInspectionTest; AllInOneTetherSettingsTest; manually test oberved advanced preferences won't be hidden.
Change-Id: If2c7d99b7dcac4149f065eca73022a582924c90b
2020-04-06 19:14:41 +00:00
Peter Wang
9f984b5d03
Hide unprovisioned MDN (phone number) at select profile dialog
...
Bug: 151773922
Test: Build & Device
Change-Id: If84600cc426fefcdd219c4a44a5510b8db5c0a89
Merged-In: If84600cc426fefcdd219c4a44a5510b8db5c0a89
2020-04-06 10:50:11 -07:00
TreeHugger Robot
cc2157f5a9
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652
-s ours am: 724ee2c200
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ie2800e8989575eb2346199e2dbff3b91b21296cc
2020-04-06 17:15:41 +00:00
TreeHugger Robot
bbbf1915d7
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652
-s ours am: 9eb9a9bb7c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iaeb98df50cdf897f4cc4be88d6005daa5ae019c8
2020-04-06 17:14:24 +00:00
TreeHugger Robot
a473e031ad
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c
-s ours am: 5feae0d739
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Ide680101de36c177e94150e0490b13378f52d8fb
2020-04-06 17:13:47 +00:00
TreeHugger Robot
fc34561dbc
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c
-s ours am: 5eb855a7f6
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I199231327b1d3e5c2e5fd8ff4983190f4578f1a0
2020-04-06 17:13:38 +00:00
TreeHugger Robot
9eb9a9bb7c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I8d8146268f020bc46c7f78976dd14b2d1e08d5cd
2020-04-06 16:57:29 +00:00
TreeHugger Robot
724ee2c200
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652
-s ours
...
am skip reason: subject contains skip directive
Change-Id: Iae90a8e9ea9d6067c752ddc4e05e4cb393f14b39
2020-04-06 16:56:29 +00:00
TreeHugger Robot
5feae0d739
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I7ac7c96722746d7dcc73a2a26ec99559bfe17e37
2020-04-06 16:53:48 +00:00
TreeHugger Robot
5eb855a7f6
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c
-s ours
...
am skip reason: subject contains skip directive
Change-Id: I6ace54b06bc3b9c47546e97d61b289bc3e833def
2020-04-06 16:52:44 +00:00
TreeHugger Robot
df338dd652
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-06 16:38:44 +00:00
TreeHugger Robot
293f7ce88c
Merge "Import translations. DO NOT MERGE" into rvc-dev
2020-04-06 16:33:27 +00:00
Lorenzo Colitti
e4a5220c80
[automerger skipped] Merge "Add Ethernet Tethering settings" am: 526741a2f2
am: 2b54956856
-s ours am: 6181c64279
-s ours
...
am skip reason: Change-Id Ia4f365ddc1a53a926d716046db3e6ac463c978b9 with SHA-1 557e457278
is in history
Change-Id: I605b4a7a128c14c7101951eb4472d6762324d675
2020-04-06 16:00:57 +00:00
Lorenzo Colitti
6181c64279
[automerger skipped] Merge "Add Ethernet Tethering settings" am: 526741a2f2
am: 2b54956856
-s ours
...
am skip reason: Change-Id Ia4f365ddc1a53a926d716046db3e6ac463c978b9 with SHA-1 557e457278
is in history
Change-Id: I65c4a2add8ac4dd8cb9cc81d28726f35eb37e833
2020-04-06 15:48:56 +00:00
Lorenzo Colitti
2b54956856
Merge "Add Ethernet Tethering settings" am: 526741a2f2
...
Change-Id: I475283b47906ae6fa2fba6fd4ddb506a266c398c
2020-04-06 15:28:41 +00:00
Lorenzo Colitti
526741a2f2
Merge "Add Ethernet Tethering settings"
2020-04-06 15:11:31 +00:00
Treehugger Robot
36055efcaf
Merge "Usb preference title changed when rotating" am: fb2690102b
am: b2c2d6e968
am: ff9a2901f6
...
Change-Id: If80476f05262bc2738fc5eea0215b47a480cbe3a
2020-04-06 14:18:05 +00:00
Julia Reynolds
0d89715e0a
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
am: 221cdd5d7e
...
Change-Id: I67d170d5e71e1f0e4b848538ac7f2e00e1543dba
2020-04-06 14:17:31 +00:00
Treehugger Robot
ff9a2901f6
Merge "Usb preference title changed when rotating" am: fb2690102b
am: b2c2d6e968
...
Change-Id: If0734764d1859e72edd2056c55a800a3742c5761
2020-04-06 14:16:52 +00:00
Julia Reynolds
dd6ce8335b
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
am: dffd1ba351
...
Change-Id: I72383db82a8cbbbee6f8ed4c38a24418743fa8b3
2020-04-06 14:16:39 +00:00
Julia Reynolds
dffd1ba351
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
...
Change-Id: I19e879f61ff9259a0a4d021d35d9c96648bc8705
2020-04-06 13:55:17 +00:00
Julia Reynolds
221cdd5d7e
Merge "Update history flow" into rvc-dev am: cb7fbe0faa
...
Change-Id: Iffad2fc3b6981fa086fdf191c7e404918fc5ad79
2020-04-06 13:55:05 +00:00
Treehugger Robot
b2c2d6e968
Merge "Usb preference title changed when rotating" am: fb2690102b
...
Change-Id: Iba767119b8b098ba4aa38beda885775edf35274f
2020-04-06 13:55:01 +00:00
Julia Reynolds
ae9060246b
Add a developer setting for conversation enforcement
...
Test: Robo tests
Fixes: 152907434
Change-Id: I4e16faf817349993a98955601829d1ad22fa3921
2020-04-06 09:53:31 -04:00