Austin Delgado
9f3b87b51f
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
am: 7246a93bd3
am: d8a0b91e1a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: Ifac04d1aa587697272092731df44a3141e4bd04e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 05:47:20 +00:00
Derek Jedral
f280014274
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 2696c8dbc7
am: 98d9c60736
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I12ed52b4966a1e6dff8b7e878b6754ef5ff02d7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 04:50:36 +00:00
Becca Hughes
bbe02d73a2
Merge "Disable all providers if none selected" into udc-dev am: 762691c365
am: 9230389dcd
am: 72ff60a0e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870
Change-Id: I0f131884bc5298b2ea6a896ee2b7fa9d4ddd2a38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 04:33:01 +00:00
Austin Delgado
da2701092f
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
am: 083f9699c5
am: 8c8cf133be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: Ia709e5359a9781b12e4d5ecb9a2aa3667c567357
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 03:42:55 +00:00
Austin Delgado
d8a0b91e1a
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
am: 7246a93bd3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I7ed684004b383d2d468a34831c9384398fb1aae0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 02:04:57 +00:00
Derek Jedral
98d9c60736
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 2696c8dbc7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I6f10b9fcd44d562d3bdf47f66b7b4cadcdd6b926
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:54:08 +00:00
Austin Delgado
7246a93bd3
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I99b155b7965f04739bcbddf15fe75a3633cc07bb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:48:10 +00:00
Derek Jedral
7a8105c79b
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 898e1d95f3
am: a783d32ab1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I5b9024876a444a1bf62974f72132a34ac9010f11
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:47:00 +00:00
Becca Hughes
e7fe59a09b
Merge "Disable all providers if none selected" into udc-dev am: 762691c365
am: 9230389dcd
am: 11436efb90
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870
Change-Id: Idc6aa7970cc26df83d7226b185afece1bf475b0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:31:14 +00:00
Austin Delgado
65a9252d21
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
am: 083f9699c5
am: 8854736aa1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: Iea88b3ced694723b3109a4e8fdae228396c105f6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:30:48 +00:00
Becca Hughes
72ff60a0e4
Merge "Disable all providers if none selected" into udc-dev am: 762691c365
am: 9230389dcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870
Change-Id: I32c068036822267003322299e4ff7f22e32b4dc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:14:44 +00:00
Austin Delgado
8c8cf133be
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
am: 083f9699c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I3eb79af0410b2ca6b7e41ff2dfccd403e64fcd0f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:06:20 +00:00
Becca Hughes
11436efb90
Merge "Disable all providers if none selected" into udc-dev am: 762691c365
am: 9230389dcd
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870
Change-Id: I400e13cb48fe41b40ca6476179e0dcc9fbeb9239
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:05:23 +00:00
Austin Delgado
8854736aa1
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
am: 083f9699c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I106e43e195e97d54846b3a178cba875177e47fad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 01:02:24 +00:00
Becca Hughes
9230389dcd
Merge "Disable all providers if none selected" into udc-dev am: 762691c365
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23086870
Change-Id: I3bba36664b2accc006218d46160383f73504da9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 00:49:58 +00:00
Austin Delgado
083f9699c5
Merge "Fix going back after biometric enrollment in SUW" into udc-dev am: 2971c13923
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23060222
Change-Id: I39cd3cb9c37b0440027c9396f557207fafd6f35e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 00:19:45 +00:00
Derek Jedral
2696c8dbc7
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: Ib0a4b4b2b76a3d1bc2244dbb6a7080c8c4b23b90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-09 00:18:36 +00:00
Derek Jedral
f0bca9aab0
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 898e1d95f3
am: 57c7dd9741
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: Iea6b5bca8dc065c0e5014f99147b378409fc0afc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 23:07:44 +00:00
Derek Jedral
a783d32ab1
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 898e1d95f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I2269002faf18bbd9932cc91908a74517c7f6b9ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 22:23:49 +00:00
Derek Jedral
57c7dd9741
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
am: 898e1d95f3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: Iacff802347ca8f679ffc4e487cf62627c7d30f1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 22:21:34 +00:00
Derek Jedral
898e1d95f3
Merge "Change preference title if Active Unlock enabled" into udc-dev am: 42deb763e0
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22997141
Change-Id: I73bb1c3acb600908a9dca9eff4fa7b01486b78c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 21:46:18 +00:00
Becca Hughes
762691c365
Merge "Disable all providers if none selected" into udc-dev
2023-05-08 20:58:01 +00:00
Austin Delgado
2971c13923
Merge "Fix going back after biometric enrollment in SUW" into udc-dev
2023-05-08 19:39:41 +00:00
Han Xu
8d8ce3f751
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 3894103292
am: aa3607690f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: If89e1522285e9fa6f81ad14b4bbd056ef448cfe4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 18:44:44 +00:00
Derek Jedral
42deb763e0
Merge "Change preference title if Active Unlock enabled" into udc-dev
2023-05-08 17:56:32 +00:00
Han Xu
aa3607690f
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 3894103292
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: Iba93634c1cea2f17bc89225c560beab89a4a6801
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 17:46:03 +00:00
Austin Delgado
6e745242da
Fix going back after biometric enrollment in SUW
...
Bug: 280530120
Test: atest BiometricEnrollActivityTest
Test: tested manually by swiping back after enrollments
Change-Id: I305dd0904f86e2fc77f02047de8f3fc2c54621cb
2023-05-08 17:24:19 +00:00
Becca Hughes
5262570691
Disable all providers if none selected
...
Bug: 280905737
Test: manual
Change-Id: I53214c29cd7f03c8034284e5067f03305566397a
2023-05-08 17:19:52 +00:00
Han Xu
4c1a703192
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 7a1efdb589
am: b2f83bcd3a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I14f51a4d7a2cd8070d90cd31e02716d9c803d015
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:41:40 +00:00
Han Xu
1d0bcd5b36
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 3894103292
am: 07509fdb48
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I9fa547ff36beb800cd9ac8ced142211e8a409e22
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:40:50 +00:00
Han Xu
b2f83bcd3a
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 7a1efdb589
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I86b3283678d4abd0dd5ff08c438650eb69840886
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:30:56 +00:00
Han Xu
07509fdb48
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
am: 3894103292
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I214ed455a66ce6ae4319d84be959a57bdbef6f59
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 14:05:24 +00:00
Han Xu
3894103292
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: Icfa29d0fa13e61acee1a0173d3d6e6603c04c97c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:26:28 +00:00
Han Xu
7a1efdb589
Merge "Fix wifi QR layout to fix image stretching" into udc-dev am: 2f970a1a05
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080178
Change-Id: I3a93f7089e99b1c85191c29963cf35bcb4e65796
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 13:01:03 +00:00
Treehugger Robot
31d2f2b70c
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
am: ef264fb304
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I667fccc9685486740b61c0f0545e20694d6affe6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:24:32 +00:00
Treehugger Robot
e2f4b5d242
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: dc11c24806
am: e42c86703b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I0b4e8fa0a9abffeb8dd459386f037380eb0d3d30
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:24:13 +00:00
Treehugger Robot
01624257fb
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: 93ab64ef47
am: 33ba391274
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I2c3540a7c7828f23ebb8ce13a8c237cfd772ccea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:20:09 +00:00
Treehugger Robot
d0304faca7
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: 99c883fd3f
am: c19f24b092
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I49397ccb1702f6c802c220c2a526a6dbec497e9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:59 +00:00
Treehugger Robot
e2ac5c55dc
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
am: 06e92b4bf8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Ib93f52eec186b4f3aeb535cf708d6184576b8b63
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:51 +00:00
Treehugger Robot
674600b53f
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: dc11c24806
am: 2ea4f0747e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: Ib012475ebf31463dd2249c95cf7e33d34a2360cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 12:19:37 +00:00
Han Xu
2f970a1a05
Merge "Fix wifi QR layout to fix image stretching" into udc-dev
2023-05-08 12:17:59 +00:00
Treehugger Robot
33ba391274
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: 93ab64ef47
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Ib5467588c0b5c6cc68f97d95bdeb58f84e115b7e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:43:20 +00:00
Treehugger Robot
c19f24b092
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: 99c883fd3f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I8f129892f4f10838a059730436d4ae957846b476
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:43:12 +00:00
Treehugger Robot
ef264fb304
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I07d591bbec5d5d2fe68d019613c424d319750f7a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:42:13 +00:00
Treehugger Robot
e42c86703b
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: dc11c24806
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I417be26a4538146e20432c71bf6858e1f6bc8026
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:42:00 +00:00
Treehugger Robot
06e92b4bf8
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
am: b5682235cc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: Idf5508432319cec7cc2f5239260e3365d6e55ffd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:52 +00:00
Treehugger Robot
2ea4f0747e
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
am: dc11c24806
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: Ieeb3a1b72e00c95592374b5e595e5b2d01906ef0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:38:45 +00:00
Treehugger Robot
b5682235cc
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I18598bec86a2ad09837544559b7044eda190a247
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 11:00:53 +00:00
Treehugger Robot
dc11c24806
Merge "Fix the updateDialogForCdmaPhone test case failed" into udc-dev am: fb1cebd7f9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23078645
Change-Id: I583abc51b4e4160783d8ca14d810418b675892d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:59:44 +00:00
Treehugger Robot
93ab64ef47
Merge "Fix the battery string incorrect spelling" into udc-dev am: 23d3eda967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23080181
Change-Id: I231ff30e5df9248bf3713511ebb00795c502cba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-05-08 10:56:22 +00:00