PawletOS/app_Settings
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
124,898 Commits 1 Branch 0 Tags
bfc811f384ab6ac56192f8c4fc4ee24732e5d76c
Commit Graph

124898 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
ff5051e9f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod am: 0f3ad0ceaf -s ours 
am skip reason: subject contains skip directive

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

Change-Id: I269ad34b66eaa06a713aca4727587367f3de5abe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 08:26:01 +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
TreeHugger Robot
0f3ad0ceaf Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-mainline-prod 2023-04-29 07:49:27 +00:00
TreeHugger Robot
5df6892b70 Merge changes from topic "tc_change_23042818_u_19" 
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 2a7c30fb20
  Import translations. DO NOT MERGE ANYWHERE
 2023-04-29 07:49:27 +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
dd7651a556 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: c1a32a5a7f am: 9dccc78050 am: 6dbed93a01 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

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

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

Change-Id: Iad055bd64fb23fa6d1311b95d39aa8d4503d38ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 05:42:22 +00: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
fa4f628318 Merge "Add developer option switch to set ANGLE as the default system driver" into udc-dev am: 24666c9737 am: 7dfd217c1e 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22542821

Change-Id: I3b39848e791168df59d4f2203f59ae14728069df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 04:36:52 +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
7dfd217c1e 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: Ie960d3dfa35598340a6394888f8d88d6f9d1303b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 03:56:58 +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
5b742dc320 Merge "Set minHeight for remote lockscreen validation checkbox" into udc-dev am: c72b766263 am: e31a768cf5 am: cef37fe214 am: 9d63f7fe9f 
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/22869576

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

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

Change-Id: I37ed24fa4dc22b607bcad17300a6ec1e3b24cb1f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
 2023-04-29 03:38:17 +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
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