Bill Yi
|
1b02444dc8
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours am: b710a96e76 -s ours am: d4f79a3237 -s ours am: dc34bb4d61 -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: I43ac5fc0b09bdf97b2d208f2a8b4fd33c6b3b246
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:31:47 +00:00 |
|
Vincent Wang
|
069acab974
|
Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev am: 9c57255b39 am: 0c94e742b5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659502
Change-Id: I7d2916f2bb1ce7b73efdfdca74d6fafd197065c8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:22:09 +00:00 |
|
Bill Yi
|
dc34bb4d61
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours am: b710a96e76 -s ours am: d4f79a3237 -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: Ibb1ece6df3315e5a44ad068fd47c5ca43e951554
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:17:59 +00:00 |
|
Vincent Wang
|
0c94e742b5
|
Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev am: 9c57255b39
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21659502
Change-Id: Ib140e660eea9036bb873cc0bb2e71ea55ebb9eec
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:07:23 +00:00 |
|
Bill Yi
|
d4f79a3237
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: e722779e34 -s ours am: b710a96e76 -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: I088f64f5800182407977b482021b25c509fe40ad
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:04:49 +00:00 |
|
Vincent Wang
|
9c57255b39
|
Merge "Fix Different layout between v2 enrolling and original enrolling page" into udc-dev
|
2023-03-01 12:58:10 +00:00 |
|
Andreas Miko
|
536cab720d
|
[automerger skipped] Merge "Add setting to disable PIN animation and password" into udc-dev am: 8b71dc930d am: 0d883efab0 -s ours
am skip reason: Merged-In I587b993ef5515a075442e82ebafae88bebdffc20 with SHA-1 9e364dcebf is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591508
Change-Id: I1fac500209e40971809c27574c76423cdc58ab2f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 12:56:11 +00:00 |
|
Chris Li
|
15532035ef
|
Update EmbeddingAspectRatio to the latest am: 77a23c9ce2 am: 74f07a89bd am: 2bde9085dd am: 3eb64058b2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966
Change-Id: Ic13e83e472dd49322a325f87240dddb626eeec4e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 12:55:39 +00:00 |
|
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 |
|
Andreas Miko
|
0d883efab0
|
Merge "Add setting to disable PIN animation and password" into udc-dev am: 8b71dc930d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21591508
Change-Id: I6653e57561da90f6cb4b39ce2095755d1bdb1105
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 12:52:15 +00:00 |
|
Chris Li
|
3eb64058b2
|
Update EmbeddingAspectRatio to the latest am: 77a23c9ce2 am: 74f07a89bd am: 2bde9085dd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966
Change-Id: I9bcdc517ba6a56af380d913f334a100a93046096
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 12:49:39 +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 |
|
Andreas Miko
|
8b71dc930d
|
Merge "Add setting to disable PIN animation and password" into udc-dev
|
2023-03-01 12:46:04 +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 |
|
Chris Li
|
2bde9085dd
|
Update EmbeddingAspectRatio to the latest am: 77a23c9ce2 am: 74f07a89bd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21647966
Change-Id: Ia7bf3e93b642f7a3306b17aec823436e42c2e804
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 12:16:15 +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
|
b7e04a59a8
|
Fix Different layout between v2 enrolling and original enrolling page
Bug: b/271210305
Test: 1. adb root
2. adb shell setprop sys.fflag.override.settings_biometrics2_enrollment true
3. Enter fingerprint enrilling page
4. Rotate device to 90 or 270 degree
5. Change the roation to 270 or 90 degree
Change-Id: Ib495bd281a208f0c13707ef6e3ed402ac418b8b6
|
2023-03-01 09:13:42 +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 |
|
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 |
|