Allen Su
be642020cc
Merge "Keep the dialog when touching outside the window" into main
2023-08-10 03:21:50 +00:00
Haijie Hong
9186f375df
Merge "Improve Bluetooth pairing dialog & contact sharing toggle" into main
2023-08-10 02:53:29 +00:00
Treehugger Robot
a0d2828730
Merge "Fix R.drawable.ic_search_24dp" into main
2023-08-10 02:52:47 +00:00
Treehugger Robot
4e1b10e9eb
Merge "[BiometricsV2] Fix end-to-end enroll test fail" into main
2023-08-10 02:32:25 +00:00
Chaohui Wang
295a46f3e0
Fix R.drawable.ic_search_24dp
...
It's belong to namespace com.android.settingslib.search instead of
com.android.settingslib.widget
Fix: 295106566
Test: m Settings
Test: installmod Settings
Test: manual - on Developer Option page
Change-Id: I69839d422230815b17327f7f937854c4c72890fb
2023-08-10 10:00:24 +08:00
Angela Wang
f6c3736352
Merge "Show binaural ASHA hearing aids addresses" into main
2023-08-10 00:50:16 +00:00
Justin McClain
b7f9d72560
Merge "Remote authenticator enrollment introduction layout." into main
2023-08-09 22:48:51 +00:00
Justin McClain
f71909220b
Remote authenticator enrollment introduction layout.
...
This flow will be included in Device Unlock settings with the
Fingerprint and Face Unlock.
Bug: b/293908278
Test: atest RemoteAuthEnrollIntroductionTest
Change-Id: Ia20662e897f925d82547550e25b79a2e61d2dc34
2023-08-09 20:53:05 +00:00
Treehugger Robot
8634789d95
Merge "Split the string resource id for non-generic accessibility preference." into main
2023-08-09 17:58:35 +00:00
Chun-Ku Lin
364178428a
Merge "Remove unused variable" into main
2023-08-09 17:08:17 +00:00
Milton Wu
b1ad3fa01b
[BiometricsV2] Fix end-to-end enroll test fail
...
Fix end-to-end enrollment test fail because of using incorrect observer
type to observe finish page data
Bug: 295140687
Test: atest biometrics-enrollment-test
Change-Id: I9ca8d1c6383c2ecf3f94dc1e5cbb878e4328a900
2023-08-09 23:27:57 +08:00
Vania Januar
7dd94771bc
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6 am: 2afb275e09
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943
Change-Id: I943ad68a44de16de1899ad4a613c2c221c698f63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 15:13:35 +00:00
Vania Januar
2afb275e09
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev am: 2d77f72cb6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24342943
Change-Id: I1969dedbd9327fc6ab4dfa0715192b3f882a4e47
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-09 14:32:18 +00:00
Vania Januar
2d77f72cb6
Merge "Use two-target preference for stylus handwriting toggle." into udc-qpr-dev
2023-08-09 13:50:06 +00:00
Treehugger Robot
9ba8b79061
Merge "[BiometricsV2] Fix end-to-end enroll test fail" into main
2023-08-09 12:59:13 +00:00
Treehugger Robot
80d3ac14a6
Merge "Fix R.string.search_menu" into main
2023-08-09 12:54:28 +00:00
Felix Stern
76707864e5
Merge "Adjusted Settings to use updated internal InputMethodManager methods" into main
2023-08-09 12:36:41 +00:00
Chaohui Wang
781ca69f9b
Fix R.string.search_menu
...
It's belong to namespace com.android.settingslib.search instead of
com.android.settingslib.widget
Fix: 295106566
Test: manual - on Developer Option page
Change-Id: I6f66509ebc89094f96e08860c2d034b3b22c3b50
2023-08-09 20:04:48 +08:00
Milton Wu
181538084d
[BiometricsV2] Fix end-to-end enroll test fail
...
Fix end-to-end enrollment test fail because of using incorrect observer
type to observe data
Bug: 295140687
Test: atest biometrics-enrollment-test
Change-Id: Idfb95400c1462dac5a44731f46f67b22be93e0a6
2023-08-09 19:33:56 +08:00
Allen Su
9e696767e4
Keep the dialog when touching outside the window
...
Bug: b/292189991
Test: by manual
Change-Id: I2df1a62956e1c43cccdf58478462b964ea3e49fe
2023-08-09 11:16:28 +00:00
Treehugger Robot
33d480ed56
Merge "[BiometricsV2] Refactor AutoCredentialViewModel" into main
2023-08-09 08:37:45 +00:00
SongFerng Wang
e22ab2c94b
Merge "Fix NullPointerException of LocalMediaManager" into main
2023-08-09 07:19:38 +00:00
Milton Wu
f8cdda45aa
[BiometricsV2] Refactor AutoCredentialViewModel
...
Fix previous review comments on
I84bab0b46e023303c0046a6ae6886ab1cf9458b8
Bug: 286197659
Test: atest AutoCredentialViewModelTest
Test: atest biometrics-enrollment-test
Change-Id: I9b43a637439e941bdb884e3ae2f656d573364123
2023-08-09 06:39:48 +00:00
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
Chun-Ku Lin
b65108ba1b
Split the string resource id for non-generic accessibility preference.
...
- Keep the accessibility settings strings the same as in U.
Bug: 289425138
Test: manual
Test: atest
Change-Id: Iddbbfe627c93529d2421e153094a30628229c4bc
2023-08-08 19:17:54 +00:00
Chun-Ku Lin
f8b3da11e7
Remove unused variable
...
Bug: N/A
Test: N/A
Change-Id: I1bac8a1745faae89c67fe6d582477807dc4592c5
2023-08-08 19:17:45 +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
Vania Januar
24a2863751
Use two-target preference for stylus handwriting toggle.
...
Bug: 294279890
Test: StylusDevicesControllerTest
Change-Id: I8e83fb3a8bb76469c4bf1b99df5524930ebad086
2023-08-08 13:50:19 +01: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
SongFerng Wang
1901f50dcf
Fix NullPointerException of LocalMediaManager
...
Bug: LocalMediaManager
Test: build pass
Change-Id: Ib53cb11d28669486573777be992711200a39cd85
2023-08-08 09:24:46 +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
Haijie Hong
21b075770e
Improve Bluetooth pairing dialog & contact sharing toggle
...
Before change: https://screenshot.googleplex.com/Agr29KTvgptbsag
After change: https://screenshot.googleplex.com/ArjiavkFAFiuCTR
Bug: 274521434
Test: RunSettingsRoboTests
Change-Id: Ib896b70bc219de128b733b75249bf80e3389f221
2023-08-08 13:15:38 +08: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