Will Leshner
1181c62b38
[automerger skipped] Restrict screen saver settings searches to enabled users. am: 3358e2a0a1
am: 554fe689fa
-s ours am: 5a7e38ee6c
-s ours am: 205adf930e
-s ours
...
am skip reason: Merged-In If2f465b2acb548455f0868507cf47217ea1a626f with SHA-1 ca1379f0b3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411
Change-Id: I74f51727805f0488195c6a63dd520ab844243c64
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:55:29 +00:00
Natnael Belay
0974082b68
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp am: c6049dfa4e
am: f89a6c2ed4
am: 9362fb4f42
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21615990
Change-Id: I53d3d7219b8742a8e28ec73caefb4cbfb31bdab2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:55:16 +00:00
Steve Elliott
2e82d0baf8
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11
am: 97ee8a8414
am: f6955e43d7
am: 8af89d5d21
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: Ib55853f9be40a61ab629cb07cb902cb687db4b14
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:55:01 +00:00
Will Leshner
205adf930e
[automerger skipped] Restrict screen saver settings searches to enabled users. am: 3358e2a0a1
am: 554fe689fa
-s ours am: 5a7e38ee6c
-s ours
...
am skip reason: Merged-In If2f465b2acb548455f0868507cf47217ea1a626f with SHA-1 ca1379f0b3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411
Change-Id: I8eb11896745666b11a8b5b9fb014145da347d55a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:49:24 +00:00
Natnael Belay
9362fb4f42
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp am: c6049dfa4e
am: f89a6c2ed4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21615990
Change-Id: I4df0e896427ab24cf7ab5a261719fba833f0c127
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:49:07 +00:00
Steve Elliott
8af89d5d21
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11
am: 97ee8a8414
am: f6955e43d7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: I00befad0d6bf0dbf5f99828bafde3fc91a775d43
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:48:26 +00:00
Darrell Shi
ecc9213a45
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94
am: d8f61dc2a3
am: 8ba70d32e2
am: b319e78682
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I1349f0bc03740f277f2d7ab8e4a38fc9c1929fc9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:34:23 +00:00
Darrell Shi
b319e78682
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94
am: d8f61dc2a3
am: 8ba70d32e2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I0181f593e0b76bbccef1c724a9dc2045e521b114
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:29:32 +00:00
Will Leshner
5a7e38ee6c
[automerger skipped] Restrict screen saver settings searches to enabled users. am: 3358e2a0a1
am: 554fe689fa
-s ours
...
am skip reason: Merged-In If2f465b2acb548455f0868507cf47217ea1a626f with SHA-1 ca1379f0b3
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21454411
Change-Id: I623dfed9918b7d101e790d28825b9fd8c9f9864b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:16:07 +00:00
Natnael Belay
f89a6c2ed4
Merge "Update EmbeddingAspectRatio to the latest" into tm-qpr-dev-plus-aosp am: c6049dfa4e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21615990
Change-Id: I546352a44aaf525b9819f59337658f3abdd8f77b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:15:34 +00:00
Steve Elliott
f6955e43d7
Merge "Update unseen notif filtering settings string" into tm-qpr-dev am: caf6347d11
am: 97ee8a8414
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21464051
Change-Id: I36e13e98689832aed10256e708e28082b6d00f74
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:14:18 +00:00
Darrell Shi
8ba70d32e2
Merge "Hide "additional info" when active dream does not support." into tm-qpr-dev am: 6b6c68fd94
am: d8f61dc2a3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21452841
Change-Id: I097729dd0420387e67d8aa7eba9642c4834330d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 12:12:28 +00:00
Vincent Wang
f9a8cbe9a2
Merge "Fix UDFPS enrolling crash" into udc-dev am: 8e3c46b1c9
am: 0e5068fb58
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617267
Change-Id: I80b4128890f755c4112372e953d1d3f9fd3488b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 10:52:46 +00:00
Vincent Wang
0e5068fb58
Merge "Fix UDFPS enrolling crash" into udc-dev am: 8e3c46b1c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21617267
Change-Id: I4c8fd5ae3709aa93fa269e93eac09ce0be0bb570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 09:57:21 +00:00
Vincent Wang
8e3c46b1c9
Merge "Fix UDFPS enrolling crash" into udc-dev
2023-03-01 09:12:38 +00:00
Vincent Wang
f2db627a7c
Fix UDFPS enrolling crash
...
Bug: b/271208595
Test: 1. adb root
2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
3. Record fingerprint
4. Check setting work normally
Change-Id: I69cc50cd677e80a57bb430a5a295c46b519d7755
2023-03-01 07:43:04 +00:00
TreeHugger Robot
86bd252ec2
[automerger skipped] Merge "Disable MTE developer option if device config overrides it" into udc-dev am: c5054d5907
am: 6fe481b424
-s ours
...
am skip reason: Merged-In Idd249e060a275b58a399349f202fc68b42964eb0 with SHA-1 65116faa29
is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548006
Change-Id: I2b47da0582aa68442e182e50edeebf0822af2cc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:51:02 +00:00
Chaohui Wang
06f806f6cd
Merge "Fix App Info item summaries not refreshed" into udc-dev am: f74d6003ff
am: bd1715e012
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647180
Change-Id: I54cf0d02cc52b8c42f61585ddc62b580b95b628a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:50:45 +00:00
TreeHugger Robot
6fe481b424
Merge "Disable MTE developer option if device config overrides it" into udc-dev am: c5054d5907
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21548006
Change-Id: I33d87ecc4efe5ac2364f4068ecca4e19a0c4b17d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:34:53 +00:00
TreeHugger Robot
c5054d5907
Merge "Disable MTE developer option if device config overrides it" into udc-dev
2023-03-01 06:21:23 +00:00
Chaohui Wang
bd1715e012
Merge "Fix App Info item summaries not refreshed" into udc-dev am: f74d6003ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647180
Change-Id: Icb6a711c9547e3cc43d504fba64259ad08c7357f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 06:14:53 +00:00
Chaohui Wang
f74d6003ff
Merge "Fix App Info item summaries not refreshed" into udc-dev
2023-03-01 05:47:06 +00:00
Bonian Chen
f6bbe0cc07
Merge "[Settings] Improve logging to support issue triage" into udc-dev am: 6113725b61
am: 9e7ab494df
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649741
Change-Id: Id5945a74a8519280a6618cf4d28e534ae4f0e24c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 05:16:02 +00:00
Bonian Chen
9e7ab494df
Merge "[Settings] Improve logging to support issue triage" into udc-dev am: 6113725b61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21649741
Change-Id: If3c21b526d512ea7c23ec89ca595f94f1b766b53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com >
2023-03-01 04:40:05 +00:00
Bonian Chen
6113725b61
Merge "[Settings] Improve logging to support issue triage" into udc-dev
2023-03-01 03:59:03 +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
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
Julia Reynolds
20c5853744
Merge "Fix settings crash" into udc-dev
2023-02-28 23:02:06 +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
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
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