Vania Januar
|
c1429bcb40
|
Handle DEVICE_TYPE_STYLUS in advanced details header.
Bug: 270654477
Test: AdvancedBluetoothDetailsHeaderControllerTest
Change-Id: I725dd575ba56bf86e1336094961e769b81540479
|
2023-03-01 17:22:15 +00:00 |
|
Bill Yi
|
b4dec8df46
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours am: 8baecfab5c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ie06abbe273cb33a98ff9a9b061cfd22c44f1b3c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 15:05:51 +00:00 |
|
Bill Yi
|
e02849b450
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours am: 2697dc29fc -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ib6da7e993c54e8bacf203dfe7bdcfc20e3cc3b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 15:05:49 +00:00 |
|
Bill Yi
|
581bcf009b
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours am: 5f755572b0 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I4e234071cb87935453ef4f3162ed9795ec974762
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 15:05:48 +00:00 |
|
Bill Yi
|
468069d4dd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours am: f8126117fe -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I7f6817bbf2e1a234991d90701d2ba2c65fa8977d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 15:05:47 +00:00 |
|
Bill Yi
|
976b58694f
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours am: b0cf8a0e4c -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I3b52b61282b4fb9a49d7e295252b37b3b84a012d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 15:05:46 +00:00 |
|
Bill Yi
|
2c34fd97dd
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours am: 27cafd0dfa -s ours am: c663a47b28 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If87a4d916e5339234e8c017976831989c3cc567b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 15:04:28 +00:00 |
|
Ahaan Ugale
|
8d9121fd5b
|
Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb am: bd9a87a9a0
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: Ic043a46c13b58770b274a66044f375de02758bd6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:56:07 +00:00 |
|
Bill Yi
|
8baecfab5c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I99e48c5a1d6b0da7b741ee6ba82018c308814617
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:50 +00:00 |
|
Bill Yi
|
2697dc29fc
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I5f814077dbc5cbcf3a68fc19a003bf6d1120d597
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:48 +00:00 |
|
Bill Yi
|
5f755572b0
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I3bfa33a7c2ae8c26357f7d616104badfe370e9f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:43 +00:00 |
|
Bill Yi
|
3fa074e985
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours am: 1ae472af4d -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Ia48dcb905bf4914fdb745bb8fb40bd803e220b28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:38 +00:00 |
|
Bill Yi
|
70d60b8130
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours am: b3a751453e -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Idd373c6f9aa5398f7f3f816a078cc8756e9a7fef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:35 +00:00 |
|
Bill Yi
|
f8126117fe
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I909f40b5fa690beb258733eb0f71e63f3d19f0c9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:29 +00:00 |
|
Bill Yi
|
97f2103ab2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours am: 0d65b28b99 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I0294bd9b55a34469f17968e07bde27d1e78b5b9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:27 +00:00 |
|
Bill Yi
|
1898979be7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours am: 4594e953c7 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: Ic11ff1e699b1064967985643a3a30672295ee455
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:12 +00:00 |
|
Bill Yi
|
b0cf8a0e4c
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: If03edb8b429c4caeb6d04327da85c0103149eb26
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:08:10 +00:00 |
|
Bill Yi
|
c663a47b28
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours am: 27cafd0dfa -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I0e33c628a9fd8b3fb86d9a5016de9b429ca3f503
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:07:55 +00:00 |
|
Bill Yi
|
c18b5b610a
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours am: a64f4a4585 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I824fd61281e481ce7d5b181804809b738b989b0b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:07:51 +00:00 |
|
Bill Yi
|
4a6f525aa5
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours am: 27cafd0dfa -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I7a44823988e1652781448f48fe99726b93167aea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:07:42 +00:00 |
|
Ahaan Ugale
|
bd9a87a9a0
|
Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: I5e7c61c7d8e1d52fa1a43f3283fb15b71dad4f53
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:03:11 +00:00 |
|
Ahaan Ugale
|
4520667b1e
|
Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd am: 9cc184e3cb
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: Ic3ef69f71f3a2c5687b8477f406d7cb951b4baa0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 14:02:15 +00:00 |
|
Bill Yi
|
1ae472af4d
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 839c6e88b4 -s ours am: ea2310e0fe -s ours am: 8ff2cfceab -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: I941045893ccc6416a3e03a22649c18b11cbd29ab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:48:28 +00:00 |
|
Bill Yi
|
b3a751453e
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: d77ddd6ab3 -s ours am: 960eae9a2f -s ours am: cec67a1ee1 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2457637
Change-Id: Iffc3044f1a63cc3ad0796b8a0f0b6ac417702d49
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:48:24 +00:00 |
|
Bill Yi
|
0d65b28b99
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 798dd47215 -s ours am: 71ad7ad49e -s ours am: 3ba3148e2f -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I032598c0d5b828a33e163230ad1e662491305060
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:48:22 +00:00 |
|
Bill Yi
|
4594e953c7
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2ff8ea95f2 -s ours am: 9de8ff63dd -s ours am: 75304e1ff5 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456140
Change-Id: I516ca07faca199635bff4c186950effd7216deff
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:48:19 +00:00 |
|
Bill Yi
|
a64f4a4585
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: 586da77594 -s ours am: cac65afe79 -s ours am: 3d4d0267c6 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: Iadf7415da3d74c0da2b14efc26df31235104f7c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:48:17 +00:00 |
|
Bill Yi
|
27cafd0dfa
|
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 10e200b5ad -s ours am: d3fa508918 -s ours am: 858813dc33 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2456139
Change-Id: I0733f27db5216ae2f078675b2f3624c1743ff808
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:46:25 +00:00 |
|
Ahaan Ugale
|
9cc184e3cb
|
Merge "Update Autofill OWNERS" am: e35606efd3 am: b238ee99cc am: 96cb0fb4bd
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2459329
Change-Id: Ib174d04d8027e92e649d171cd02bfebc9d7aa94b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:41:12 +00:00 |
|
Bill Yi
|
700ab245f2
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours am: 118faadcb1 -s ours am: f0b1e40b86 -s ours am: 0117365350 -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: I50aba3a28db58f42b212204be8faeee11a9332a4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:32:08 +00:00 |
|
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
|
f5a9584cdc
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours am: 118faadcb1 -s ours am: f0b1e40b86 -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: Ifcd2e653419aee0a54eb86718a27d63b0a38f613
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:22:00 +00:00 |
|
Bill Yi
|
7beb35cb7f
|
[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: I5a66c0b15dc517ebb6f20d82274aa21bdfd975e7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:21:35 +00:00 |
|
Bill Yi
|
0117365350
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours am: 118faadcb1 -s ours am: f0b1e40b86 -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: I6cb6a78b37741de3e4a1c0fb4dbe90e9590d3ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:18:15 +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
|
e1386bba51
|
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: I24705adf9d66383c67fe7ebc15dfb531f66b8794
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:09:51 +00:00 |
|
Andreas Miko
|
9d61cc28cc
|
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: Ibb99c65c9d999fcc655790b36a380e7778ab56e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:09:37 +00:00 |
|
Chris Li
|
ba3231c762
|
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: I64d8463fef76c39d05ff3c7b36ee38223e86b11c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:08:13 +00:00 |
|
Will Leshner
|
c8c2cb0d6c
|
[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: Ia889cb9df9929b36c60ca9b612ec66d2925e9581
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:08:04 +00:00 |
|
Natnael Belay
|
b50ad1c806
|
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: Ieca7a07dbb71a907d71c4fdaec1c78a8992bd063
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:07:53 +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 |
|
Steve Elliott
|
23cf83b75a
|
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: I89aa70fe8d23e528fc87b5add38b43c7abb3bf6e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:06:51 +00:00 |
|
Bill Yi
|
f0b1e40b86
|
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 64fd489c13 -s ours am: 118faadcb1 -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: I5475d2495e36f4e3d71674da0c4a75c1b8832653
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-03-01 13:05:16 +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 |
|