Commit Graph

124819 Commits

Author SHA1 Message Date
Treehugger Robot
24666c9737 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev 2023-04-29 03:21:56 +00:00
Treehugger Robot
9d63f7fe9f Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 am: cef37fe214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I40efee420cb5426b71cf315468e59ee8ab724ea4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:57:14 +00:00
Treehugger Robot
108a816399 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: 76894e50f9 am: bb24cf231d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Iec11feedaa3ebbcb61529730615552ae0507c7b3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:53:08 +00:00
Treehugger Robot
0a9b57459d Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 am: 3be8f5f3a3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I9ef54747cfc414e7d0b9c7ba2c8a8b48ded7e0ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:52:08 +00:00
Treehugger Robot
2d5af103a7 Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 9a09103aaa am: 968de7c4a1 am: 380f70dd6c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: Ie8fdc8e338cefaca2ff56006890beb9b53839eed
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:38:30 +00:00
Treehugger Robot
165689fd5a Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd am: e25656bf3f am: 40f3fc08e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I32a33d4198e71717fba6be71ea08905e1f5350e9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:26:56 +00:00
Treehugger Robot
d4975592ff Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd am: 46895b026b am: 3b4cfe7403
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I5894ef65616916daa39ceca48caf8bbda9ffdde7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:21:58 +00:00
Treehugger Robot
bb24cf231d Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: 76894e50f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Ic1382f4002183d71d45365f07c7ee9700b744d84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:14:25 +00:00
Treehugger Robot
cef37fe214 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Icd50c4d717bc92dcc77a41bde346d628ed5e3c48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:14:22 +00:00
Treehugger Robot
3be8f5f3a3 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I9ba8763ae78ee0d5ef5fc5ac74dd88780aeb4069
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:09:58 +00:00
Treehugger Robot
116e31cb22 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: a2bc86d4b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I99ae19e61ecab93eb3c3b80956ecd4b1acc9ea0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 02:09:25 +00:00
Julia Tuttle
363bf284d0 Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: 6fb097c08c am: dd9bc876dc am: 381425fe12
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: Icd5cad3be2c3a18d2e78aba703f869cbfb99c51e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:59:22 +00:00
Julia Tuttle
266ccd7f90 Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: b34c993a13 am: a8e8345a8c am: 106c80e5af
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I66fb950d1937d76429eb22878f0de94986987f58
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:53:16 +00:00
Austin Delgado
22644b7385 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078 am: b8fc7e5bc2 am: 22f2d436d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I2d3f1f5138230d6fda0cc6aeb9c4b1de94efbb4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:44:36 +00:00
Bill Yi
20fc31a67b [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 6ce6a33514
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913898

Change-Id: Ia880cc8be1a6498469248be51b179796aa9555bc
2023-04-29 01:40:30 +00:00
Bill Yi
ac3d1df32f [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a7c30fb20
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22913127

Change-Id: I887f90805c826221fed5e4afdc7607c157a49ca2
2023-04-29 01:40:26 +00:00
Bill Yi
a8443122f8 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: aa051e78aa
Blank merge reason: commit message contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22911587

Change-Id: If53430c82136a0f3d05daba434a741483c9752e5
2023-04-29 01:40:19 +00:00
TreeHugger Robot
0c77e67a96 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 am: 99a75b24ee am: f1b268cd84
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I78448fae21cf5ea116638e4a3d6003fb7a987c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:39:05 +00:00
Treehugger Robot
a2bc86d4b6 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: I31a9d2b02201ab35e6bea643983eedeafccd2541
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:33:16 +00:00
Treehugger Robot
e31a768cf5 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Id3f95abd142fba8eecd361d8b13bd2bd4db1c28d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:34 +00:00
Bill Yi
1d9269a285 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours am: 1b4f6059dc -s ours am: e529c88a05 -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: I5541eda9f8e016143305deb6b654dde57cdc93d9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:32:06 +00:00
Julia Tuttle
84b9ca5e62 Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: e0adef90bb am: 775d61dc4e am: 8b94eddaa4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I3780e74201b0c9cb064b7d4e1f5d8139ca1167d1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:29:39 +00:00
Treehugger Robot
76894e50f9 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

Change-Id: Ic623ebc6f6f1dfca6e2e4c8744700e296abd270c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 01:27:13 +00:00
Treehugger Robot
c72b766263 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev 2023-04-29 01:03:35 +00:00
Treehugger Robot
380f70dd6c Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 9a09103aaa am: 968de7c4a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I47c9054cda6bbfbbae9290aa4d321b80b04a7614
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:52:36 +00:00
Treehugger Robot
40f3fc08e8 Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd am: e25656bf3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: Ia767623d17a22d3a0931b6491f7daf59d9419de1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:50:40 +00:00
Treehugger Robot
3b4cfe7403 Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd am: 46895b026b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I200127f817f7317a2d5c42933948754bf3a7320f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:48:48 +00:00
Treehugger Robot
968de7c4a1 Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 9a09103aaa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I2658b778f6b67719d1c2b7e0480c5b0b105394bc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:08:27 +00:00
Treehugger Robot
e25656bf3f Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I4ff8b3f58901a52396cfae2fced59081f4aeb01c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:07:38 +00:00
Treehugger Robot
46895b026b Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: 550e33b9cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I51b35a417b63e17126fc55ed5cb3d2b3bf68ea8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:04:23 +00:00
Automerger Merge Worker
2a495737f9 Merge "Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: d686c68c69" 2023-04-29 00:04:12 +00:00
Treehugger Robot
957d03316a Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27 am: d686c68c69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I7f01b4d5757170653680bcb03ce39c323260e3a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:03:25 +00:00
Julia Tuttle
8f8bfada2d Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: 7e3355382b am: 472a2024ad am: 13e943fee5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I7675825e0babda5fe9a67cc0f69ed274e9efb781
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 00:02:40 +00:00
Austin Delgado
5fb062ab28 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: ff7ae4123b am: ce3118d414 am: ebd53855f3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: Ided2f43ae60704e9bb7ab72738809e30b332794e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 23:31:52 +00:00
Treehugger Robot
550e33b9cd Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I2b0bf456f6f494de4f626f93320a0bef8051b6ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 23:26:13 +00:00
Treehugger Robot
d686c68c69 Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I93984c35284fea5ec76495c13bfec34c204d2c62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 23:26:05 +00:00
Treehugger Robot
9a09103aaa Merge "Fixes broken Settings test." into udc-dev am: 01c585ed27
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22932419

Change-Id: I57eb532cd21eb2e28b0d58deae5c9adaef597bcf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 23:22:14 +00:00
TreeHugger Robot
53fea87d37 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 041d659ab7 am: e8defdd89f am: 974f5ab54a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I82fd96e11596e597ea9410dd0cc2a1001799877d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 22:48:21 +00:00
Treehugger Robot
01c585ed27 Merge "Fixes broken Settings test." into udc-dev 2023-04-28 22:37:57 +00:00
Julia Tuttle
0173df6f7c Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: 6fb097c08c am: 7edbed90aa am: 9781724e80
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: Id3221faee0a548f5892fea6dec3dbc989e1aa6a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 22:29:11 +00:00
Treehugger Robot
5589cfbf33 Merge "Revert "Rollback decision to merge by package name"" 2023-04-28 22:23:43 +00:00
Julia Tuttle
381425fe12 Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: 6fb097c08c am: dd9bc876dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: I6799052afec7e6f577249ddcf34665a4b45d2918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:59:24 +00:00
Julia Tuttle
106c80e5af Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: b34c993a13 am: a8e8345a8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: Ia34287c3fab9cbd66db4c720974aea82ed0708e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:56:54 +00:00
Julia Tuttle
536ab416ac Merge "Optimize imports in AppNotificationSettings" into udc-dev am: ec12caadda am: b34c993a13 am: e3e8b4cd02 am: dec7d67dcf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897912

Change-Id: I9c5a5b7b052019c00b8be1e95fa31400a768e4c3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:53:25 +00:00
Austin Delgado
22f2d436d3 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078 am: b8fc7e5bc2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: I93f7be4048e867c50c3efd1aeabc33f56c1c4c1b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:50:44 +00:00
TreeHugger Robot
f1b268cd84 Merge "SettingsRoboTests: fix device state rotation related tests" into udc-dev am: 6e524f6244 am: 00259adc51 am: 99a75b24ee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22930697

Change-Id: I573cc77a6f37c3be211f718a65963efd7efc1ed7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:44:50 +00:00
Bill Yi
e529c88a05 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 547484f797 -s ours am: 4174b548cf -s ours am: a4eb2b9a37 -s ours am: 1b4f6059dc -s ours
am skip reason: subject contains skip directive

Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22919033

Change-Id: Ie2f004f122a602943979c3a20da29aad484a3c2b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:19:35 +00:00
Austin Delgado
2e4c36c8b8 Merge "Hide enrollment options that don't match requested biometric strength" into udc-dev am: 9b94905c63 am: f5d8437078 am: a386dddf72 am: 5511a2293e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22646172

Change-Id: Iedfdda5bd5942e0ced09adcc242dc3b072bdcc02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:15:09 +00:00
Julia Tuttle
8b94eddaa4 Merge "Fix a couple compiler warnings in Settings" into udc-dev am: 7b3df1c080 am: e0adef90bb am: 775d61dc4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22897913

Change-Id: Ic76abcc25f194a7043833723db304bab14976465
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-28 21:06:28 +00:00
Becca Hughes
7fdbfc7b0e Revert "Rollback decision to merge by package name"
This reverts commit ca542c90cd.

Reason for revert: product changed mind

Change-Id: Ic4b9275e8f19bf2b3e3e51f09162fb6d45e6a5bf
2023-04-28 21:06:00 +00:00