Commit Graph

121040 Commits

Author SHA1 Message Date
Bill Yi
3d4d0267c6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1b14926b3701b36b0720c264cae94087d17ed75
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 03:05:09 +00:00
Bill Yi
858813dc33 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08f758e7ac7349eea06ec2ddca2663507d774bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 03:04:41 +00:00
Bill Yi
ea2310e0fe [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ia4c3858ec103f63ee8da598b5263c32aa12c2214
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:34:35 +00:00
Bill Yi
960eae9a2f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70efdf826f91370e142e2001bcc787b102125430
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:34:32 +00:00
Bill Yi
71ad7ad49e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I21f3db8861e7bd07d1fb4c4325989425862ebaa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:34:30 +00:00
Bill Yi
9de8ff63dd [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic316185ed34b2ba3801f22f7013cca419f30a090
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:34:22 +00:00
Bill Yi
cac65afe79 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If1ad768e127f48cb041a2f486e41bd1539c41224
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:34:06 +00:00
Bill Yi
d3fa508918 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours
am skip reason: subject contains skip directive

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

Change-Id: I173610558cc94901d1b48f39cc99964e5a0a55ee
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 01:33:38 +00:00
Diya Bera
5faf4eeb8e Learn more updated in Fingerprint Settings for side fps
Test: Manual - Go to Fingerprint Settings and check the string
Bug: 258338293
Change-Id: Ia22fcd1289bec85642993b22fe3cb3ebaf647cbd
2023-03-01 01:13:03 +00:00
Bill Yi
7ef6dedd46 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-01 00:49:32 +00:00
Bill Yi
4798986201 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-d1-dev 2023-03-01 00:49:32 +00:00
Bill Yi
839c6e88b4 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 00:47:17 +00:00
Bill Yi
798dd47215 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 00:47:17 +00:00
Bill Yi
586da77594 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-03-01 00:47:17 +00:00
Julia Reynolds
36e0d85039 Merge "Make string the same across screens" into udc-dev am: 510cb8f22e am: 24131b83e7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119

Change-Id: I8ddaba3f5278ef00bb3c275190aa76efc13f7e38
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:36:38 +00:00
Julia Reynolds
675bf5b563 Merge "Fix settings crash" into udc-dev am: 20c5853744 am: 218310af06
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756

Change-Id: I9529060acc048ff4335caaf3f8f91c1f187b3dbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:36:24 +00:00
Julia Reynolds
114cb4df2d Merge "Make string the same across screens" into udc-dev am: 510cb8f22e am: 6a5a753fb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119

Change-Id: Ia59a9edbe2e641cf689224cf334d47ccefc2e754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:21:03 +00:00
Julia Reynolds
dcea6f6768 Merge "Fix settings crash" into udc-dev am: 20c5853744 am: fbcd40d274
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756

Change-Id: I3393ded4711252d8b2e868095ea8862349c7b8bd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:19:42 +00:00
Ahaan Ugale
96cb0fb4bd Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329

Change-Id: I86a993dbc87ab3f7c59dd02b360be4e864d8cfef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 00:01:23 +00:00
Julia Reynolds
24131b83e7 Merge "Make string the same across screens" into udc-dev am: 510cb8f22e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119

Change-Id: I836dfcee1df32aa69f6f2ce8948136920e06ca04
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:54:26 +00:00
Julia Reynolds
218310af06 Merge "Fix settings crash" into udc-dev am: 20c5853744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756

Change-Id: I89c5d6dc687e2929cedd0e6a47461a91287d1776
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:53:57 +00:00
Julia Reynolds
6a5a753fb2 Merge "Make string the same across screens" into udc-dev am: 510cb8f22e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21654119

Change-Id: I7f39147624496dfcb913ae13116db57fe0adfec6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:44:17 +00:00
Julia Reynolds
fbcd40d274 Merge "Fix settings crash" into udc-dev am: 20c5853744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21650756

Change-Id: I2279f891c8eeec33e43bc19460a57c5136e2eec7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:40:51 +00:00
Julia Reynolds
510cb8f22e Merge "Make string the same across screens" into udc-dev 2023-02-28 23:30:15 +00:00
Ahaan Ugale
b238ee99cc Merge "Update Autofill OWNERS" am: e35606efd3
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329

Change-Id: I3837d1677ee9769f9dd5ff88d6eedbdaf97b94e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 23:23:30 +00:00
Julia Reynolds
20c5853744 Merge "Fix settings crash" into udc-dev 2023-02-28 23:02:06 +00:00
Ahaan Ugale
e35606efd3 Merge "Update Autofill OWNERS" 2023-02-28 22:42:36 +00:00
Bill Yi
118faadcb1 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I20707402de4333b6c20b6cf564d5cff1e706397a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:34:59 +00:00
Bill Yi
b710a96e76 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I734c5e24a8d70c11cc66edcd2da368f2ccf9486d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:34:23 +00:00
Avinash Vadlamudi
564097499b Merge "[Auto Pin Confirmation]: Save the autoPinConfirmOptionSetManually field state" into udc-dev am: 019ce4c02c am: 2838dde36e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21611347

Change-Id: I044a1fdcbef2688c96e1ea575a9680dcbc30d28a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 22:26:35 +00:00
Bill Yi
64fd489c13 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-28 22:15:39 +00:00
Julia Reynolds
e75dfc6f05 Make string the same across screens
Test: view notification settings
Fixes: 245912213
Change-Id: Ifb1966a2102afa38ed00bb81e08bbd1b92123a55
2023-02-28 17:10:24 -05:00
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
2838dde36e 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: Ida2ec570ce03146046925733a6971e5ca6a70b23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:42:11 +00:00
Chris Li
74f07a89bd Update EmbeddingAspectRatio to the latest am: 77a23c9ce2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966

Change-Id: I80f5c1e6a44e6ea4d73d6fbd0fad83ad3be4c0e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 21:40:35 +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
Will Leshner
554fe689fa Restrict screen saver settings searches to enabled users. am: 3358e2a0a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411

Change-Id: I20b547eb56aac56837de97473671d902b2e524fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-28 19:12:43 +00:00
Bonian Chen
62e934a039 [Settings] Improve logging to support issue triage
1. Avoid from deprecated warning log
2. Add targetting subscription id into log

Bug: 271126362
Test: local

Change-Id: I6eac2032cc29b193dab009626a9824ee4fb451f5
2023-02-28 17:56:35 +00:00
Andreas Miko
f2dcb42f5f Merge "Add setting to disable PIN animation and password" 2023-02-28 17:37:07 +00:00
Chris Li
77a23c9ce2 Update EmbeddingAspectRatio to the latest
alwaysAllow() is changed to ALWAYS_ALLOW per API Council feedback.

Bug: 270160592
Test: build
Change-Id: I44c7e97932456ec5b5bb0339ee2ee060cb6e42e0
(cherry picked from commit af2b07b248)
(cherry picked from commit 1092486873)
2023-02-28 17:13:39 +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
Natnael Belay
c6049dfa4e Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp 2023-02-28 14:51:50 +00:00