Commit Graph

68454 Commits

Author SHA1 Message Date
TreeHugger Robot
77573ddec7 Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: 7b58b02285 am: 6e771fdf55 am: 539843c31a
Change-Id: I72dc5f0d5d0764903de89bbff745b5466090db78
2020-05-08 03:45:47 +00:00
TreeHugger Robot
539843c31a Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: 7b58b02285 am: 6e771fdf55
Change-Id: I1c90668531b0322bec89dbe7bad0ede0c5faaceb
2020-05-08 03:16:58 +00:00
TreeHugger Robot
6e771fdf55 Merge "Improve multi user settings screen" into rvc-dev am: e26de87100 am: 7b58b02285
Change-Id: Id1d4164aa31c51e9d7a1f160be22eb759a2f0060
2020-05-08 03:06:28 +00:00
tim peng
a16583dae5 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 20f3e0bf29 am: 9a924b03ca am: 4a8ed87e94
Change-Id: I0856e922123190b975b206deb474694cacbc5ed6
2020-05-08 03:06:15 +00:00
tim peng
4a8ed87e94 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 20f3e0bf29 am: 9a924b03ca
Change-Id: I6923505b7a618e76ed96b9a28c1029688eb6350d
2020-05-08 02:48:08 +00:00
TreeHugger Robot
7b58b02285 Merge "Improve multi user settings screen" into rvc-dev am: e26de87100
Change-Id: I248a2b3ed0e09f11838e1530167fd39a3a93f120
2020-05-08 02:48:04 +00:00
tim peng
9a924b03ca Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f am: 20f3e0bf29
Change-Id: I45eda56fcfbd1aba23bc8068ad3a5f0bf511e379
2020-05-08 02:34:03 +00:00
TreeHugger Robot
e26de87100 Merge "Improve multi user settings screen" into rvc-dev 2020-05-08 02:32:36 +00:00
tim peng
20f3e0bf29 Merge "Settings > Sound crashes if no BT" into rvc-dev am: 0b60b3cc9f
Change-Id: I7c38b3c4697a8438eba6338144339b3446356929
2020-05-08 02:11:14 +00:00
tim peng
0b60b3cc9f Merge "Settings > Sound crashes if no BT" into rvc-dev 2020-05-08 01:55:28 +00:00
Arc Wang
ecf20ef23f Merge "[Wi-Fi] Apply WifiTrackerLib objects in wifi/dpp/WifiNetworkListFragment" 2020-05-08 01:02:44 +00:00
Andras Kloczl
4d7d4effa5 Improve multi user settings screen
- Added switch and user delete functionality to details screen.
- Added robo tests.

Screenshots: http://shortn/_S6fbIMhAYO
Bug: 142798722
Test: Run robo tests with this command:
  make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.users.*SettingsTest"
Change-Id: Ied67290e8fed87feb0a60a3f2c40eb91cc57988e
2020-05-07 22:01:33 +01:00
TreeHugger Robot
9c0ab6d713 [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 am: 7b0f05bc69 -s ours am: b2022e37cc -s ours am: a30f1a7418 -s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 cba6d9f67a is in history

Change-Id: If8ec70641aae190f8610ba3ee71a4fade8393e84
2020-05-07 20:45:24 +00:00
TreeHugger Robot
a30f1a7418 [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 am: 7b0f05bc69 -s ours am: b2022e37cc -s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 cba6d9f67a is in history

Change-Id: I0e0f8014dc01a33bf3921b5ad027c5187f0b5e83
2020-05-07 20:33:07 +00:00
TreeHugger Robot
b2022e37cc [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20 am: 7b0f05bc69 -s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 cba6d9f67a is in history

Change-Id: Ica393caf66b41774a231485babae181e6628d3d0
2020-05-07 20:19:40 +00:00
TreeHugger Robot
7b0f05bc69 Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev am: 5625958a20
Change-Id: Idf87ba7845ed12d1445498f4370d32837801327a
2020-05-07 19:59:53 +00:00
TreeHugger Robot
5625958a20 Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-dev 2020-05-07 19:50:33 +00:00
Bonian Chen
feb2822f5a Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: 6b2291f1cc am: 68bdeadd34 am: 9684e06b69
Change-Id: Idca7ea8cc3af6ecb5b919e131f45e78060a011d5
2020-05-07 17:20:09 +00:00
PETER LIANG
c1acb08a29 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: 819246c3b7 am: 067c105020 am: 4e2fa523d2
Change-Id: I041904abb5e733ba944f31c9bf5b2e2b6b8f4a07
2020-05-07 17:20:02 +00:00
Automerger Merge Worker
2bf6010d85 Merge "Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc am: 57998a10e6" into rvc-qpr-dev-plus-aosp am: a2ce3ddd66
Change-Id: I4f64502574098c2e497b0a7c16ad84a9792ebe68
2020-05-07 17:19:56 +00:00
Bonian Chen
1048de1ad1 Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc am: ffda9f5903 am: 6fcba23f84
Change-Id: I37c8d74100a1ffb020de103cff9a684a8122ae74
2020-05-07 17:19:40 +00:00
PETER LIANG
60d264ede9 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: e324e709b7 am: 10c1a18d66 am: 58e213e828
Change-Id: Ief336a3ec785c981861edf1669d610c7e6a59431
2020-05-07 17:19:20 +00:00
PETER LIANG
7bf1f61f94 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: e324e709b7 am: 168c541b9c am: b3fe365e49
Change-Id: I0d6e0332891f44f0dbaddf14a30a221c8c65fe0f
2020-05-07 17:19:02 +00:00
Bonian Chen
9684e06b69 Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: 6b2291f1cc am: 68bdeadd34
Change-Id: I98aebb607ff3ca4e5807162f6792957b691c08a4
2020-05-07 17:05:40 +00:00
PETER LIANG
4e2fa523d2 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: 819246c3b7 am: 067c105020
Change-Id: I415fd89c42bffc6e37ddecca6d35a1e25a3a374d
2020-05-07 17:05:27 +00:00
Automerger Merge Worker
a2ce3ddd66 Merge "Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc am: 57998a10e6" into rvc-qpr-dev-plus-aosp 2020-05-07 17:05:21 +00:00
Bonian Chen
cb5604e586 Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc am: 57998a10e6
Change-Id: I2adbe07404a77aef45d96ace0cf08f91e32aea63
2020-05-07 17:05:16 +00:00
Bonian Chen
6fcba23f84 Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc am: ffda9f5903
Change-Id: I22cadc5ef99d405ecf3bf5f43d4cae871e7c7ba3
2020-05-07 17:05:14 +00:00
PETER LIANG
58e213e828 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: e324e709b7 am: 10c1a18d66
Change-Id: I3720b3e6ef906929e08d6ec79603c2d5d80ede77
2020-05-07 17:05:03 +00:00
PETER LIANG
b3fe365e49 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: e324e709b7 am: 168c541b9c
Change-Id: I256536fe43a5fcb87cbdc209b87a38ad3cafe96c
2020-05-07 17:04:54 +00:00
Bonian Chen
68bdeadd34 Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: 6b2291f1cc
Change-Id: I1f3784eed1f35cd447b6358e1fcb6a7eafde6c54
2020-05-07 16:50:41 +00:00
Bonian Chen
ffda9f5903 Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc
Change-Id: I62110f51d13fd8af03f77463f59213bfe021f26c
2020-05-07 16:50:37 +00:00
PETER LIANG
067c105020 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: 819246c3b7
Change-Id: I19e30976e884763aeed6969ee9d9f2b521265a2a
2020-05-07 16:50:22 +00:00
Bonian Chen
57998a10e6 Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901 am: fcfb72f8fc
Change-Id: Ic7434542efaea8559e3f4e87a8db83b517e74e56
2020-05-07 16:50:14 +00:00
PETER LIANG
168c541b9c Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: e324e709b7
Change-Id: I98879df31d290b4733ddd8ca094699443754d921
2020-05-07 16:50:13 +00:00
PETER LIANG
10c1a18d66 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199 am: e324e709b7
Change-Id: I2c9be2ca7d205edb289fe4c07711fad9c8b787e4
2020-05-07 16:49:57 +00:00
Bonian Chen
6b2291f1cc Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901
Change-Id: I06338f0d24f11c64f630da955cf67ce49ac6b64d
2020-05-07 16:35:30 +00:00
Bonian Chen
fcfb72f8fc Merge "[Settings] Code reformat" into rvc-dev am: 73d3367901
Change-Id: I49229b925f740834e9279a83d37dde952066cba3
2020-05-07 16:35:09 +00:00
Bonian Chen
73d3367901 Merge "[Settings] Code reformat" into rvc-dev 2020-05-07 16:34:16 +00:00
PETER LIANG
819246c3b7 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199
Change-Id: Ib4c8daaa81c140e852e2dab78e2b87a044a3caf4
2020-05-07 16:28:50 +00:00
PETER LIANG
e324e709b7 Merge "Refines the animated image to fit the screen display." into rvc-dev am: dd1e66c199
Change-Id: I5df2f7d3612db3b03e3637c34b8a6f0a5490b3b1
2020-05-07 16:28:18 +00:00
PETER LIANG
dd1e66c199 Merge "Refines the animated image to fit the screen display." into rvc-dev 2020-05-07 16:11:22 +00:00
Fabian Kozynski
e189d40cb7 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 am: 140b6479d0 am: 85fba9badb
Change-Id: I23345689712d784aac041d2e52af8a8a1dc24345
2020-05-07 14:39:17 +00:00
Fabian Kozynski
161ccc84b6 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: bb87fb6954 am: 31c4bfd74f am: 39d67d5b71
Change-Id: I38421189d0fbd141f9d61596fde6a9c5c76a1131
2020-05-07 14:39:10 +00:00
Fabian Kozynski
1cefc2e23b Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 am: 0f6205e51c am: 8d36410fa5
Change-Id: I52e968e2d8f3bfa63a2b1cef0ca6c38058199de8
2020-05-07 14:38:59 +00:00
Arc Wang
e46081819d [Wi-Fi] Apply WifiTrackerLib objects in wifi/dpp/WifiNetworkListFragment
Bug: 152571756
Bug: 145100890
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiNetworkListFragmentTest
Change-Id: I2136b452da4a3008f493c46c8ed14b311cfc9fdd
2020-05-07 22:36:41 +08:00
Fabian Kozynski
85fba9badb Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 am: 140b6479d0
Change-Id: I211e105cd84d2358173db80da975d54e08f3f8bb
2020-05-07 14:16:15 +00:00
Fabian Kozynski
39d67d5b71 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: bb87fb6954 am: 31c4bfd74f
Change-Id: I5071fccd6fab9f39df3cabada7fbacf35c800f0c
2020-05-07 14:16:02 +00:00
Fabian Kozynski
8d36410fa5 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 am: 0f6205e51c
Change-Id: I6dce02773b2312f6a17671f98b37387bbf6d7aec
2020-05-07 14:15:55 +00:00
Fabian Kozynski
140b6479d0 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7
Change-Id: I3c8f41e68c2cac18354b0564bf0ad7ceebeea4f8
2020-05-07 13:52:08 +00:00