Eric Biggers
7e5d519cf4
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I180e9f3771dd5f9e32876c2ac6568d8a4eaf50dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:59:10 +00:00
Eric Biggers
aa93927b87
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours am: 733d83d27b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: Iee3107d98140efd520924ba05c7f592d54b6e8d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:56: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
c86183ec60
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours am: 7bed9704c9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I6fb8b7198d1f4199b64cb0540091208847704aad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:55:35 +00:00
Eric Biggers
2f8d8d1d79
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours am: 8360c2e940 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: If8220391370f5485505e0990ed9d71b513a21c78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:55:29 +00:00
Eric Biggers
bf4f533ea6
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours am: d1a31c8619 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I4cdcfeaf7c26b88a83a3f62151f60cd6bc35b2bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:54:27 +00:00
Eric Biggers
06c2588645
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I5b558e9a8b46f465fa87be7d5232239bb7eec3b1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:38:41 +00:00
Eric Biggers
355e257668
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours am: 2ce24a1fa9 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: Ia1117d236897eaa24976b2c809ae8fa13d568f6f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:37:31 +00:00
Eric Biggers
bf33df4d79
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: I05baeebef5abb0d46da580535914772270bb6325
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:37:27 +00:00
Eric Biggers
e176ec56dc
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours am: 81bd8912af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Ia49cf6e2e8ca30f5a427ff26060a72604f36e071
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:36:55 +00:00
Eric Biggers
733d83d27b
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 5f07aba150 -s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 b30cf4e8cb is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24298399
Change-Id: I102d20d2e914a442e768ca7446601bfa51eac20d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:36:53 +00:00
Eric Biggers
257bc2eda1
RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I701bf72cefdaaeb465123aa1aedb581ab6408157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:35:24 +00:00
Eric Biggers
011f39e944
RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: e0b5a793a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301337
Change-Id: I8607f271c5daf117b25502b572598e48dc2de30f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:35:06 +00:00
Eric Biggers
d1a31c8619
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: b30cf4e8cb -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301340
Change-Id: I100f99e9a0c7495f733b97d9f93decfe905ba7a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:34:09 +00:00
Eric Biggers
7bed9704c9
[automerger skipped] Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev am: 94ffd66957 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I7f6f74c706a397cfbad6685c152c015906a63b74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:46 +00:00
Eric Biggers
67c4be1e52
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 50cb0a35c9 -s ours
...
am skip reason: Merged-In I48b9119c19fb6378b1f88d36433ee4f4c8501d76 with SHA-1 99be30f895 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301339
Change-Id: I65063522e32f96f27f7d7eb51c882e761ad29c02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:46 +00:00
Eric Biggers
8360c2e940
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 423c0e0d47 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301336
Change-Id: I41c8afe636e06554df78cc253b93e6dfea887f2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:31:36 +00:00
Eric Biggers
f41767c07a
Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into udc-qpr-dev am: 00885a8cb5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24297965
Change-Id: Ifd772c48ea27b360826e4e87433edec520c89b58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:16:29 +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
2ce24a1fa9
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours am: 7475b96786 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I35f68ccc8b118df5340a679e9a8c128055486ec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:15:38 +00:00
Eric Biggers
81bd8912af
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 6e92ca106e -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24299129
Change-Id: Icfbce08c030aac4ac4532bf4535970c2a97f22f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:14:44 +00:00
Eric Biggers
7475b96786
[automerger skipped] RESTRICT AUTOMERGE: Catch exceptions from setLockCredential() am: 99be30f895 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24301338
Change-Id: I72421fe89e4b0ed32f193384805bc502e0f24f9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-08 01:11:34 +00:00
Eric Biggers
94ffd66957
Merge "RESTRICT AUTOMERGE: Catch exceptions from setLockCredential()" into tm-qpr-dev
2023-08-08 00:51:38 +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
Bill Yi
857778a856
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: dc3c4b2094 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24317458
Change-Id: I8bcfa9bb6405fee9480c38b792835ef734af8653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-06 18:26:38 +00:00
Bill Yi
a2db0f037c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 8a43b3166b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24317458
Change-Id: I72a57e0f28cd6cdf7ed1c9c4516770aed5b3cf24
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-06 18:26:26 +00:00
Bill Yi
dc3c4b2094
Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod
2023-08-06 17:58:17 +00:00
Bill Yi
19345f4f2f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: b3f9242eac -s ours am: 11d947dea5 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I5df2accb7f5ab4d5bd020a441fc923e27276bacc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 09:28:47 +00:00
Bill Yi
c406839008
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 9fd6cb2657 -s ours am: 989a977c08 -s ours am: 73b3372bac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: Id56c59c93c5b48f5ccdc304bbd0727d504442f6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 09:27:16 +00:00
Bill Yi
c8b2f927a5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: fab61ce9af -s ours am: 29a4f1128b -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I403aca5ca90e6506cc70ec157da6041175de04a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 09:25:39 +00:00
Bill Yi
11d947dea5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: b3f9242eac -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I276d04e23dfb4ebf4b220ea230925aa94743b37c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 09:05:52 +00:00
Bill Yi
73b3372bac
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 9fd6cb2657 -s ours am: 989a977c08 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I7d0eeb71d096fd98950f416b658d34b76919e554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:44:53 +00:00
Bill Yi
29a4f1128b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 0e59758074 -s ours am: fab61ce9af -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I58fa8245451b1781391e79b803f665bcefef9193
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:43:33 +00:00
Bill Yi
989a977c08
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 9fd6cb2657 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I849cae3eb42f08b897f3efd1067c33b0938b51c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:43:18 +00:00
Bill Yi
72431303bd
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d56eb42615 -s ours am: 45eb3572ff -s ours am: 3cb66d7d11 -s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/24318271
Change-Id: I2daecd5f6678da7dd50b967052dd56ebd2b78ca9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-08-05 08:43:12 +00:00