Commit Graph

66368 Commits

Author SHA1 Message Date
TreeHugger Robot
8875f0a352 Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f am: 2a5213f207
Change-Id: I2508e14cd51bf6b18b0c118054e72666f8a1524d
2020-04-21 14:44:44 +00:00
TreeHugger Robot
c97178761f Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f am: 8d53e5888d
Change-Id: I598264e0025d8679264aa15fd4d37b59d3a3990b
2020-04-21 14:44:10 +00:00
TreeHugger Robot
2a5213f207 Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f
Change-Id: I6cd9a171153e7cef2473a134fa4f922c1a7ebefd
2020-04-21 14:31:09 +00:00
TreeHugger Robot
8d53e5888d Merge "Update ZenModeSettingsTest" into rvc-dev am: 0ff0929e0f
Change-Id: Iac46ccc66578a9fd0705bbbd25a3718ead02dbca
2020-04-21 14:30:30 +00:00
TreeHugger Robot
0ff0929e0f Merge "Update ZenModeSettingsTest" into rvc-dev 2020-04-21 14:12:15 +00:00
Beverly
d796da16f0 Update ZenModeSettingsTest
String was updated

Test: make ROBOTEST_FILTER=ZenModeSettingsTest RunSettingsRoboTests
Fixes: 154568594
Change-Id: Ia67f7ff2e3692cc4f40b87e94e3d3952002a9e87
2020-04-21 09:31:16 -04:00
Pavel Grafov
57034951ba Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874 am: acdb260023 am: 27a3035e8f am: 66bb04f351 am: dad609dcbe
Change-Id: I8ff7e5afeef8e92643f3ffaf84badcb6cb187243
2020-04-21 12:47:24 +00:00
Jason Hsu
dc34ea67f5 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71 am: 23b14102e9 am: a0d4361560 am: 0eac1a2bb6 am: 47b8d757f4
Change-Id: If62e1edf520154ca46b0ae2267543a2138cc344a
2020-04-21 12:46:17 +00:00
Pavel Grafov
dad609dcbe Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874 am: acdb260023 am: 27a3035e8f am: 66bb04f351
Change-Id: I5593f4cfcdd8925a166510c4e8f142807ece310d
2020-04-21 12:42:21 +00:00
Pavel Grafov
66bb04f351 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874 am: acdb260023 am: 27a3035e8f
Change-Id: I1b426e5c08f28d5e155985723b82c1bd857946e6
2020-04-21 12:25:11 +00:00
Jason Hsu
47b8d757f4 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71 am: 23b14102e9 am: a0d4361560 am: 0eac1a2bb6
Change-Id: I0ec76ec94cb305212027346901a0f2df5e55d12f
2020-04-21 12:20:41 +00:00
Pavel Grafov
3f8e3516a4 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874 am: 98f0512fa3 am: 5ab1db35d7 am: 1113e77bb3
Change-Id: I80c26c3bdb75260286c620a23d79780a84f837b7
2020-04-21 12:16:17 +00:00
Jason Hsu
515285dec9 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71 am: 508086615f am: a59aade982 am: 2a5571032a
Change-Id: I3ad706ce8820afbe493c4f1f9e11719147c39e34
2020-04-21 12:15:30 +00:00
Pavel Grafov
1113e77bb3 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874 am: 98f0512fa3 am: 5ab1db35d7
Change-Id: I967d9ce16c3bb7252bd8cab23f8c69fb4615d542
2020-04-21 12:11:26 +00:00
Pavel Grafov
27a3035e8f Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874 am: acdb260023
Change-Id: Ib63bebcf9d069a6cb0ce70405d88818aeedfc0e8
2020-04-21 12:06:11 +00:00
Pavel Grafov
3fe01bf47c Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 8d8eb618e7 am: 8ab2c696d5 am: 25235106c0 am: 6da7e012a8
Change-Id: Ic1cb772efd8a73d067a3d4068292b64de325cac0
2020-04-21 11:50:08 +00:00
TreeHugger Robot
2766759c59 Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0 am: 5ced8102b3 am: 8309dbcb93 am: 7acc13d0e1 am: b6d51763dc
Change-Id: I36019f5a697cb383317c29dc8b17e06a117f8365
2020-04-21 11:48:37 +00:00
Pavel Grafov
acdb260023 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874
Change-Id: Ia03cee63b8bb3bee0b4bde166c9c018a92cd6028
2020-04-21 11:41:06 +00:00
Jason Hsu
0eac1a2bb6 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71 am: 23b14102e9 am: a0d4361560
Change-Id: I09ba1e03d491d5715f71dda00d6e9228ecd8e619
2020-04-21 11:40:47 +00:00
Pavel Grafov
5ab1db35d7 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874 am: 98f0512fa3
Change-Id: Id9ddcefe519dba4c1d1ab10d2c0e0e99f4ccc021
2020-04-21 11:39:58 +00:00
Jason Hsu
2a5571032a Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71 am: 508086615f am: a59aade982
Change-Id: I33e8041f9cfdbfe3e525fd8a600629e9dee02dfa
2020-04-21 11:37:15 +00:00
Pavel Grafov
6da7e012a8 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 8d8eb618e7 am: 8ab2c696d5 am: 25235106c0
Change-Id: I75b6466406eb516c8ea3360a3cc6ee1ad2a805a4
2020-04-21 11:37:03 +00:00
Pavel Grafov
98f0512fa3 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 7e9e73f874
Change-Id: Ie1244e7d9a4bca51e25da80a586b3573e403ac6a
2020-04-21 11:30:19 +00:00
Jason Hsu
a59aade982 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71 am: 508086615f
Change-Id: Icbdcd71d8c8a17b292b6aed0e21c306fa73d61f9
2020-04-21 11:26:38 +00:00
Pavel Grafov
25235106c0 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 8d8eb618e7 am: 8ab2c696d5
Change-Id: I08ad9061253827f80cfd60fbf8744d68b3da09aa
2020-04-21 11:26:30 +00:00
Jason Hsu
a0d4361560 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71 am: 23b14102e9
Change-Id: I0e7063ca8a386a55ea291560599ba23d9d5a0b76
2020-04-21 11:25:53 +00:00
Pavel Grafov
7e9e73f874 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324
Change-Id: I63178cae69a422737962e49acec2a40551bebd33
2020-04-21 11:25:00 +00:00
Jason Hsu
23b14102e9 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71
Change-Id: I785868be5dc0e505e935b91579debb32ea77c116
2020-04-21 11:20:17 +00:00
Jason Hsu
508086615f Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: dc52900d71
Change-Id: I835409239416f4b9d296cd4bba745dd608fd70f2
2020-04-21 11:19:33 +00:00
Jason Hsu
373b356756 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: d31f5d58d8 am: 69eade7c4e am: 9103cf5254 am: 51dfd5b356
Change-Id: Ib50699b4cd044fabc02bcff9b9b0582700403d76
2020-04-21 11:18:34 +00:00
TreeHugger Robot
b185ac33e7 Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: aade7d4eb2 am: b910654b28 am: 87468197db am: 7ef5a06d2b
Change-Id: Id8399a29c3b808dd976b71861d5bd4757b5b7110
2020-04-21 11:18:25 +00:00
TreeHugger Robot
8e9fc0932c Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0 am: 9e18c88925 am: b1fb75e726 am: 480fcc1e98
Change-Id: I471e7b292ab9324799aa749f1dcf9425aaf2ff56
2020-04-21 11:18:20 +00:00
TreeHugger Robot
b6d51763dc Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0 am: 5ced8102b3 am: 8309dbcb93 am: 7acc13d0e1
Change-Id: I4f4999ba17ccfa4b8207cc571380c84efd008315
2020-04-21 11:17:29 +00:00
Jason Hsu
dc52900d71 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794
Change-Id: I2b56250fc1d5806498692dcf9ecae1a2fe2ebd98
2020-04-21 11:16:20 +00:00
Pavel Grafov
8ab2c696d5 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324 am: 8d8eb618e7
Change-Id: I8d182517950d28a4fe747d341c0345d3b0de6043
2020-04-21 11:08:17 +00:00
Pavel Grafov
8d8eb618e7 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev am: 9341983324
Change-Id: Ia3a28b881005c732d0158890b68de22d97703068
2020-04-21 10:52:43 +00:00
TreeHugger Robot
7acc13d0e1 Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0 am: 5ced8102b3 am: 8309dbcb93
Change-Id: Ifb0030e7d8902614a5fbfd99b23725b919fa5d62
2020-04-21 10:52:35 +00:00
Jason Hsu
51dfd5b356 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: d31f5d58d8 am: 69eade7c4e am: 9103cf5254
Change-Id: I8d77752b010f610d852ada909112e160694a800f
2020-04-21 10:43:36 +00:00
TreeHugger Robot
7ef5a06d2b Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: aade7d4eb2 am: b910654b28 am: 87468197db
Change-Id: Ic8ddc9d511d056686a2e5f73a8d058af29b757f4
2020-04-21 10:43:28 +00:00
TreeHugger Robot
480fcc1e98 Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0 am: 9e18c88925 am: b1fb75e726
Change-Id: I57ca163a101756a4831ab028cb0dc97ef4c5962b
2020-04-21 10:43:18 +00:00
Pavel Grafov
9341983324 Merge "Stop disabling wifi toggle when tethering is restricted" into rvc-dev 2020-04-21 10:40:12 +00:00
Jason Hsu
9103cf5254 Merge "Show default description only if description and html description are empty" into rvc-dev am: 0055a74794 am: d31f5d58d8 am: 69eade7c4e
Change-Id: Ibc6111d95c2bd6014658397be68f1fccf36bb025
2020-04-21 10:18:44 +00:00
TreeHugger Robot
8309dbcb93 Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0 am: 5ced8102b3
Change-Id: If4ec88fbe422a6105d8cdf25fbb4dcaa9a737151
2020-04-21 10:18:30 +00:00
TreeHugger Robot
87468197db Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: aade7d4eb2 am: b910654b28
Change-Id: I5913fefb8cd0884446a78a9d0de03c2682647ee5
2020-04-21 10:18:26 +00:00
TreeHugger Robot
b1fb75e726 Merge "[Wi-Fi] Show not show Wi-Fi edit UI for never connected open Wi-Fi networks" into rvc-dev am: 8a80769a7e am: 79c9bdb2d0 am: 9e18c88925
Change-Id: I72da239a62610881ad916a0fa1862e5720c3359d
2020-04-21 10:17:41 +00:00
Bonian Chen
2f0e710af4 Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded am: 67ff594c29 am: 2ba9e114bf am: 646d1eda7d am: f57db9edcc am: 2458aed2c4
Change-Id: Ic97ec79d80faea71f93f0309c326108009a3320b
2020-04-21 10:03:28 +00:00
Alex Johnston
fa1d2b7449 Merge "Update Wi-Fi configs restrictions" into rvc-dev am: 56f06c59a1 am: cff2c22eb8 am: dc980cf964 am: 6cc7055a4d am: 206418f886 am: e31c1362a9
Change-Id: Iafd64fd0e72edca883435f15bd694d9a2521d9f2
2020-04-21 10:03:23 +00:00
TreeHugger Robot
846de0688d Merge "Ignore a lot of failed roboletric test cases" into rvc-dev am: a10969bfc5 am: 5362a1e8cd am: f02caa260c am: 4c4297e375 am: 966afaf6ac am: 2fa588f644
Change-Id: I9fea4b414edbf9b1b7603e43ab29dacb79ed3efe
2020-04-21 10:03:17 +00:00
Bonian Chen
ebac1adc4e Merge "[Settings] Refactor test case DataUsageSummaryPreferenceControllerTest" into rvc-dev am: 6fb4a18ded am: f09a56e322 am: 83183d5f48 am: bfda567b89 am: 9434bfaffb
Change-Id: I65f2e52f6727c9b42006ccc43f691f09c0fe874f
2020-04-21 10:03:10 +00:00
Alex Johnston
85a3449c60 Merge "Update Wi-Fi configs restrictions" into rvc-dev am: 56f06c59a1 am: cdc42618c9 am: ab95b8dd1e am: b70f6eab0f am: 9e1f32a1b1
Change-Id: I85407d722d69fc0544bfd2a029508b5e69e927ad
2020-04-21 10:03:02 +00:00