Commit Graph

63327 Commits

Author SHA1 Message Date
PETER LIANG
48e3a68b08 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9 am: 331dee0d24
Change-Id: Iceeaf78b68306e5fb7064ab7e32528b0b762e01c
2020-05-07 11:26:10 +00:00
PETER LIANG
059f2080e3 Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968 am: 7c73bbf233
Change-Id: I2343bab76fd8182835c3710f053426a8fe3b11aa
2020-05-07 11:26:02 +00:00
PETER LIANG
331dee0d24 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev am: 19319b85e9
Change-Id: I465766f88936723b9808795a2c05c2c23e0a5361
2020-05-07 11:12:32 +00:00
PETER LIANG
7c73bbf233 Merge "Correct the string relate to volume shortcut keys." into rvc-dev am: 6804573968
Change-Id: I358ff0b5fac119231eed0aa2386e982ab4b38779
2020-05-07 11:12:07 +00:00
PETER LIANG
19319b85e9 Merge "Revises the strings to meet the the activity-based accessibility feature." into rvc-dev 2020-05-07 10:57:14 +00:00
PETER LIANG
6804573968 Merge "Correct the string relate to volume shortcut keys." into rvc-dev 2020-05-07 10:56:24 +00:00
Edgar Wang
8dae9e21f5 Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b am: 99bb5e0185
Change-Id: I9d2ad36e4fac1a89fba6e8f87811146f90b7cce3
2020-05-07 09:58:47 +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
99bb5e0185 Merge "Revert "Improve multi user settings screen"" into rvc-dev am: e13919cf4b
Change-Id: I7e067881864b96e067d2b763dc41d6b3680750df
2020-05-07 09:45:16 +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
Peter_Liang
a2f5497d69 Correct the string relate to volume shortcut keys.
Bug: 155948561
Test: manual test
Change-Id: I1e7a78fd1feeb87ee5f82157906137c4e169edeb
2020-05-07 17:15:15 +08:00
Yanting Yang
fb88f919b8 Merge "Hide the app details preference for mainline module apps" into rvc-dev am: cf33b4bc5e am: 4b6408bf04
Change-Id: I3ffcb98ff0fe24d4514dcacaf17522d1b14ddf62
2020-05-07 08:51:07 +00:00
Bonian Chen
0f474e2222 Merge "[Settings] Update EID in background" into rvc-dev am: cae9a9c2fb am: e99b4cd4d2
Change-Id: I2732ab500cc07017c69ed6bb71972bbe1a109e48
2020-05-07 08:50:59 +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
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
Peter_Liang
833fae0387 Revises the strings to meet the the activity-based accessibility feature.
Bug: 155249850
Test: manual test
Change-Id: I4c493fb6a0123be87b17d392853d3ae9f3351879
2020-05-07 08:17:51 +00:00
Kevin Maurin
c7e965084f Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 3399305e3c
Change-Id: If1f32060e55635467bdd621d83a2a44eb93364ac
2020-05-07 08:05:13 +00:00
Automerger Merge Worker
1da1e1ffd2 Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp 2020-05-07 08:05:04 +00:00
TreeHugger Robot
da259b456c Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290
Change-Id: I754a17581609ce1a160c6b1eb2d05b1ed51dccf9
2020-05-07 08:05:00 +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
0e72c5acfd Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351
Change-Id: I30155807fafb91a5ea6e65c7ffe181a6241749d6
2020-05-07 05:24:38 +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
52d7bf422a Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: 7e5970daf1
Change-Id: I22e8f7e4607f9cb7cdb65edf76db45ab9a0f1788
2020-05-07 02:56:47 +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
Automerger Merge Worker
b8d272ff2f Merge "Merge "Fix the layout direction problem in RTL locale" into rvc-dev am: a49498f048 am: f837446270" into rvc-d1-dev-plus-aosp 2020-05-07 02:25:24 +00:00