Edgar Wang
214ecd8bd0
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
am: bbf642d994
am: b846480e48
am: 043510b53f
...
Change-Id: Ic4fa3990c3de69652d989af8769b32b407577c78
2020-05-07 10:27:03 +00:00
Edgar Wang
b846480e48
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
am: bbf642d994
...
Change-Id: I21074e3587dd21ca9b4105f4023d54a7f7d39588
2020-05-07 09:56:51 +00:00
Edgar Wang
bbf642d994
Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
...
Change-Id: I057a3f120e9664fd4764599e14b6d136da56da85
2020-05-07 09:45:37 +00:00
Edgar Wang
e13919cf4b
Merge "Revert "Improve multi user settings screen"" into rvc-dev
2020-05-07 09:28:23 +00:00
Edgar Wang
fff8c56de2
Revert "Improve multi user settings screen"
...
This reverts commit d19dc306dd
.
Reason for revert: this CL made Settings the test cases called shadowUserManager.hasUserRestriction()
https://sponge.corp.google.com/target?show=FAILED&sortBy=STATUS&id=07150153-ccb7-4215-a9f8-eed31e44c66f&target=RunSettingsRoboTests1-test-output
Bug: 142798722
Change-Id: I3937a07ee35a472cadd6db8cd0177e08e63516a4
2020-05-07 09:24:47 +00:00
Yanting Yang
b9835b33cd
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e
am: 2b19585228
am: 1b31829303
am: f37203cd17
...
Change-Id: Id2ce67830253759790269b87a804157c0f2873dc
2020-05-07 09:06:21 +00:00
Bonian Chen
5d856c1cfd
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb
am: 156ea15bb2
am: a3409e66df
am: 1e79e1d398
...
Change-Id: I2dde3ff7933a9aa466598e58d9ef2d628cefc250
2020-05-07 09:03:09 +00:00
Yanting Yang
1b31829303
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e
am: 2b19585228
...
Change-Id: I81df0d9ae0569ac1833364cdd855b485c83c0454
2020-05-07 08:50:49 +00:00
Bonian Chen
a3409e66df
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb
am: 156ea15bb2
...
Change-Id: Ief6c86ab582be7b4c912cb4d8fdbd366ae1f3afb
2020-05-07 08:50:42 +00:00
Yanting Yang
2b19585228
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e
...
Change-Id: I286857cb2b2f65581e23d5abc4eb970004db324e
2020-05-07 08:44:54 +00:00
Yanting Yang
4b6408bf04
Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e
...
Change-Id: I421103706198203fb7e25aff4a380c0b0ede8df7
2020-05-07 08:44:51 +00:00
Kevin Maurin
633986bade
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6
am: 637a3ba98f
am: b890ed1585
am: 2702c9854c
...
Change-Id: I8df5851f3d845c16207dc7dccdbac8e2a59b54bc
2020-05-07 08:44:51 +00:00
TreeHugger Robot
d3db94ab0e
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653
am: ee755aa059
am: e2db16a44d
am: e3ac2ebb4c
...
Change-Id: Id3cdd5772a23470f506a790f1e2cc264f4ee7f1d
2020-05-07 08:44:32 +00:00
Yanting Yang
cf33b4bc5e
Merge "Hide the app details preference for mainline module apps" into rvc-dev
2020-05-07 08:41:39 +00:00
Bonian Chen
e99b4cd4d2
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb
...
Change-Id: I57d9f61803f827ff6dda7b9719a58cdb8df65981
2020-05-07 08:32:57 +00:00
Bonian Chen
156ea15bb2
Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb
...
Change-Id: I3f7c90b0784f435f11c66a43d60044fbf29527d4
2020-05-07 08:32:42 +00:00
Bonian Chen
cae9a9c2fb
Merge "[Settings] Update EID in background" into rvc-dev
2020-05-07 08:20:58 +00:00
Kevin Maurin
b890ed1585
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6
am: 637a3ba98f
...
Change-Id: Ie6e40209428eb4efb0c631e01484629b87a278bb
2020-05-07 08:04:58 +00:00
TreeHugger Robot
e2db16a44d
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653
am: ee755aa059
...
Change-Id: I5f20a30532f42f208b3f54a3ee7959ac29e9a238
2020-05-07 08:04:47 +00:00
Kevin Maurin
3399305e3c
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6
...
Change-Id: Ide4aac5f2c860a1767142d324776472e024f5d37
2020-05-07 07:25:47 +00:00
Kevin Maurin
637a3ba98f
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6
...
Change-Id: Idd58f6a25ec91775be52e64766df90fba87cde30
2020-05-07 07:25:34 +00:00
TreeHugger Robot
a46c391290
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653
...
Change-Id: I72bcb5f87ef542de83de5c7366ec82be10ff1480
2020-05-07 07:25:31 +00:00
TreeHugger Robot
ee755aa059
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653
...
Change-Id: Ie641bd25dffe9efeaaf25aa73edf30d80a3972e9
2020-05-07 07:25:23 +00:00
Kevin Maurin
56cefaf3d6
Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev
2020-05-07 07:20:57 +00:00
TreeHugger Robot
a76a871653
Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev
2020-05-07 07:11:32 +00:00
Bonian Chen
d1c8d2a771
[Settings] Update EID in background
...
Access EID in background thread to avoid blocking UI.
Bug: 153407357
Test: make RunSettingsRoboTests -j ROBOTEST_FILTER=SimStatusDialogControllerTest
Change-Id: Id30851bbd0b0fe080ed703586f9718be8b97abdd
2020-05-07 14:16:59 +08:00
Amit Mahajan
fb93e94d96
Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp
2020-05-07 06:09:06 +00:00
Bonian Chen
78ebcb372a
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a
am: cc6375e61d
am: 1070fd9eab
am: 4a6d6d3999
...
Change-Id: Ic1aaeeb35cfd81dca7dacb7d088b84c87e95066b
2020-05-07 05:55:14 +00:00
Bonian Chen
1070fd9eab
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a
am: cc6375e61d
...
Change-Id: I8ab7ac27b88fe10008490196587d22aef53daa1d
2020-05-07 05:22:04 +00:00
Bonian Chen
cc6375e61d
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a
...
Change-Id: Ifc2f3a614b42cb04bfeb3bd4123db0fca6fc0a3a
2020-05-07 05:07:09 +00:00
Bonian Chen
034f54b351
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a
...
Change-Id: I3aff01da1dc0e29b0da818784ee44f3b7a58c7bc
2020-05-07 05:06:56 +00:00
Bonian Chen
3a132d7c9a
Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev
2020-05-07 04:48:02 +00:00
Kevin Maurin
cabe76debc
Display "Android Auto" in Connected Devices summary text.
...
Android Auto will be exposing a Settings tile under Connected Devices -> Connection Preferences.
If the Setting tile is available, then the summary text will reflect that.
Tested with additional unit tests and manually validated the scenarios by
flashing crosshatch-eng and disabling/enabling the relevant features.
Fix: 153896447
Test: Added unit coverage for new scenarios
Test: make RunSettingsRoboTests
Test: manually verified by flashing crosshatch-eng and disabling/enabling relevant components
Change-Id: I5a129c41b98ba435bc159a72c9a7c2dfd646ecd3
2020-05-06 21:42:43 -07:00
govenliu
1e0d40f2bd
[Wi-Fi] Enhance Wifi Settings unit test cases.
...
Add new unit test cases in
1. WifiP2pSettingsTest.java
2. WifiConfigController2Test.java
3. WifiP2PPreferenceControllerTest.java
4. WifiP2pPeerTest.java
the coverage rate of
1. com.android.settings.wifi will raise from 44% to 45%
2. com.android.settings.wifi.P2p will raise from 69% to 85%
Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pSettingsTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiConfigController2Test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2pPeerTest
make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I365494e1654376b23b08f18b1a799ffc59323a4c
2020-05-07 12:13:02 +08:00
tim peng
d499737462
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1
am: c5531ce6e8
am: d9370a1e27
am: 143db43ff4
...
Change-Id: I345f7f76088d9667515da8133315d74c6348e25a
2020-05-07 03:27:11 +00:00
tim peng
d9370a1e27
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1
am: c5531ce6e8
...
Change-Id: I257c18cd639c24356b2d2247d8754aeefceb13b7
2020-05-07 02:56:00 +00:00
tim peng
7e5970daf1
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1
...
Change-Id: Id51f3fe5b3584f5c2a99ef0bbf74a5f5b1d42c6c
2020-05-07 02:45:55 +00:00
tim peng
c5531ce6e8
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1
...
Change-Id: I33f5accb6c2ec61bb9fd33fd77bbfaab4d4f3aff
2020-05-07 02:45:38 +00:00
tim peng
b8e18b4fb1
Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev
2020-05-07 02:33:19 +00:00
Amit Mahajan
cba6d9f67a
Remove hard-coding cellbroadcastreceiver package name.
...
Test: manual
Bug: 154436403
Change-Id: Id634a88060c63d57316cb8cdb923966a8409db78
Merged-in: Id634a88060c63d57316cb8cdb923966a8409db78
2020-05-06 22:05:33 +00:00
Amit Mahajan
0f4dd825cc
Merge "Remove hard-coding cellbroadcastreceiver package name."
2020-05-06 19:34:44 +00:00
TreeHugger Robot
c8c6d9d9f6
Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f
am: 3510f88fee
am: eb70670e94
am: aadc3f4d35
...
Change-Id: Ie069fff86cd1ec1ece739ec80af24f31d8bd5120
2020-05-06 18:41:26 +00:00
TreeHugger Robot
aadc3f4d35
Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f
am: 3510f88fee
am: eb70670e94
...
Change-Id: Iec36bca6eac33855a0de4beae8336dec0abb7644
2020-05-06 18:15:09 +00:00
TreeHugger Robot
ccf93d56ac
Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f
am: 9402a42f7d
...
Change-Id: Id305a4a33bab7f29ad3a88096fceff3ff164e002
2020-05-06 17:59:20 +00:00
TreeHugger Robot
3510f88fee
Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f
...
Change-Id: Id0653205db41cbf871912bcb39229e347a96da65
2020-05-06 17:46:45 +00:00
TreeHugger Robot
9402a42f7d
Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev am: cb8be1de6f
...
Change-Id: I598ced5f91857383375b406105b3f81efad2f59b
2020-05-06 17:46:34 +00:00
TreeHugger Robot
cb8be1de6f
Merge "Fix the tutorial title is inconsistent with the description under Talkback." into rvc-dev
2020-05-06 17:32:07 +00:00
Marco Ballesio
6247ede453
Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a
am: e4b0a92474
am: 0e98dfb6d3
am: 3121cebe76
...
Change-Id: I6c38b7db2be0eeda0d3b5fc8f557690825228d20
2020-05-06 17:27:55 +00:00
Marco Ballesio
0e98dfb6d3
Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a
am: e4b0a92474
...
Change-Id: I412df7cad4269ab10ab97923af5685141b75ac19
2020-05-06 17:01:57 +00:00
Marco Ballesio
e4b0a92474
Merge "Developer option for the app freezer" into rvc-dev am: 97483a978a
...
Change-Id: I97ad96ca8a9c2245dd1f8597a440985be5c19731
2020-05-06 16:50:24 +00:00