Commit Graph

16352 Commits

Author SHA1 Message Date
Milton Wu
bd966754ce Check portal on fingerprint intro page
Check SUW portal flag on Fingerprint introduction page. Do not use
suw_max_fingerprints_enrollable as fingerprint count if portal flag is
enable.

Bug: 235655422
Test: m RunSettingsRoboTests \
      ROBOTEST_FILTER=FingerprintEnrollIntroductionTest
Test: Manually test "Add another finger" on Deferred and Portal
      suggested actions page
Change-Id: I2789d95fb214b5da6d8d03ef77583d064652e69e
2022-07-14 05:28:46 +00:00
Amy Hsu
f51951c9d3 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev am: 1f7fab03c8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19124855

Change-Id: Ie9b806a127e7eced1b9d790beb874e712e452de5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-07-12 04:15:21 +00:00
Amy Hsu
1f7fab03c8 Merge "[RRS] Activate investigation of screen_resolution in settingsstats" into tm-d1-dev 2022-07-12 03:54:27 +00:00
Robert Luo
bc66c0aba9 Merge "RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings" into tm-qpr-dev 2022-07-11 23:36:02 +00:00
TreeHugger Robot
f38e8e6194 Merge "RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings" into tm-qpr-dev 2022-07-11 22:50:58 +00:00
Amy Hsu
7087e5c457 [RRS] Activate investigation of screen_resolution in settingsstats
Define a setting string for putting data for suez/settingstats.

Bug: 234035619
Test: Manually check ScreenResolution ap in Settings can work normally.
Merged-In: Ib4622490b0f63139b47f242ebcae916edf291cea
Change-Id: Ib4622490b0f63139b47f242ebcae916edf291cea
2022-07-07 08:15:47 +00:00
Weng Su
08adf4c2ed Ignore CRLF strings in display SSIDs to avoid display errors
- Keep user-entered SSIDs in Wi-Fi Configuration

- Ignore CRLF strings in display SSIDs only

Bug: 224545390
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksFragmentTest

Change-Id: Ifc081f9c5c02b2d70412f296688b88e44e893add
2022-07-05 03:18:26 +08:00
Joshua Mccloskey
e30a71787e Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev am: 431542dddc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19093051

Change-Id: I4574d7014cfb6ca9050428e451654b9e8002995b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-29 17:12:05 +00:00
Joshua Mccloskey
431542dddc Merge "Fixed unicorn multi-enrollment flow." into tm-d1-dev 2022-06-29 16:48:53 +00:00
Joshua McCloskey
cdb654f9be Fixed unicorn multi-enrollment flow.
Test: Verified that Unicorn SUW flows can now
enroll a face.
Test: Verified normal SUW flow works as expected.

Fixes: 237088482
Fixes: 234663447
Change-Id: I9c4100f61b5e7d40fc9ed67c6918ec7bf31fc30a
2022-06-28 17:08:40 +00:00
SongFerng Wang
c150fe528d Merge "Fix the testcase error" into tm-d1-dev am: 602fe375d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/19083766

Change-Id: I2e79ea4100840627a21bd8797c9f1875b09c9161
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-28 06:20:37 +00:00
SongFerng Wang
602fe375d9 Merge "Fix the testcase error" into tm-d1-dev 2022-06-28 05:57:21 +00:00
SongFerngWang
cefad1e4b7 Fix the testcase error
The BluetoothDeviceUdater added the checking whether the item is in the
list. It caused this testcase failed.
Add more mocks for this testcase.

Bug: 237223797
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDevicesSliceTest
Change-Id: Idb746e42480f99846efb5d1e4d4a411a5a9ca296
2022-06-27 20:42:31 +08:00
SongFerng Wang
0018589f09 Merge "The UI only shows the active LE device" into tm-d1-dev am: dc72a4a14f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18910989

Change-Id: I43380dd3e84f63925c494038f9bb1c84207f2faa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-26 17:02:16 +00:00
SongFerng Wang
dc72a4a14f Merge "The UI only shows the active LE device" into tm-d1-dev 2022-06-26 16:38:24 +00:00
Evan Chen
bd2b5e7bfb Merge "Update AssociationIno creation for Bluetooth test" into tm-qpr-dev 2022-06-24 04:25:49 +00:00
Bonian Chen
67556fac04 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31 am: e941740b35
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8564a7c35b201d4a5022d9dcf2545a097822c4bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:43:37 +00:00
Bonian Chen
e941740b35 Merge "[Settings] Adjusted the API of Settings app" into tm-dev am: 29a00dbc31
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18660040

Change-Id: I8c39ef8a089394c52b5a80ea98fa77f2ab0f2ab8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 19:25:48 +00:00
Bonian Chen
29a00dbc31 Merge "[Settings] Adjusted the API of Settings app" into tm-dev 2022-06-22 18:59:54 +00:00
Oriol Prieto Gascó
95d32d678c Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0 am: 0dfc94f668
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I94c1735bc1da2157654340fb809b0e7f273a804b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 18:12:29 +00:00
Oriol Prieto Gascó
0dfc94f668 Merge "Use com.android.bluetooth as the BT stack APK" into tm-dev am: d6166e42a0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18981799

Change-Id: I0af1ada1c42fe907243bcde356f51d8302bfb5c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-22 17:45:17 +00:00
Bonian Chen
d10618d489 [Settings] Adjusted the API of Settings app
The API of Settings app get changed in order to support large screen.
This is a fix to adopt the change related to this work.

A short brief:
1. Accept ACTION_MAIN for launching MobileNetworkActivity.
2. Support deep-link intent while MobileNetworkActivity in foreground.
3. Avoid from binding MobileNetworkActivity as a single instance.

Bug: 230047450
Bug: 234406562
Bug: 229371407
Test: local & unittest
Change-Id: Ifcb9d4c564839199d998bd503f390f021c6bf3ad
2022-06-22 07:51:47 +08:00
TreeHugger Robot
ea9b715e78 Merge "Restrict ProviderModelSlice for guest user" into tm-qpr-dev 2022-06-21 17:05:16 +00:00
TreeHugger Robot
2d0e1dc725 Merge "Restrict AddAppNetworksActivity for guest user" into tm-qpr-dev 2022-06-21 17:04:33 +00:00
SongFerngWang
6426382e90 The UI only shows the active LE device
At the media device, it only shows the active LE device which is
connected.

Bug: 232892046
Test: make RunSettingsRoboTests ROBOTEST_FILTER=AvailableMediaBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=ConnectedBluetoothDeviceUpdaterTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedBluetoothDeviceUpdaterTest

Change-Id: Iac661206def4d43bc40ab9bb1938f084926899c2
2022-06-20 21:30:34 +08:00
Zaiyue Xue
3b7953eac2 Merge "Move battery usage files to a separate folder." into tm-qpr-dev 2022-06-20 09:12:04 +00:00
Oriol Prieto Gasco
f528e7de49 Use com.android.bluetooth as the BT stack APK
Test: TH
Bug: 236187653, 236192423
Change-Id: Ia86d195780a4994607b5533420cb72bd458d4f9a
2022-06-19 23:06:06 +00:00
xuezaiyue
ac7318419a Move battery usage files to a separate folder.
Bug: 202118250
Test: presubmit
Change-Id: I21aa58ebc02327849ed2161dbbafcdc806c007f2
2022-06-19 05:59:35 +00:00
Weng Su
88037e4f5e Restrict ProviderModelSlice for guest user
- Don't show ProviderModelSlice if the user is a guest.

- Don't run background worker if the user is a guest.

Bug: 227470877
Test: manual test
atest -c ProviderModelSliceTest

Change-Id: Id9fd50add271513c396adfbc083a9d8ea5f7771f
2022-06-17 02:21:19 +08:00
Weng Su
1c25ce1937 Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev 2022-06-15 16:40:03 +00:00
Weng Su
f53f3e6e41 Restrict AddAppNetworksActivity for guest user
- Don't show AddAppNetworksActivity if the user is a guest.

Bug: 224772678
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=AddAppNetworksActivityTest

Change-Id: I17571905f1c4a38db884e6d0523b7f8d668df607
2022-06-16 00:33:07 +08:00
Weng Su
a8ccc3456c Restrict guest user to configure WiFi by QR code
- Don't show WifiDppConfiguratorActivity if the user is a guest.

Bug: 224772890
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiDppConfiguratorActivityTest

Change-Id: I160761edfe2893475676421ba2b59205da8d0224
2022-06-14 01:20:54 +08:00
Evan Chen
61ea6782f5 Update AssociationIno creation for Bluetooth test
Bug: 189250370
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothDetailsCompanionAppsControllerTest
Change-Id: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
Merged-In: Iebbd2ca754b20d251f7a128bc2c460b4c3093762
2022-06-10 23:03:33 +00:00
Piotr Wilczyński
6dac1ca43d Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea am: 8bfab753c1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I74d279c286d697f13af2059e0c93f3c3109a7f9e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 08:19:37 +00:00
Piotr Wilczyński
8bfab753c1 Merge "Notify about brightness change when screen turns on" into tm-dev am: 7d634de3ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/17898014

Change-Id: I00e339ffd5b02bcbfeccb512eeeedf6d6356df76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 07:59:40 +00:00
Piotr Wilczyński
7d634de3ea Merge "Notify about brightness change when screen turns on" into tm-dev 2022-06-09 07:39:07 +00:00
SongFerng Wang
cac60c3548 Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b am: 8425062cef
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Iaf160129453409905112ff321ab35694c3383b07
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:42:56 +00:00
SongFerng Wang
8425062cef Merge "Unable to enable the removable esim" into tm-dev am: be1b37ae2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18714967

Change-Id: Ic113ffc982f64c332b5269275e47941d6d5c2245
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-09 02:07:10 +00:00
Weng Su
5f421125ab Restrict WifiSlice functionality for guest user
- Hide Wi-Fi toggle and show Wi-Fi status only if the user is a guest.

Bug: 232798363
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiSliceTest

Change-Id: I35418477808eb5082f4651f5689f018dbb8e42ac
2022-06-09 06:07:55 +08:00
Avinash Vadlamudi
26e3744221 Merge changes from topic "avivadla-ephemeral-guest-ui-fixes-tm-qpr-dev" into tm-qpr-dev
* changes:
  Rename method for better readability
  Fix the Ephemeral guest mode UI bugs
2022-06-08 04:03:11 +00:00
TreeHugger Robot
909b62ffa4 Merge "Restrict guest user to configure WiFi access points" into tm-qpr-dev 2022-06-07 18:16:32 +00:00
Alice Kuo
b045c57fe6 Add LE Audio feature switcher in the developer option menu am: 948b7cb959
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18740331

Change-Id: Ia0fa92a5061bdb75a648dbb3d8db9fd2bcbdb1a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-07 04:00:22 +00:00
Alice Kuo
948b7cb959 Add LE Audio feature switcher in the developer option menu
Add a switcher to enable/disable LE audio feature. The switcher could be
enabled by setprop ro.bluetooth.leaudio_offload.supported=true

screenshot: https://screenshot.googleplex.com/6aGP664S9PX5EMS

Bug: 233018305
Bug: 233005340
Test: make RunSettingsRoboTests ROBOTEST_FILTER=BluetoothLeAudioPreferenceControllerTest
Test: switch LE audio feature, and check LE audio functionality status
Change-Id: I8adcf27edd1438df445d32fca93f35ff5020a3b3
Merged-In: I8adcf27edd1438df445d32fca93f35ff5020a3b3
(cherry picked from commit 0d11fd07e7)
2022-06-07 09:36:15 +08:00
TreeHugger Robot
5afb322f3a Merge "Restrict network preferences settings" into tm-qpr-dev 2022-06-06 21:42:30 +00:00
Weng Su
a09c33f49c Restrict guest user to configure WiFi access points
- If the user is not allowed to configure Wi-Fi access points, close WifiDialogActivity.

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

Change-Id: I32d0c5beceb8a140a98636a5a0af97790495620d
2022-06-07 03:30:01 +08:00
SongFerngWang
64430ba2d2 Unable to enable the removable esim
When the user enable the removable esim, the settings select wrong
slot(esim slot). The slot shold be the removable + esim slot and the
UiccCardInfo's cardId is the same as the removable esim's cardId.

Bug: 233170453
Bug: 233338345
Test: atest UiccSlotUtilTest
Change-Id: Ibd324b781c84318c994e3742bb82e1d1393b94e4
2022-06-06 17:56:25 +08:00
Hugh Chen
f5166f46e8 RESTRICT AUTOMERGE Make VPN by Google One always appear in VPN settings
Bug: 233559781
Test: manually test
Change-Id: I175ab126ff92f773ab25a1fa64e4262b324fd353
2022-06-06 07:09:06 +00:00
Hugh Chen
858e6ff3d5 RESTRICT AUTOMERGE Implement advanced vpn ui in vpn settings
Bug: 220684478
Test: atest -c VpnSettingsTest

Change-Id: If89de16d02cb8b1f387b8f388f8fcf82ad39066b
2022-06-06 06:37:26 +00:00
Avinash Vadlamudi
d23aba7042 Fix the Ephemeral guest mode UI bugs
- Update the user-icon size to 40dp to align with add-icon size
- Remove the guestInfo preference and add the infoText as the summary for the guestExit preference and fix UserSettingsTest

Bug: 231592331
Test: Manual test, atest SettingsRoboTests
Change-Id: I2591bc19a7b2381d1842f0b28ab8fa19c15c19b8
(cherry picked from commit 9cf1d188a2)
2022-06-03 10:58:54 +00:00
Weng Su
1f0689f73c Restrict network preferences settings
- Show a restriction message if the malware enforces the network preference settings

- Remove settings search index if the network preference settings is restricted

Bug: 231987122
Test: manual test
make RunSettingsRoboTests ROBOTEST_FILTER=ConfigureWifiSettingsTest

Change-Id: I998aa084d47d556d1eeddcec8c6bb5f1d9a8f6e7
2022-06-02 04:50:33 +08:00