Avinash Vadlamudi
50e4c2021a
Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c
am: 169c050db8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611347
Change-Id: I364f6a0bf67de19138a34e3a8a4471c22c598b5d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:43:34 +00:00
Avinash Vadlamudi
169c050db8
Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611347
Change-Id: I6a9665500447f329bf63806a3a07cc63a7edeaa1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:04:00 +00:00
TreeHugger Robot
abf7114262
Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
am: 333d957462
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900
Change-Id: I6d31d214e5c3521e29ef8b2b7bc8d9ca51028f69
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 21:03:59 +00:00
TreeHugger Robot
333d957462
Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900
Change-Id: I54985ba7d58ada0a2f14604599221e6e609d9e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 20:48:07 +00:00
TreeHugger Robot
84ac180e39
Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
am: 5c5d11a4c2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900
Change-Id: Iaa9863b32dfe3d7b422231ad7bef8c7337c8d02b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 20:07:44 +00:00
Chaohui Wang
9524c65a29
Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
am: 68e47490d6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909
Change-Id: If85b0e7218e2a54c1a5be8a5667c03178a0f19bf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:59:30 +00:00
Chaohui Wang
66c1337ec4
Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
am: 55204b9224
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909
Change-Id: Icf7c6ef483b9f2e535dac154c7aae5b10810d03b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:56:33 +00:00
TreeHugger Robot
5c5d11a4c2
Merge "Refine FingerprintEnrollmentActivity" into udc-dev am: 7e9d6e7d22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21584900
Change-Id: I8462e18120d33429dbd931792a9d81f6a5f9a43b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:47:41 +00:00
Chaohui Wang
68e47490d6
Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909
Change-Id: Id4602df190b9ce51ad688635772662b27f673289
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:47:17 +00:00
Chaohui Wang
55204b9224
Merge "Disable the middle pages during development" into udc-dev am: e34d95d68e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21469909
Change-Id: Iad2fec07b257570ac6f6195bc0ed8d187337aa4b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 19:27:21 +00:00
Andreas Miko
f2dcb42f5f
Merge "Add setting to disable PIN animation and password"
2023-02-28 17:37:07 +00:00
Avinash Vadlamudi
019ce4c02c
Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev
2023-02-28 15:10:27 +00:00
TreeHugger Robot
7e9d6e7d22
Merge "Refine FingerprintEnrollmentActivity" into udc-dev
2023-02-28 12:58:53 +00:00
Avinash Vadlamudi
7da92e9295
[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state
...
- Save and restore the autoPinConfirmOptionSetManually field during activity restart (because of orientation change)
- This helps to retain the state of the auto confirm unlock checkbox during an orientation change during set PIN stage.
Bug: 268592440
Test: Manual Test
Test: atest ChooseLockPasswordTest
Change-Id: I48ce9080b6007fb4e3a5ca5013d6c21ed4ba664f
2023-02-28 11:54:16 +00:00
Chaohui Wang
e34d95d68e
Merge "Disable the middle pages during development" into udc-dev
2023-02-28 11:43:05 +00:00
Andreas Miko
9e364dcebf
Add setting to disable PIN animation and password
...
Test: Unit - atest SettingsRoboTests
Test: Manual - Set PIN lock and enabled/disabled the setting to observe animation change during PIN entry
Bug: b/204799468
Change-Id: I587b993ef5515a075442e82ebafae88bebdffc20
2023-02-28 10:30:28 +00:00
TreeHugger Robot
a9385841bb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours am: 488d3adb81
-s ours am: de10018301
-s ours am: 1b34eb83ea
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I3bb6f0dcc559a94d30d3a7d91e26f0d9634d7381
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:42 +00:00
Bill Yi
523e1795e6
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours am: 0f86c524c8
-s ours am: 6b8e4c701b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: Id11ad5d740e7e203abd3e031b5bd3bc85ab022a5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:36 +00:00
TreeHugger Robot
367d91ef3b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours am: 62a6197006
-s ours am: 98e097b2e6
-s ours am: 37d176a317
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I72323038b0c4f3a3b9d52e40552be4405f69075f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:29 +00:00
Bill Yi
f3ddacca40
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours am: 49c2652453
-s ours am: c693b4db1b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: If716aa7a6703df24d622df965d6b7134c468da67
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:05:15 +00:00
Bill Yi
b141156feb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours am: 8f600b3932
-s ours am: c9832aa578
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: Iec97c6673c19cfb4717a641c117480c4702db650
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 02:04:53 +00:00
TreeHugger Robot
c45b463b05
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours am: 488d3adb81
-s ours am: de10018301
-s ours am: 5d80437ceb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I08666f546bc55fd4b0f2e346c0d92e7478f8c2cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:14 +00:00
Bill Yi
263c5c5336
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours am: 0f86c524c8
-s ours am: 12a74965ba
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: If7f37ceaaa56a015ce781f584dcc59c28a9edf46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:12 +00:00
TreeHugger Robot
2f43390bac
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours am: 62a6197006
-s ours am: 98e097b2e6
-s ours am: 6e5e22c0a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I445adb22ce424786aea622a9b8faf1c4729b7df1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:06 +00:00
Bill Yi
59def3ffc7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours am: 49c2652453
-s ours am: 9de21738be
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Id06ca3e623d9f15bcb85b81a898ac0737ecb2b66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:53:00 +00:00
Bill Yi
3af6a83609
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours am: 8f600b3932
-s ours am: 3e8d456279
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: Id9d7f7d43d9ad2d68c6ebbbbb61944fca3e46a84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:52:23 +00:00
TreeHugger Robot
1b34eb83ea
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours am: 488d3adb81
-s ours am: de10018301
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I6595604d4cf74c2165f6e7ca36c50759d77b936e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:19:46 +00:00
Bill Yi
6b8e4c701b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours am: 0f86c524c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I6e1df9f9045f9d617c48f3f2638f0b8c1da3fb61
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:19:43 +00:00
TreeHugger Robot
37d176a317
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours am: 62a6197006
-s ours am: 98e097b2e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I68550569875b440d78ae9f9b24732853ef90d531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:19:38 +00:00
Bill Yi
c693b4db1b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours am: 49c2652453
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Ica4924bc54b24e0ca29937fea69c3bf0aa3ac709
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:19:28 +00:00
Bill Yi
c9832aa578
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours am: 8f600b3932
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: I49251020739d114e47b402a513ef23955b4038b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:19:01 +00:00
TreeHugger Robot
5d80437ceb
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours am: 488d3adb81
-s ours am: de10018301
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I70b6280d4b43da60dd2b4af200f04e2ad992cbfa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:29 +00:00
Bill Yi
12a74965ba
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours am: 0f86c524c8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I44beba09fcaff9c0d6d7b5de4879d9781c9e98dc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:21 +00:00
TreeHugger Robot
6e5e22c0a5
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours am: 62a6197006
-s ours am: 98e097b2e6
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I79b712d8dea6ad2f66600ef28a2f1d3e1afe4d62
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:18:16 +00:00
Bill Yi
9de21738be
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours am: 49c2652453
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I7db0e8366e5f1d3b963a19be1265fa41a8855323
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:17:59 +00:00
Bill Yi
3e8d456279
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours am: 8f600b3932
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: Ica41031b95d61fb60cbf20f1a8a826db19b7679b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 01:17:40 +00:00
TreeHugger Robot
de10018301
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours am: 488d3adb81
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: If39365a1964c49b7ee609fe0f88f6b5dce6bc9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:40:01 +00:00
Bill Yi
0f86c524c8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours am: 934826d8d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I4c75ab1453ac6d2491881c6981ff5d6ca393f12a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:55 +00:00
TreeHugger Robot
98e097b2e6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours am: 62a6197006
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: I94fb8806123683ab43a3f75fdeefda6a191b75c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:40 +00:00
Bill Yi
49c2652453
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours am: 47d7d69611
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Id472fd8a72cf62a383942953901c18e13570dc9b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:27 +00:00
Bill Yi
8f600b3932
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours am: 5d6536ce44
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: I43d982ef1c633b0fb592a81b3cd49c55cc20862c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:39:11 +00:00
TreeHugger Robot
488d3adb81
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 8e002f962e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: Id7f81ddfe5f308de358950a5eba75a2852f29f38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:37 +00:00
Bill Yi
934826d8d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: a2cbc7ea7c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604873
Change-Id: I4c800f6e4828b492ee35ba09492fac1f388f3fae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:33 +00:00
TreeHugger Robot
62a6197006
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 3f75c80642
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Ib76fbcdf3c4c9a282bcb659941d0ea465d1ea675
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:29 +00:00
Bill Yi
47d7d69611
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: c253ffe61a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604872
Change-Id: Ib27e69a8c83f8a538a387a3b95d137d68841d739
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:06:17 +00:00
Bill Yi
5d6536ce44
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 99b4d024d1
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21604871
Change-Id: I8aea0e66f39df752b06ba85adc5201a8bd1ebf8f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-28 00:05:41 +00:00
TreeHugger Robot
8e002f962e
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
TreeHugger Robot
3f75c80642
Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master
2023-02-27 23:59:16 +00:00
William Leshner
31d834320c
Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297
am: f5364571a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654
Change-Id: I76751b25e8f24fa288822e7d942075318a1a2a2e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 21:34:47 +00:00
William Leshner
ef5b93d05d
Merge "Restrict screen saver settings searches to enabled users." into udc-dev am: 01dfbcc297
am: c60c7e70a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21486654
Change-Id: Ia3ba4a7764b2f2a3f1a4320a4db9d13afd9d4df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-02-27 18:33:51 +00:00