Commit Graph

50534 Commits

Author SHA1 Message Date
Treehugger Robot
2200654a7b Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05 am: b5195183cc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353

Change-Id: Ie9c54fddcb4344051fc492a23bf7102214f10b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 03:29:46 +00:00
Treehugger Robot
b5195183cc Merge "Fix crash after confirmLock" into udc-qpr-dev am: 611e43fe05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24351353

Change-Id: I00faa95548e4fba8d1a0618b0064080a609b6f04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-09 02:46:35 +00:00
Treehugger Robot
611e43fe05 Merge "Fix crash after confirmLock" into udc-qpr-dev 2023-08-09 02:10:49 +00:00
Anvesh Renikindi
d811e2b515 Merge "Remove ExperimentalLifecycleComposeApi" into main 2023-08-08 20:33:33 +00:00
Justin McClain
524643a6c8 Merge "Remote authenticator enrollment finish layout." into main 2023-08-08 15:51:39 +00:00
Justin McClain
a3a000426e Remote authenticator enrollment finish layout.
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock.

Bug: b/293905106
Test: atest RemoteAuthEnrollFinishTest
Change-Id: I5d24e23948e508dcff5216cd63eba8d9fc9ec97f
2023-08-08 14:19:20 +00:00
Tetiana Meronyk
d7a6a7f1ce Merge "Remove toggle "Turn on phone calls & SMS" from User Details of Main user" into main 2023-08-08 14:04:31 +00:00
Tetiana Meronyk
30ca0fbb3d Remove toggle "Turn on phone calls & SMS" from User Details of Main user
Admins should not be able to disable phone calls and SMS from the device owner.

Bug: 294846327
Test: atest UserDetailsSettingsTest
Change-Id: Ibb8532379c6e1e22fe45f2acb5191f8f6c7f3b0a
2023-08-08 09:53:33 +00:00
Chaohui Wang
8e2ae547d6 Clean up FeatureFactory.getFeature()
Bug: 286764889
Test: m Settings
Change-Id: I7e472e6b0ca6b7a735c1b92742ddf06c545176fc
2023-08-08 08:41:48 +00:00
Chaohui Wang
0062308347 Merge "Fix references to resources for Settings" into main 2023-08-08 08:40:42 +00:00
Milton Wu
432560177c Fix crash after confirmLock
Stop everything in generateChallenge() on "Face and Fingerprint Unlock"
page if activity is null or finishing

Also fix ignored test cases in CombinedBiometricProfileSettingsTest

Bug: 292125215
Test: RunSettingsRoboTests ROBOTEST_FILTER=CombinedBiometricProfileSettingsTest
Change-Id: I7a272e813bfddd5d066417a74cbd63d22f511000
2023-08-08 07:04:04 +00:00
Chaohui Wang
e9cf4bf65c Merge "Convert DataUsageLib to Kotlin" into main 2023-08-08 05:05:01 +00:00
Kohsuke Yatoh
5e3cbc3fa6 Merge "Add @SearchIndexable to OneHandedSettings fragment" into main 2023-08-08 04:53:45 +00:00
Treehugger Robot
cee9631614 Merge "Refersh saved Wi-Fi networks" into main 2023-08-08 02:29:39 +00:00
Chaohui Wang
2541381259 Fix references to resources for Settings
Bug: 293810334
Test: m Settings
Change-Id: Ie140278f492ef7e1c062ec1ecae2866c521a86aa
2023-08-08 01:56:05 +00:00
Eric Biggers
62fa3772ed RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50f93771bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24297965

Change-Id: I527deaf07af54d6aba582898d29c06c957eff994
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-08 01:16:23 +00:00
Eric Biggers
00885a8cb5 Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev 2023-08-08 00:50:18 +00:00
Wenhui Yang
ed505c25fa Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev am: c2b7914778 am: b41875eff3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211335

Change-Id: I413b6692409ca97f48f6c68ad99b894d12e4734a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 20:33:36 +00:00
Wenhui Yang
b41875eff3 Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev am: c2b7914778
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24211335

Change-Id: Ie562c88a61db12214c11ee18361781f439abb12c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 20:13:10 +00:00
Wenhui Yang
c2b7914778 Merge "Add bp subtitle for WiFi sharing" into udc-qpr-dev 2023-08-07 19:55:44 +00:00
Matt Casey
2710d5a85f Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d3023 am: 3362abc551
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323

Change-Id: I95a7256b5488b7847ebd348c455162fa08a2c3cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 19:47:09 +00:00
Matt Casey
3362abc551 Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev am: 39715d3023
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24265323

Change-Id: I44f59ffc7c97affb13fda2151f950a3844a72d90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-07 18:48:10 +00:00
Matt Casey
39715d3023 Merge "Remove dependency on ChooserActivity resources" into udc-qpr-dev 2023-08-07 17:56:15 +00:00
Weng Su
1962145282 Refersh saved Wi-Fi networks
- Refresh existing saved networks with the same key of WifiEntry

- Update Wi-Fi icon when connection status changes

Bug: 290644817
Bug: 291032267
Bug: 293468313
Bug: 294866208
Test: Manual test
make RunSettingsRoboTests ROBOTEST_FILTER=WifiEntryPreferenceTest
make RunSettingsRoboTests ROBOTEST_FILTER=SavedAccessPointsPreferenceController2Test

Change-Id: Ifadfb7c46edf8eda32e4ff5dcb6bb3ff086447c8
2023-08-07 17:49:04 +00:00
Treehugger Robot
317bfca133 Merge "[BiometricsV2] Refactor EnrollIntroViewModel" into main 2023-08-07 05:22:36 +00:00
Treehugger Robot
538eafcbf2 Merge "[BiometricsV2] Refactor AutoCredentialViewModel" into main 2023-08-07 05:22:13 +00:00
Treehugger Robot
49d3feaa74 Merge "[BiometricsV2] Fix skip action for udfps enrolling" into main 2023-08-07 05:19:08 +00:00
Chaohui Wang
79a978989f Revert^2 "Clean up unused WifiManager.ActionListener"
This reverts commit c4a0abef8c.

Reason for revert: The original is not the root cause.
Root cause is b/294378814

Change-Id: Ib44ad912073b0f1b06c7ef6b6b998581eef65784
2023-08-07 04:22:56 +00:00
Treehugger Robot
c001665f00 Merge "Clean up unused operator_warning" into main 2023-08-07 03:56:14 +00:00
Chaohui Wang
ab88423f55 Merge "Remove PreferenceXmlParserUtils deprecated methods" into main 2023-08-07 03:13:42 +00:00
Chaohui Wang
3cd47c1448 Clean up unused operator_warning
Usage is removed in Change I9781af3a53fe7050b414f0574abb7618f8d71707.

Bug: 285231003
Test: m Settings
Change-Id: I89fb8630cc6bea4828b14936d5e2234de9f232ea
2023-08-07 10:46:01 +08:00
Kohsuke Yatoh
dd376906de Add @SearchIndexable to OneHandedSettings fragment
Bug: 245267643
Fix: 245267643
Test: Queried "one-handed" and verified "Use one-handed mode" shows up
Change-Id: If752ed3827a9ea86b594c3e4ba5746567e4e43ee
2023-08-07 02:33:16 +00:00
Etan Cohen
726bda1d98 Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev am: dca9c6b88f am: a20cb88cf6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24285925

Change-Id: Ib3aa9df47d9fa91a2fa56c6d771b9da0c9d512f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 01:15:16 +00:00
Etan Cohen
a20cb88cf6 Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev am: dca9c6b88f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24285925

Change-Id: I687e5e85223d2b96d60667b1c203bd7264935cc2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-05 00:27:43 +00:00
Etan Cohen
dca9c6b88f Merge "Fix WiFi (ZX or DPP) QR code parsing to ignore leading spaces" into udc-qpr-dev 2023-08-04 23:36:38 +00:00
Liahav Eitan
e30a1c19ec Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev am: 804104ce36 am: daf168e2b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23845009

Change-Id: I2c19e08ef9f24514fb8e298d97e7f98424a369aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 18:46:10 +00:00
Liahav Eitan
daf168e2b9 Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev am: 804104ce36
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23845009

Change-Id: I92f8814c34e868d93500c137a2d4428937d50320
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 18:02:56 +00:00
Riley Jones
89221666db Merge "Expanded accessibility search terms" into main 2023-08-04 17:57:53 +00:00
Liahav Eitan
804104ce36 Merge "Fix theming on Forgot your password work challegne screen" into udc-qpr-dev 2023-08-04 17:19:02 +00:00
Weng Su
de6eb9100f Show policy transparency dialog for Wi-Fi network restrictions am: 28be567a83 am: cac69880ae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156648

Change-Id: I8c69cfc85156917c0223817fe4409f9b6357f05c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 17:14:21 +00:00
Weng Su
cac69880ae Show policy transparency dialog for Wi-Fi network restrictions am: 28be567a83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24156648

Change-Id: I5e5ebdc0aedc686e7a4257458d68592ea51c883b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 16:36:08 +00:00
Weng Su
28be567a83 Show policy transparency dialog for Wi-Fi network restrictions
- In order to support various user restrictions of individual Wi-Fi networks, WifiEntry provides the hasAdminRestrictions method for unified management.

- Settings will refer to WifiEntry#hasAdminRestrictions to restrict individual Wi-Fi networks.

Bug: 289448751
Bug: 289951241
Test: manual test
atest -c LongPressWifiEntryPreferenceTest

Change-Id: Iae5996a87ee72a3073300c7f62dfa14a9f31c21d
2023-08-04 07:18:28 +00:00
Yu Chao (zhào-yò)
c9eca99ac1 Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev am: 8053947766
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24305937

Change-Id: I92ce6470673a5c7d36dd188bdb80902cb1103901
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 07:01:45 +00:00
Yu Chao (zhào-yò)
8053947766 Merge "Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment." into udc-qpr-dev 2023-08-04 06:28:05 +00:00
Yu Chao
68e466ff01 Migrate VpnSettings from RestrictedSettingsFragment to RestrictedDashboardFragment.
This is required for adding an overlay vpn_settings2.xml for Tips
Button.

Test: VpnSettingsTest
Bug: 293213974
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:f9ca569249331a062e6f58a49bb0bb53aa69b3db)
Merged-In: I26531afe75215c9531c0122d2e86fd5d0da4d3db
Change-Id: I26531afe75215c9531c0122d2e86fd5d0da4d3db
2023-08-04 05:51:48 +00:00
Chaohui Wang
4000b90fad Merge "Remove context from enterprisePrivacyFeatureProvider" into main 2023-08-04 04:31:44 +00:00
Zoey Chen
2a2a50e4f2 Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev am: 9635d1cf45
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24257533

Change-Id: I7f82cb95528fe96829f896ee5cb762ab401dd0a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-04 02:54:30 +00:00
Zoey Chen
9635d1cf45 Merge "[Regional Preference] Add description for checked/not checked" into udc-qpr-dev 2023-08-04 02:20:11 +00:00
Yuyang Huang
325cd61f8c Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev am: b40e5c2228
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23919023

Change-Id: I024ffb878311a911b6acd93c77f4136fed2e912b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-03 23:05:35 +00:00
Yuyang Huang
b40e5c2228 Merge "Enable/Disable ASHA profile with LE audio toggle" into udc-qpr-dev 2023-08-03 22:20:35 +00:00