Android/packages_apps_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
69,162 Commits 1 Branch 0 Tags
036e56e33f0a22431d87bd077fe0e1aff92a7dca
Commit Graph

32585 Commits

Author SHA1 Message Date
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
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
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
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
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
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
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
Fabian Kozynski
0f6205e51c Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 am: 0533f91da7 
Change-Id: I5a69a7e8bdb173d1ec05cf3827a2218f95af0932
 2020-05-07 13:51:44 +00:00
Fabian Kozynski
0533f91da7 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev am: 64097cbb11 
Change-Id: I4b18c2f17907a565578e1c1f92f7cf5247a662d7
 2020-05-07 13:37:47 +00:00
Fabian Kozynski
64097cbb11 Merge "Fix default for CONTROLS_ENABLED" into rvc-dev 2020-05-07 13:24:04 +00:00
Bonian Chen
bfdf45e565 [Settings] Code reformat 
Code reformat.

Bug: 155962136
Test: build pass
Change-Id: Icb56f72af925f2b47cd8867156ca12fc9a6e6347
 2020-05-07 19:00:58 +08:00
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
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
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
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
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