Commit Graph

9765 Commits

Author SHA1 Message Date
TreeHugger Robot
a2ca682ed8 Merge "[Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test" into rvc-dev am: 93162ce9f4 am: da8eb18b3d am: 010f812a43 am: c8979ad780
Change-Id: I0aadd8848652c9c0cf7363c3d48e9e2f05e9f4c3
2020-04-01 10:44:34 +00:00
Arc Wang
26d3b7dd1b [Wi-Fi] Fix test fails in WifiDetailPreferenceController2Test
Sign in feature is integrated in WifiTraclerLib, change the test cases
to verify if WifiEntry sign in methods is called.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: Ia0157f5a96c700e5596c00cef873c8f5016d6442
2020-04-01 15:25:37 +08:00
Goven Liu
8875f3bdf1 Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev am: 783b0257ad am: 15ff53ecfb am: 4b67490445 am: dbc337b4c5
Change-Id: I07c7dde25a3c28f1ac01151103a4fb0f518655bf
2020-04-01 04:15:29 +00:00
Goven Liu
783b0257ad Merge "[Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test" into rvc-dev 2020-04-01 03:16:34 +00:00
TreeHugger Robot
53c6bfffae Merge "Disable conversation strip setting." into rvc-dev am: 04d64f470e am: 6e9938cf48 am: 0035707d32 am: 85f940b564
Change-Id: Ia73d18279f72e0eaefe73f0053549a4287a68ffa
2020-03-31 21:48:17 +00:00
TreeHugger Robot
04d64f470e Merge "Disable conversation strip setting." into rvc-dev 2020-03-31 19:21:51 +00:00
TreeHugger Robot
ac9e47e275 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev am: d0d3873aa7 am: c5507e6665 am: 0aeda894f3 am: 7a5c9cbfb2
Change-Id: Ib9fd01710ccad4d86e671165295543d73aa7e477
2020-03-31 18:38:31 +00:00
TreeHugger Robot
d0d3873aa7 Merge "Remove policy transparency for cross-profile calendar setting" into rvc-dev 2020-03-31 17:31:16 +00:00
Steve Elliott
8a575029fc Disable conversation strip setting.
Test: manual, robotests
Fixes: 149070144
Fixes: 149001624
Change-Id: I422872e38f7adead81938c39b6084bbc7ed911ae
2020-03-31 13:24:46 -04:00
Bonian Chen
5b4acedda6 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev am: 54002ca154 am: d2fe2c9959 am: fa83a139ca am: c6c4b5def6
Change-Id: I46c047359257ddd5cb3e331add4856b01c5c9739
2020-03-31 17:03:06 +00:00
Bonian Chen
54002ca154 Merge "[Settings] Apply WifiCallingQueryImsState" into rvc-dev 2020-03-31 16:09:27 +00:00
TreeHugger Robot
2391d48238 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev am: 4b45334288 am: 37e6acd9a5 am: 4bcd19b296 am: a7e1794024
Change-Id: Ie27c34c685a035f0751488e95e35ee9cebf980ea
2020-03-31 16:00:34 +00:00
TreeHugger Robot
4b45334288 Merge changes Ia96af86c,Ifbe2ac30 into rvc-dev
* changes:
  [Wi-Fi] Wi-Fi picker scrolls to top after a user clicked to connect
  [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
2020-03-31 15:01:09 +00:00
Kholoud Mohamed
f638279fae Merge "Show all apps that requested cross profile permission" into rvc-dev am: 7fb6f35c3a am: bf7e468f0c am: 3e5e6920eb am: 1910a64cf1
Change-Id: I2b6b7f55b4e3870f54c9f41b360d460c628d638c
2020-03-31 14:26:22 +00:00
Kholoud Mohamed
7fb6f35c3a Merge "Show all apps that requested cross profile permission" into rvc-dev 2020-03-31 13:09:31 +00:00
Alex Kershaw
c364f5d95d Remove policy transparency for cross-profile calendar setting
We will likely deprecate this setting in the next release, to be
replaced by usage of 'connected work and personal apps'. However, we are
keeping it in this release as it's still possible that a lightweight
calendar access API could be useful, if the admin and user approvals are
combined.

For now, the error message that refers to cross-profile calendar when
the setting is disabled is confusing admins, since we're not
recommending usage of this API at this time.

Remove the setting when it is disabled, rather than showing policy
transparency.

Fixes: 143477431
Test: manual
Change-Id: I65573a5ba892e12a4dabcdf23541f33516db0a8a
2020-03-31 11:41:44 +01:00
Arc Wang
3bb3808043 [Wi-Fi] Fix Wi-Fi picker context menu 'Connect' button
1. Display the Wi-Fi dialog with MODE_CONNECT.
2. Connect with the WifiConfiguration from
   WifiConfigController2#getConfig() if it's available.

Bug: 152826354
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiSettings2
Change-Id: Ifbe2ac30b1c37c8eab3227ac0561fdd2de5cb706
2020-03-31 17:01:22 +08:00
govenliu
f9651d92bb [Wi-Fi] Remove 5 unit tests in WifiDetailPreferenceController2Test
Fix 5 @Ignore unit tests in WifiDetailPreferenceController2Test.

Bug: 151696220
Test: Run make RunSettingsRoboTests ROBOTEST_FILTER=WifiDetailPreferenceController2Test
Change-Id: I5f64bf455d6a2505f546e2c7a3ba0caddf3f16cc
2020-03-31 16:42:58 +08:00
Bonian Chen
a2411f9c3c Merge "[Settings] Code Refactor" into rvc-dev am: 268bdc12c6 am: 949ec8a1f0 am: 9e9597f7d8 am: 3c4dffc470
Change-Id: I45977c850977be84c0dc1f6461e68a1941efc1a2
2020-03-31 07:29:37 +00:00
Bonian Chen
7520adccee [Settings] Apply WifiCallingQueryImsState
Apply design of WifiCallingQueryImsState to source code which accessing
WifiCalling.

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSliceHelperTest

Change-Id: I0db966742d63cfe9a1ef4e1b06f6b5c81f681927
2020-03-31 14:40:18 +08:00
Jason Chang
24b7398a19 Merge "New Settings preference for One Handed mode" 2020-03-31 05:58:30 +00:00
TreeHugger Robot
76d2bd2f1c Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev am: 477c4fef48 am: 2093f0dee4 am: 1e2a313c5a am: ab9a994fcd
Change-Id: I8982dfc9a4ea527f210e5634035e6b391f4c4945
2020-03-31 05:21:32 +00:00
tim peng
85cbce813c Merge "No media status is visible in Output Switcher" into rvc-dev am: 5b0913c2b6 am: 4a82a5abb5 am: 2b47660696 am: f8c57507e2
Change-Id: I4c9eaaf3b244f657bb6cc32a31526b22f535a20a
2020-03-31 05:20:51 +00:00
TreeHugger Robot
cfcc352af6 Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev am: a2d56af9bd am: ea63b90c3d am: 4b997ee9fd am: 599f02eab1
Change-Id: I9349594dd1e6e65c441f45563b7add8453ae5aea
2020-03-31 05:03:23 +00:00
TreeHugger Robot
bc1687c94f Merge "Don't filter demoted conversation from app subtext" into rvc-dev am: 6f837d10bf am: f61da397fd am: 8b94c0e4a3 am: 1b29a5a2ba
Change-Id: Ia90ec22e76476867615f4482e27c55434e50bb10
2020-03-31 05:01:12 +00:00
Julia Reynolds
139f0ccf07 Merge "Conversations can't individually bypass dnd" into rvc-dev am: b3f2c0d528 am: 6d30804cec am: 639b6f89ea am: 41874f9f73
Change-Id: Ic0b0645779a3ca80c841b83c21f2f93cc2bdf5c5
2020-03-31 05:00:16 +00:00
Bonian Chen
21475ae6c6 [Settings] Code Refactor
Code refactor in order to support auto testing

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest

Change-Id: I2427732435b59d7359a102e0dd56317ac6a024b4
2020-03-31 03:46:45 +00:00
TreeHugger Robot
477c4fef48 Merge "[Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest" into rvc-dev 2020-03-31 02:34:51 +00:00
tim peng
5b0913c2b6 Merge "No media status is visible in Output Switcher" into rvc-dev 2020-03-31 02:04:48 +00:00
TreeHugger Robot
a2d56af9bd Merge "Set face unlock toggle to unchecked when disabled by admin" into rvc-dev 2020-03-30 21:07:15 +00:00
kholoud mohamed
4d0edf369f Show all apps that requested cross profile permission
show all apps that requested the permission, show the admin
restricted dialog if the app is not whitelisted by the admin,
and show a link to install the app if the app is missing in one
of the profiles.

Bug: 149742043
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesPreferenceControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesControllerTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesSettingsTest
Test: make RunSettingsRoboTests ROBOTEST_FILTER=InteractAcrossProfilesDetailsTest

Change-Id: I2bc86b9966a2e14a12ee8f4b7f1b75f866ed98e3
2020-03-30 21:10:40 +01:00
TreeHugger Robot
6f837d10bf Merge "Don't filter demoted conversation from app subtext" into rvc-dev 2020-03-30 20:03:45 +00:00
Julia Reynolds
b3f2c0d528 Merge "Conversations can't individually bypass dnd" into rvc-dev 2020-03-30 19:57:48 +00:00
Yanting Yang
7cfc3a4212 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev am: ad4405d0f8 am: d8f14f11b0 am: 6b42c0780e am: c3716819c6 am: 126b9e9a44
Change-Id: I61ab316ad024e9fe8b143e24f6e5ea24ae85418b
2020-03-30 19:04:41 +00:00
Bonian Chen
a326e2ebf7 [Settings] Replace ImsManager#isVtEnabledByPlatform() am: fb7274a308 am: a6d6285b57 am: 4b42ba7807 am: f667a40821 am: 1de29efee7
Change-Id: I29cc7573f5082a777e7091e5eaf38f2ea77362b2
2020-03-30 19:01:22 +00:00
tim peng
486d40c058 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev am: ecea133904 am: 15ac2b2c8e am: 0f89b27f0b am: 2f01748123 am: d609a20248
Change-Id: I3c352f9594780c78fed46b23824b951ab33977ef
2020-03-30 19:01:05 +00:00
Bonian Chen
81ba423323 [Settings] Replace ImsManager#isWfcEnabledByPlatform() am: c134ef08d4 am: 9c4d1190d9 am: 712c3aa944 am: 7fe5ab1aea am: 65697d3d0e
Change-Id: I0d5dcfc33b0bddacf059d1fb9af559646e32e68a
2020-03-30 19:00:47 +00:00
tim peng
c78d096058 Merge "Add zero state in output switcher" into rvc-dev am: ddd8a8fa92 am: 3e73d0f92c am: d5bdc55390 am: 18d42df80b am: 15e38e66ac
Change-Id: I51152fb023e63d1ad795d095e26434cb35cacee4
2020-03-30 19:00:24 +00:00
Beverly
ef2c91c9a3 Don't filter demoted conversation from app subtext
If the notification channel is a demoted converation, we still want to
include it as a notification channel that can bypass DND under the
"apps" preference for DND.

Test: manual, make RunSettingsRoboTests7
Fixes: 152765113
Change-Id: Ief072b19280b0dc6e6c37d2d46d51f045d42bb4e
2020-03-30 14:01:38 -04:00
Julia Reynolds
56d0f6b03a Conversations can't individually bypass dnd
Test: atest
Fixes: 152482973
Change-Id: I19432b79724beca46974c1c88d42a231f0703dc7
2020-03-30 13:18:38 -04:00
Yanting Yang
ad4405d0f8 Merge "Add custom site map pairs into SettingsSearchIndexablesProvider" into rvc-dev 2020-03-30 15:15:06 +00:00
Arc Wang
3aee35a882 [Wi-Fi] Fix a unit test fail in WifiMasterSwitchPreferenceControllerTest
In ag/10785119, WifiStatusTracker#setListening calls
ConnectivityManager#unregisterNetworkCallback twice.
Modify the fail test to match it.

Bug: 151696220
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiMasterSwitchPreferenceControllerTest
Change-Id: Idd9917ce204e2abbc4bfbf760222191adadf4afa
2020-03-30 22:07:21 +08:00
Rubin Xu
fbfba7a078 Set face unlock toggle to unchecked when disabled by admin
Bug: 135747161
Test: make RunSettingsRoboTests
    ROBOTEST_FILTER=FaceSettingsLockscreenBypassPreferenceControllerTest
Change-Id: I1e3d105184a14bfece972abb096eac44bd186273
2020-03-30 12:33:57 +01:00
Tim Peng
3ac144163e No media status is visible in Output Switcher
-Reflash header when get latest media controller

Bug: 152606491
Test: make -j42 RunSettingsRoboTests
Change-Id: I14542a7f8ba921c9d1dbaacf7e01c3ee673527b2
2020-03-30 16:20:14 +08:00
Bonian Chen
fb7274a308 [Settings] Replace ImsManager#isVtEnabledByPlatform()
Replace ImsManager#isVtEnabledByPlatform() by
ImsMmTelManager.isSupported().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=VideoCallingPreferenceControllerTest

Change-Id: Ife5100ef288fbad6fc818e8fbdf8192c42d495b2
2020-03-30 07:41:29 +00:00
tim peng
ecea133904 Merge "PendingIntent in MediaOutputIndicatorSlice could be Hijacked" into rvc-dev 2020-03-30 06:56:16 +00:00
Tim Peng
e4ccbbec67 PendingIntent in MediaOutputIndicatorSlice could be Hijacked
-Add setPackage() to prevent local information disclosure

Bug: 151645695
Test: make -j42 RunSettingsRoboTests
Change-Id: I74c058a381fceb85695dd76d354fb49f878f9142
2020-03-30 03:53:02 +00:00
Bonian Chen
c134ef08d4 [Settings] Replace ImsManager#isWfcEnabledByPlatform()
Replace ImsManager#isWfcEnabledByPlatform().

Bug:  140542283
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingSettingsForSubTest
Test: m RunSettingsRoboTests -j ROBOTEST_FILTER=WifiCallingSettingsTest
Test: m RunSettingsRoboTests -j
ROBOTEST_FILTER=WifiCallingPreferenceControllerTest

Change-Id: I85907efb39aecdb3fb18cacf11ce4510b898edc4
2020-03-30 03:34:01 +00:00
tim peng
ddd8a8fa92 Merge "Add zero state in output switcher" into rvc-dev 2020-03-30 02:54:33 +00:00
Julia Reynolds
d9fe7b36d3 Merge "Fix broken test" into rvc-dev am: 5a950b763f am: 275f372a72 am: ade39e479f am: 364690d789
Change-Id: I0afef276606a4784d0d33bc09f8c133478185e66
2020-03-27 16:50:57 +00:00