Commit Graph

122646 Commits

Author SHA1 Message Date
Treehugger Robot
e1f02bcd5c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours am: 295768313b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Idd8708c40154bd49c2756020f5cd81cc4933fba9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:33:31 +00:00
Bill Yi
5beef0317f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours am: ace4cd9f14 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8bc42262a52dfdd2c2ef6ae089a53e58d5a5d52d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:32:55 +00:00
Treehugger Robot
95d104eb24 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours am: 06daae87ea -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9c34a7b8add52807fe966a69b10df75317941e1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:32:31 +00:00
Bill Yi
9a7737a274 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours am: 75f8c5d4ef -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6c5b3359d24e4a775c2c6c2e7b4452d3c02bfe0d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 09:31:53 +00:00
Treehugger Robot
3740b67371 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I387cdba42cd4f17dd55709b3708092c6f2106637
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:56:12 +00:00
Bill Yi
c02b50c037 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifb19ad9c9f63ea0916c95d6c6a9cb4d2610627c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:56:04 +00:00
Treehugger Robot
052b29430c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I931eb3cced5e3cefad8cd5fe7c94eed15999ec83
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:56:01 +00:00
Bill Yi
243f587fd9 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaae4ebe9ffc438c9ffb8252302d78ebed242d4f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:55:27 +00:00
Treehugger Robot
e00549cdd4 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e453c16410385ed5f0b74d2c5581399f5b4dedb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:55:20 +00:00
Bill Yi
e08678a3fa [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I693b38f4c4f289fe3d216b4e7d67b43fdc42ce0c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:54:40 +00:00
Treehugger Robot
e6b237fffe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: a1c21ec6d0 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib1bc692d73d057033d1b4cdb416eb34bac1047ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:50:27 +00:00
Bill Yi
f7324a1365 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 4aaf3c69d2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8be64b19a279edb0aa52b532b20d081c932dd47f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:50:11 +00:00
Treehugger Robot
295768313b [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 7d651cba2a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I734f3b888752df5bcde845c58df99c54c4121c13
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:50:08 +00:00
Bill Yi
ace4cd9f14 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af0651b602 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5bf0721434528ffbb0ea0a93f16f5b6aa61234d0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:50:02 +00:00
Treehugger Robot
06daae87ea [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev am: 987cc7259b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I442c0552627cc95dff567f00023e9acd842b8a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:49:33 +00:00
Bill Yi
75f8c5d4ef [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 75997c0291 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id0acbfd620aa09081d9bf0db20723d25c41fde33
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 08:49:08 +00:00
Treehugger Robot
a1c21ec6d0 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Treehugger Robot
7d651cba2a Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Treehugger Robot
987cc7259b Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-04-29 07:57:31 +00:00
Chaohui Wang
ca615997ea Use string notifications_disabled instead of off
notifications_disabled was changed to off in
Change: I5f84d09f223efd478461ded93aeac82bf7b128d8

And reverted from off to notifications_disabled in
Change: Iaad301c5513478fb95e40987ea3ccb4f923d71fa

This usage is branched from AppNotificationPreferenceController.java,
and missed in revert.

Bug: 272603842
Test: Visual
Test: Unit test
Change-Id: I5b8466134c1342e10de7a2ead8c52931e0c19377
2023-04-29 15:42:09 +08:00
Treehugger Robot
6dbed93a01 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f am: 9dccc78050
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I54d5a5dae4c0adbd104f74b6405a1125f005640d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:22:41 +00:00
Grace Cheng
ec1bd37db0 Prevent NPE on deleting fingerprint in Settings
Gate all Settings FingerprintUnlockCategory logic on isSfps() check to prevent NPE

Fixes: 279866500
Test: Enroll 2+ fingerprints on a non-sfps device, delete fingerprint,
observe no crash

Change-Id: I040d498426e0f8efb789875eedeb7bcf44436149
2023-04-29 05:19:41 +00:00
Treehugger Robot
8066d50d08 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 4671972bea am: 0eb1227f1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I0f66992493412b7caaadba68e5fea25c3a1892a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:14:36 +00:00
Treehugger Robot
474ed89419 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f am: fabaacd2e6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I21df140756c90aaaae4daaa017cf1f57bc694ef1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 05:13:21 +00:00
Treehugger Robot
0eb1227f1a Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 4671972bea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I0141cab3b834ca660b13cf7b606c7a62573ee1c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 04:42:01 +00:00
Treehugger Robot
9dccc78050 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I01654ba6548b73b357a39f4ed8cb015395fabf5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 04:40:54 +00:00
Treehugger Robot
fabaacd2e6 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I07065ad6b618a9bbeac0d41d48eb5e8898a783d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 04:36:25 +00:00
Treehugger Robot
c1a32a5a7f Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I553d2a4be15286ec59f6fb38b188f4878c0e0c76
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:57:09 +00:00
Treehugger Robot
4671972bea Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: Ica664646426196d5a88072594eb1a6d04b37ed97
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-29 03:52:58 +00:00
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
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
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
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
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
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
01c585ed27 Merge "Fixes broken Settings test." into udc-dev 2023-04-28 22:37:57 +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