Treehugger Robot
4e983425db
[automerger skipped] Merge "Hide unprovisioned MDN (phone number) at select profile dialog" am: 24d96a8977 am: 7ca7469230 -s ours am: d8768490af -s ours am: 9f128a011b -s ours
...
am skip reason: Change-Id If84600cc426fefcdd219c4a44a5510b8db5c0a89 with SHA-1 6758ca661e
2020-04-07 04:29:41 +00:00
Automerger Merge Worker
88171420fe
Merge "Merge "Add a developer setting for conversation enforcement" into rvc-dev am: 76b55e0b0a am: 7008d7a192" into rvc-d1-dev-plus-aosp am: 875b001eb3
...
Change-Id: I8c766e6a5afe7d957acb1700f20de10e7c1c2594
2020-04-07 04:29:16 +00:00
Zhen Zhang
98f069eea6
Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 8e89b0e182 am: 14fa1b7229
...
Change-Id: Ic89d54efd399ac2dc691240579ebf4f0edff3831
2020-04-07 04:29:03 +00:00
Zhen Zhang
77f2676d44
Fix advanced preferences behavior in AllInOneTetherSettings am: b1d19a8b35 am: 0ea7803c18 am: 8e541c6272
...
Change-Id: I5e1cfdba829410149bd828332604155e62379524
2020-04-07 04:28:29 +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
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
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
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
822f5915c7
[automerger skipped] Merge "Revert "access system resources with android.R package"" am: 6bd382b85f am: 4644c7f0a6 -s ours am: da12a74e84 -s ours am: 4f4aa0ec07 -s ours
...
am skip reason: Change-Id Ia2b1fd28dee08da03b6f1e7892ac3562edad00e4 with SHA-1 3e26fc0f21
2020-04-06 21:04:29 +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
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
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
TreeHugger Robot
c2b02ce918
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652 -s ours am: 9eb9a9bb7c -s ours am: 26c7349b27 -s ours am: 44874aebd2 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I8132cfe91f62b128030e28807ee2432b38c79ef6
2020-04-06 18:02:59 +00:00
TreeHugger Robot
cfc94322ce
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c -s ours am: 5eb855a7f6 -s ours am: 49cffaf4e7 -s ours am: 1ca3c94378 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I174ab2ce59a2401f66547d68d56d48e109def857
2020-04-06 18:02:28 +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
bd4a5ccac2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652 -s ours am: 724ee2c200 -s ours am: cc2157f5a9 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I05ea525dc948f4264982fe0d6da90c2eaa4b808d
2020-04-06 17:46:46 +00:00
TreeHugger Robot
968c018a61
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652 -s ours am: 9eb9a9bb7c -s ours am: bbbf1915d7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ia1523a19e7bfb93d4ee082e00b9f738842c212c3
2020-04-06 17:46:21 +00:00
TreeHugger Robot
44874aebd2
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: df338dd652 -s ours am: 9eb9a9bb7c -s ours am: 26c7349b27 -s ours
...
am skip reason: subject contains skip directive
Change-Id: I75453872f7488a05b47125dc86621c7c6eb5cc7b
2020-04-06 17:45:47 +00:00
TreeHugger Robot
bddb21644d
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c -s ours am: 5feae0d739 -s ours am: a473e031ad -s ours
...
am skip reason: subject contains skip directive
Change-Id: I21f51c889ce4e42793869ecbf2de78f2b319a3d2
2020-04-06 17:44:57 +00:00
TreeHugger Robot
1ca3c94378
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c -s ours am: 5eb855a7f6 -s ours am: 49cffaf4e7 -s ours
...
am skip reason: subject contains skip directive
Change-Id: Ifc5510d3bbaf46ba11c8d31fa8679883c349ca1c
2020-04-06 17:44:29 +00:00
TreeHugger Robot
a3e0ea362c
[automerger skipped] Merge "Import translations. DO NOT MERGE" into rvc-dev am: 293f7ce88c -s ours am: 5eb855a7f6 -s ours am: fc34561dbc -s ours
...
am skip reason: subject contains skip directive
Change-Id: I21867eb19b9c8d13d626d69d336e5f5dfa603b0f
2020-04-06 17:44:12 +00: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
26c7349b27
[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: I01f674204431aa31f0ae2f8cb9bde16252f523cc
2020-04-06 17:14:48 +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
49cffaf4e7
[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: I31ad78f1faec0d60e6e30ae75cfa319642b92d64
2020-04-06 17:13:46 +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
21663a0bf7
[automerger skipped] Merge "Add Ethernet Tethering settings" am: 526741a2f2 am: 2b54956856 -s ours am: 6181c64279 -s ours am: e4a5220c80 -s ours
...
am skip reason: Change-Id Ia4f365ddc1a53a926d716046db3e6ac463c978b9 with SHA-1 557e457278
2020-04-06 16:18:49 +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
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
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
Julia Reynolds
e5f4c765a6
Merge "Update history flow" into rvc-dev am: cb7fbe0faa am: dffd1ba351 am: 93b7ecfe89 am: 5b287b467f
...
Change-Id: I3eeec240d7b50c8f0a80442e879831cd82dd5e18
2020-04-06 14:39:32 +00:00
Treehugger Robot
910c5fd281
Merge "Usb preference title changed when rotating" am: fb2690102b am: b2c2d6e968 am: ff9a2901f6 am: 36055efcaf
...
Change-Id: If79d1b6fa9a0ccc467af42a67eb28a7a9ea7e700
2020-04-06 14:30:05 +00:00
