Commit Graph

15329 Commits

Author SHA1 Message Date
Evan Chen
dfa303480e Merge "Update bluetooth setting for AssociationInfo" 2022-01-10 18:06:50 +00:00
Yuri Ufimtsev
2e8a9b292d Merge "Refactor some Preference Controllers to use BasePreferenceController" 2022-01-10 14:48:13 +00:00
Yuri Ufimtsev
cdc2677cd1 Refactor some Preference Controllers to use BasePreferenceController
Test: atest SettingsUnitTests
Change-Id: Ic93f29d6c35cb1a43937fa7bf2f1e2d489cdd09f
2022-01-10 13:25:13 +00:00
Yasin Kilicdere
7eeb727614 Merge "Add logging for settings entrypoint to add supervised user." 2022-01-07 20:58:14 +00:00
TreeHugger Robot
18528bce0d Merge "Disable startup provider due to resource loading issue" 2022-01-07 06:15:13 +00:00
刘琼
41ed094bdc Disable startup provider due to resource loading issue
When run UT case with atest SettingsUnitTests, test failed due to
"Unable to get provider androidx.startup.InitializationProvider: android.content.res.Resources$NotFoundException".

Bug: 208883742
Test: atest SettingsUnitTests
Change-Id: I9843b01fb9d3c2a64e7b52080b2594703cee78a6
2022-01-07 12:13:56 +08:00
Betty Chang
6c59266ef4 Merge "Add Enterprise restriction check for Wi-Fi QR code sharing" 2022-01-07 01:51:56 +00:00
Yasin Kilicdere
3a0ebebac4 Add logging for settings entrypoint to add supervised user.
Bug: 213442701
Test: croot && make RunSettingsRoboTests -j40 ROBOTEST_FILTER="com.android.settings.users.UserSettingsTest"
Change-Id: Ie6110b0ef5c16c9f83e3d939f78f21f003e55e35
2022-01-06 23:21:59 +00:00
Weng Su
9bd8f046a9 Fix WifiDialogActivityTest broken
- The ShadowWifiManager class is not working as expected

- Use Mockito class instead of Shadow class

Bug: 175369329
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDialogActivityTest

Change-Id: Idbc851c4d9702be23561c2c48c9d7d077e5f452e
2022-01-06 08:45:40 +00:00
changbetty
c13303c585 Add Enterprise restriction check for Wi-Fi QR code sharing
- In the Internet Picker, if a user tries to long press on the SSIDs
   that cannot be shared, the “Share” option should disappear.

Bug: 203169712
Test: make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest
Change-Id: Iea5a25ba80f29be59c39988bba0dcc4689585461
2022-01-06 07:56:40 +00:00
TreeHugger Robot
1cbb603d60 Merge "FRP bypass defense in the settings app" 2022-01-05 05:37:51 +00:00
Tsung-Mao Fang
07dd833a6a FRP bypass defense in the settings app
Over the last few years, there have been a number of
Factory Reset Protection bypass bugs in the SUW flow.
It's unlikely to defense all points from individual apps.

Therefore, we decide to block some critical pages when
user doesn't complete the SUW flow.

Test: Can't open the certain pages in the suw flow.
Fix: 200746457
Bug: 202975040
Fix: 213091525
Fix: 213090835
Fix: 201561699
Fix: 213090827
Fix: 213090875
Change-Id: Ia18f367109df5af7da0a5acad7702898a459d32e
2022-01-05 12:10:00 +08:00
Stanley Wang
c35cab1c7b Merge "Fix the problem that some items can't be searched in Privacy category." 2022-01-05 01:52:31 +00:00
Michael Groover
d1f76eea72 Merge "Add unaudited exported flag to exposed runtime receivers" 2022-01-03 17:35:02 +00:00
Betty Chang
fe76826c73 Merge "To disable Wi-Fi Direct when user restriction is set" 2021-12-29 09:55:00 +00:00
Weng Su
03f3d9cbe5 Merge "Check WiFi restrictions for WiFi QR code intent" 2021-12-29 09:19:50 +00:00
changbetty
a639d26660 To disable Wi-Fi Direct when user restriction is set
- Remove the Location check for Wi-Fi Direct
 - Add user restriction check for Wi-Fi Direct

Bug: 204288318
Bug: 203170358
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiP2PPreferenceControllerTest
Change-Id: I64dab964b485665dd42c933d8974aeda47f178fe
2021-12-29 07:20:15 +00:00
Weng Su
0219dc1378 Fix WiFi toggle issue of Internet Settings
- Because b/209906859 needs to add WiFi service check for WiFi-less
pixel project.

- But mWifiManager has not been initialized before the
addWifiSwitchPreferenceController() function, which will cause the
controller to not handle the WiFi switching UI.

- Add a hasWifiManager() function to initialize the WiFi manager and
handle related functions.

Bug: 212211915
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=NetworkProviderSettingsTest

Change-Id: Idc0d4cdc31403f0ab9a4eb787e4c70be605f7ddb
2021-12-28 21:29:45 +08:00
Tom Hsu
8551b0d7c5 Merge "[Panlingual] Remove getCallingPackage and use Uri instead." 2021-12-27 08:32:29 +00:00
Yuri Ufimtsev
b67f0974f2 Merge "Group some Security settings to a separate "Advanced settings" screen" 2021-12-24 10:18:37 +00:00
Stanley Wang
a0146d3fb7 Fix the problem that some items can't be searched in Privacy category.
The source of problem is that the controller returns the wrong
availability status value and the searchable attribut of the preference
is false.

Fix: 200249682
Test: manual test and see the search result
Change-Id: I2265514c49303f6a0910f1be84b281fccb9abb45
2021-12-24 18:09:58 +08:00
Weng Su
26a0fdb4f6 Check WiFi restrictions for WiFi QR code intent
- If WiFi configuration is not allowed, the WiFi QR code intent is
ignored.

- Add SafetyNet Logging to b/202017876.

Bug: 202017876
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppEnrolleeActivityTest

Change-Id: I147d2f4f4fabe2e24d5d3eaaad701b81059e8eee
2021-12-24 09:44:38 +08:00
Evan Chen
ca2d21416d Update bluetooth setting for AssociationInfo
Bug: 205738945
Test: Manually test
Change-Id: Id46b2632abe7b44fe8d0538a4b58e273c913c889
2021-12-23 17:52:01 +00:00
Yomna Nasser
c17bef1711 Merge "Update "Allow 2G" toggle summary wording." 2021-12-23 15:43:05 +00:00
tom hsu
4da192d732 [Panlingual] Remove getCallingPackage and use Uri instead.
- Use uri to pass the package name.
 - Allow adb command to start this function

Bug: 211856852
Test: see b/211856852#2

Change-Id: I3d73d32d7546bf0e3db25d952b2caee934f523dc
2021-12-23 13:00:28 +00:00
Yuri Ufimtsev
4eea126959 Group some Security settings to a separate "Advanced settings" screen
Test: adb shell am start -a android.settings.SECURITY_SETTINGS opens Advanced
Security Settings screen
Test: atest SettingsUnitTests:SecurityAdvancedSettingsTest
Test: atest SettingsUnitTests:SecurityAdvancedSettingsControllerTest

Bug: 204416998

Change-Id: If9c6da812ffb7c046b3b00a084007950801e1d4f
2021-12-23 10:26:46 +00:00
Betty Chang
8bf6efba9e Merge "To disable Wi-Fi tethering when user restriction is set" 2021-12-23 07:58:48 +00:00
Yomna Nasser
91036f8945 Update "Allow 2G" toggle summary wording.
Update "Allow 2G" toggle summary wording to be more clear regarding
the purpose of the toggle and why it may be disabled.

Bug: b/193693810
Bug: b/196183458
Test: manual & atest -c Enable2gPreferenceControllerTest
Change-Id: Iffef8f4f44105de30392c30ffd44c1d62cd066b8
2021-12-23 07:11:36 +00:00
changbetty
efd5d04ab1 To disable Wi-Fi tethering when user restriction is set
Bug: 203168953
Test: make RunSettingsRoboTests ROBOTEST_FILTER=WifiTetherPreferenceControllerTest
Change-Id: I749de121c3918382bf03e437e683477bac23cae1
2021-12-23 02:08:44 +00:00
Stanley Wang
8cfc57f258 Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev am: bfd37d65b0 am: 0bac54a0ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16512667

Change-Id: I6403aec4c28473abd027bf11f977051f008bb414
2021-12-22 09:18:00 +00:00
Stanley Wang
0bac54a0ee Merge "Restore the style of the screen saver widget from switch style to button style." into sc-v2-dev am: bfd37d65b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16512667

Change-Id: I1eb6e46632e7486bfe79cada099059e333c3906b
2021-12-22 08:59:39 +00:00
Stanley Wang
446f6dd886 Restore the style of the screen saver widget from switch style to
button style.

The operation of the Switch is not suitable for previewing the
screen saver and will make the user confused. So we change the
style of the screen saver widget back to the button style.

Fix: 189505023
Test: manually test the screen saver
Change-Id: I4a97d91cc0b76111d4cb7b6aa202f2207ee0ca5d
2021-12-22 10:13:27 +08:00
SongFerng Wang
fdfb0bcf44 Merge changes I5c6ad4b3,Icb00b3fc
* changes:
  [MEP] renew the default data selection UI
  [MEP] renew the sim confirm dialog UI
2021-12-21 15:53:21 +00:00
Jan Tomljanovic
14bbac9424 Merge "Redirect intents leading to Security and Privacy pages" 2021-12-21 10:44:36 +00:00
SongFerngWang
be8f279f2c [MEP] renew the default data selection UI
- renew the default Data/Call/SMS selection

Bug: 199902896
Test: build pass and local UI test
Change-Id: I5c6ad4b35d38112d5e88330a3fc9638be533bc94
2021-12-21 16:34:30 +08:00
Tom Hsu
75b382f80e Merge "[Panlingual] Add outside entry." 2021-12-21 03:23:06 +00:00
tom hsu
26b0bd7f19 [Panlingual] Add outside entry.
- video: https://screencast.googleplex.com/cast/NjIxODkzNzYyMjU5MzUzNnwwMWMxYjI1Ny1hMw

Bug: 207743479
Test: local
Change-Id: Iab3ba4d14f581aed7b737521ccba4f62e1c04998
2021-12-20 19:37:59 +08:00
TreeHugger Robot
d0f1724cbb Merge "Move vibrate for calls setting to "Vibration & haptics" screen" 2021-12-20 11:26:34 +00:00
Zoey Chen
4d365799d1 Merge "[Settings] Remove MobileNetworkActivity" 2021-12-20 05:03:36 +00:00
Treehugger Robot
e284e2b311 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92 am: 9713bec956 am: ae62873812
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I6d612fabfa85d826c40185c275c89439e4b08371
2021-12-20 04:02:01 +00:00
Treehugger Robot
ae62873812 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92 am: 9713bec956
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I2c7e0aeb425596f168a08f7c7bec653f5244e12e
2021-12-20 03:44:54 +00:00
Treehugger Robot
9713bec956 Merge "Add test case - forceUpdate_deviceIsSubDevice_doNothing" am: a3d97ecd74 am: 9c2293ca92
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/1925621

Change-Id: I8501963b7bd636b08107a1acd1495e74b355fea4
2021-12-20 03:31:28 +00:00
Alice Kuo
27a0274d6e Add test case - forceUpdate_deviceIsSubDevice_doNothing
Bug: 201472540
Test: make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest
Change-Id: I1aef6429b39109a09931a94b61f15e9470de3854
2021-12-20 01:35:40 +00:00
Yasin Kilicdere
1511407370 Merge changes from topics "addSettingsEntrypointToAddASupervisedUser", "simple fallback activity for supervised user creation"
* changes:
  Create a simple fallback activity for supervised user creation
  Add settings entrypoint to add a supervised user
2021-12-16 19:45:25 +00:00
TreeHugger Robot
4e2f2468ce Merge "Remove unncessary constraintlayout-solver deps" 2021-12-16 15:11:54 +00:00
Zoey Chen
baa1b112fd [RESTRICT AUTOMERGE] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5 am: a582bb1092
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/16475181

Change-Id: I153cee7c647997e9ccec066075af5e1bacd7fb86
2021-12-16 09:01:48 +00:00
Zoey Chen
6978a90e88 [Settings] Remove MobileNetworkActivity
- remove the component name when launching the intent, using the action intent to replace.

- remove MobileNetworkActivity and rename SubscriptionSettingsActivity as MobileNetworkActivity.

Bug: 210593601
Test: atest
Change-Id: Icb7adaf9f7c7dfe01ff5c133aee8387c1663546c
2021-12-16 13:30:25 +08:00
Zoey Chen
9772f33cff [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5
Test: atest MobileNetworkSummaryControllerTest, NetworkProviderWifiCallingGroupTest, NetworkProviderBackupCallingGroupTest
Bug: 197066557
Change-Id: I829590bfa37ee2166d9388ccad35d306b201f844
2021-12-15 16:00:08 +00:00
Zoey Chen
a582bb1092 [RESTRICT AUTOMERGE] [Provider Model] Internal cleanup - remove Provider Model flag and deprecated legacy UI part.5
Test: atest MobileNetworkSummaryControllerTest, NetworkProviderWifiCallingGroupTest, NetworkProviderBackupCallingGroupTest
Bug: 197066557
Change-Id: I829590bfa37ee2166d9388ccad35d306b201f844
2021-12-15 15:58:29 +00:00
Jan Tomljanovic
4436b7fe7d Redirect intents leading to Security and Privacy pages
We want them to lead to SafetyCenter when it's enabled.

Test: atest SettingsUnitTests
Test: manual: android.settings.PRIVACY_SETTINGS and android.settings.SECURITY_SETTINGS intent actions open the intended target page depending on the flag.
Bug: 204978497

Change-Id: Idc0200f98da359cbf11952393d4c83599f3f541c
2021-12-15 14:43:33 +00:00