Commit Graph

68682 Commits

Author SHA1 Message Date
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
Automerger Merge Worker
0c415cc0f0 Merge "Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: 73148ca2c4" into rvc-qpr-dev-plus-aosp 2020-05-07 08:26:03 +00:00
Kevin Maurin
e952ce941e Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: 73148ca2c4
Change-Id: Ib511a27c290108e956dbb34aed0a50eae543c92c
2020-05-07 08:25:58 +00:00
Kevin Maurin
034a5110a4 Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 3399305e3c am: c7e965084f
Change-Id: I9cc77ec43f46b5d6131cc7e10632bdea72a7b9e9
2020-05-07 08:25:54 +00:00
Automerger Merge Worker
12b02c1d47 Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409" into rvc-qpr-dev-plus-aosp 2020-05-07 08:25:53 +00:00
TreeHugger Robot
5c8c8d5067 Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: 0bfc77b409
Change-Id: I32179b8cc0d83895614c36ef0fb4d0b822d16c08
2020-05-07 08:25:47 +00:00
Automerger Merge Worker
9b09e9877f Merge "Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: a46c391290" into rvc-d1-dev-plus-aosp am: 1da1e1ffd2
Change-Id: I4257530170e27eb0f378ee2c20ac6989f6abd399
2020-05-07 08:25:46 +00:00
Kevin Maurin
2702c9854c Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f am: b890ed1585
Change-Id: Iba4048252df8dd9b4741b91c64145604aa4ebe1a
2020-05-07 08:25:38 +00:00
TreeHugger Robot
e3ac2ebb4c Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059 am: e2db16a44d
Change-Id: I514bccef9d11106069df573dc1d2d6f4fddd84b9
2020-05-07 08:25:24 +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
Peter_Liang
a87a7009b0 Refines the animated image to fit the screen display.
Root cause:
The width and height of animated image are wrap_content. It causes the gif or drawable which are non-transparent background to have a little weird display under dark mode.

Next:
1. Revise the width from wrap_content to match_parent, and add the fit center scale type.
2. Correct the function usage

Bug: 155946967
Test: manual test
Change-Id: I7470efb945a2b3bedb695e1b6f34475c6f190f9d
2020-05-07 08:06:20 +00:00
Kevin Maurin
73148ca2c4 Merge "Display "Android Auto" in Connected Devices summary text." into rvc-dev am: 56cefaf3d6 am: 637a3ba98f
Change-Id: Ic825e6250d56d05fa43f213da7cadcdb82eafe66
2020-05-07 08:05:13 +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
0bfc77b409 Merge "[Wi-Fi] Enhance Wifi Settings unit test cases." into rvc-dev am: a76a871653 am: ee755aa059
Change-Id: Iabc0a24ce26bb01af6084c05eee4bdda21ac987a
2020-05-07 08:04:56 +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
Tim Peng
7fcfac49cf Settings > Sound crashes if no BT
-Replace androidx.lifecycle.LifecycleObserver with com.android.settingslib.core.lifecycle.LifecycleObserver
-Observer is added in DashboardFragment

Bug: 155195625
Test: make -j50 RunSettingsRoboTests
Change-Id: I99c587e4227e81ba521782f92b159051a1cba2d2
2020-05-07 07:06:36 +00:00
Amit Mahajan
4b24985607 [automerger skipped] Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp am: fb93e94d96 am: ec5f9b1a06 -s ours
am skip reason: Change-Id Id634a88060c63d57316cb8cdb923966a8409db78 with SHA-1 46ada586e2 is in history

Change-Id: I6f6574baf3422bd524fd83eb013b505157aa9e3b
2020-05-07 06:50:48 +00:00
Amit Mahajan
ec5f9b1a06 Merge "Remove hard-coding cellbroadcastreceiver package name." into rvc-d1-dev-plus-aosp am: fb93e94d96
Change-Id: I77a5fe0cabed8e5934ec42b4ae0c8476c19163ac
2020-05-07 06:36:01 +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
f3d277f7b6 Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 70537e6699 am: 411e488c2f
Change-Id: Iaa6a24e036d3fac43fa26e57695adb99b464bc50
2020-05-07 05:56:48 +00:00
Bonian Chen
7b4a0be7aa Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 0e72c5acfd am: c0b7f51746
Change-Id: I20953a1e64ca2a8f979386ee25a4e3b109dba461
2020-05-07 05:56:05 +00:00
Bonian Chen
411e488c2f Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 70537e6699
Change-Id: I2507690009ec1f332d8bf68adbb0866120cb3222
2020-05-07 05:55:59 +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
c0b7f51746 Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351 am: 0e72c5acfd
Change-Id: I7810f1182d3b8340fe3a2ca8e6f2fe25fa571dd8
2020-05-07 05:38:30 +00:00
Bonian Chen
4a6d6d3999 Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: cc6375e61d am: 1070fd9eab
Change-Id: Ie05f8e27f57a940619149373c737ae825520b5b5
2020-05-07 05:38:05 +00:00
Bonian Chen
70537e6699 Merge "[Settings] Mobile network not updated based on SIM change" into rvc-dev am: 3a132d7c9a am: 034f54b351
Change-Id: I14d5001743021e81c889b634ac0912d1b9b4a213
2020-05-07 05:24:38 +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
8861c6084e Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: 7e5970daf1 am: 52d7bf422a am: 82024ee55d
Change-Id: I1b72cbfa968ea593af3605764b27ac108fcabe95
2020-05-07 03:29:22 +00:00
tim peng
c535d77089 Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: 4b53d13866 am: 3e2d7e444a
Change-Id: Ic9dc0bc68251e58c4e82e595f066d6d39c27c649
2020-05-07 03:28:16 +00: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
82024ee55d Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: 7e5970daf1 am: 52d7bf422a
Change-Id: I1c0f38b4ec036e5180ecb88f0a0f19609b5d4fa7
2020-05-07 03:12:18 +00:00
tim peng
3e2d7e444a Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: 4b53d13866
Change-Id: Ie37f2c9fd99837d4464179151e7dfd72d96702d7
2020-05-07 03:11:29 +00:00
tim peng
143db43ff4 Merge "Update "Play media to" to "Play <APP> on"" into rvc-dev am: b8e18b4fb1 am: c5531ce6e8 am: d9370a1e27
Change-Id: Ifee8f8a1680de232fbe6032d5b85c79f3a6d5e3a
2020-05-07 03:10:28 +00:00