Hao Dong
|
04b1932b25
|
Merge "Fix pattern rotation header text." into udc-d1-dev
|
2023-06-29 23:52:00 +00:00 |
|
Hao Dong
|
72f2058d3e
|
Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev
|
2023-06-29 23:51:50 +00:00 |
|
Matías Hernández
|
d8684a3449
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: 5a23057e27 -s ours am: 40a25b6bb6 -s ours am: e0b034a19d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I0f50e3d8c2513e99bc3d5e8899d1890171b3f897
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:50:35 +00:00 |
|
Matías Hernández
|
1a9a5cefb1
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours am: 60302435b2 -s ours am: 3f15e470bc -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I178f1fbff9f42d962576fa439b769cfdb95f95e8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:48:40 +00:00 |
|
Automerger Merge Worker
|
e4b8bdcead
|
Merge "[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours" into udc-dev-plus-aosp
|
2023-06-29 23:23:42 +00:00 |
|
Matías Hernández
|
a2c213f4f6
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iffd80fe743aaf57bc4f69f1620fd25e9a143a7d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:23:22 +00:00 |
|
Matías Hernández
|
7af142c277
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Icc9a6730ad870c8ee1fd54a7fc824bd035934d25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:22:53 +00:00 |
|
Matías Hernández
|
62bd80ee29
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Icf19a7292abc519f50a74bbfeae77467106c486d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:22:41 +00:00 |
|
Matías Hernández
|
97062b969e
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: ebb5bf9f1a -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ic52c29bbfdd24cb186322ccaf5d2638b28a84044
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:22:39 +00:00 |
|
Matías Hernández
|
0d6f7211e4
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours am: e0b9249359 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ifaf64a9a48918e36829223e1c0840a70a76dca35
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:22:37 +00:00 |
|
Matías Hernández
|
cbce103bb1
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours am: c06e16ffe7 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iceb69cbdeca20eb9cdd03956bf7787d7eeacddc3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 23:01:30 +00:00 |
|
Matías Hernández
|
e0b034a19d
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: 5a23057e27 -s ours am: 40a25b6bb6 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8b05981a97d165627f67d31f2017d55237cce7a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:59:19 +00:00 |
|
Matías Hernández
|
3f15e470bc
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours am: 60302435b2 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iad9390237591e1d13c6a0fdd5cd574cbacfffce6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:58:25 +00:00 |
|
Matías Hernández
|
ebb5bf9f1a
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ic1575200df5b1fd0d88427d8383cac1da30acc5a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:36:05 +00:00 |
|
Matías Hernández
|
e0b9249359
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours am: 7088dd37ec -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I563b580a28e6e46cdb31ee815a7b9552e82bd2c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:35:02 +00:00 |
|
Matías Hernández
|
40a25b6bb6
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: 5a23057e27 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I07b11df00f7d2744cb9668802e149c61e803557a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:13:39 +00:00 |
|
Matías Hernández
|
317579d2f6
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: 3b2bebfef7 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: If66faaab07fda195b42522e74e78ad038411723d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:13:30 +00:00 |
|
Matías Hernández
|
c06e16ffe7
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ic28a2798731b745a620899e4638393a5985ef956
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:13:03 +00:00 |
|
Matías Hernández
|
60302435b2
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: f64fefb48d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I197d8b61b836e11124f90bf7f1d7b4381af1a377
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:10:33 +00:00 |
|
Matías Hernández
|
a49d27c4fd
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours am: 1fbc0dc39c -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I0a5eb9220b2133a9088eccdb805cb3c913929b03
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 22:10:32 +00:00 |
|
Matías Hernández
|
7088dd37ec
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: 0d3e0dc397 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I3aaeacc0f707d6a3c72fedf74aba8cb76a1ad6df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:55:19 +00:00 |
|
Matías Hernández
|
5a23057e27
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I1068ab41413ecb68a9c782cfaea3b7ecbcd620e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:31:45 +00:00 |
|
Matías Hernández
|
f64fefb48d
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I261e8b4b37c787b890a7fa69fe2ffcd6718225c6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:31:04 +00:00 |
|
Matías Hernández
|
1fbc0dc39c
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I1a695ccb258e6ef78289cb617d5498f573e3b9ce
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:30:50 +00:00 |
|
Matías Hernández
|
3b2bebfef7
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours am: ae1f3e9159 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I3c074fa908671150770ea6d59d633cc6c35c774a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:30:46 +00:00 |
|
Matías Hernández
|
ae1f3e9159
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours am: b280f8792e -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ie7d37b0a284c1c09b4760ba7c01bedf2327ee3c5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 21:03:28 +00:00 |
|
Matías Hernández
|
0d3e0dc397
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I240139ad6fd2072b7c2990a20423dfeed10b9763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 20:22:12 +00:00 |
|
Matías Hernández
|
b280f8792e
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours am: d828f6a917 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8bb98fc243ae74641ac4a7f44af0ece284dc9ab3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 20:21:10 +00:00 |
|
Matías Hernández
|
d828f6a917
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours am: c4aa31013d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I8351da597688d18c52b97ed1f22e909cfc168a7b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 19:49:05 +00:00 |
|
Daniel Norman
|
8f5c6d06b5
|
Stop asserting on internal PackageMonitor details.
Fix: 289324081
Test: SettingsRoboTests
Change-Id: Ia4cdd3b4e994786ba2cbc3045c181eb9339f12d7
|
2023-06-29 19:15:25 +00:00 |
|
Matías Hernández
|
c4aa31013d
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours am: 97ecfd35d6 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: I62449382a3b6365bfe7fba8b1f148be486f9235f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 18:45:31 +00:00 |
|
Treehugger Robot
|
65eb0a5ec9
|
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd738d am: bb87b47d60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766
Change-Id: Iaebab8a58ef5e4be016910e846402667d660b366
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 17:59:29 +00:00 |
|
Matías Hernández
|
97ecfd35d6
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours am: 9eb2824be8 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib2b171219769531b706b62ccb6759adeacc1129d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 17:57:31 +00:00 |
|
Treehugger Robot
|
bb87b47d60
|
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev am: e42dcd738d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830766
Change-Id: Ic1ec5e652cff3d5a594230038030ad2f32e3bb05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 17:15:58 +00:00 |
|
Matías Hernández
|
9eb2824be8
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f1af8c5292 am: 42bd4d88c2 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f0367c98d0 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Ib404f16baae58c5244ba61fe82974a1d93fa681a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 17:11:24 +00:00 |
|
Treehugger Robot
|
e42dcd738d
|
Merge "After deleting guest user, switch back to previous instead of user0." into udc-qpr-dev
|
2023-06-29 16:42:19 +00:00 |
|
Matías Hernández
|
42bd4d88c2
|
Settings: don't try to allow NLSes with too-long component names am: f1af8c5292
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23726246
Change-Id: Iaf37229e9570c29792e801446e8db162ebb3dbda
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 16:25:28 +00:00 |
|
Chaohui Wang
|
8f0b2d15c6
|
Clean up Kotlin FeatureFactory.getFactory(context)
Replace with featureFactory.
Bug: 286764889
Test: m Settings
Change-Id: I30bd2e9b25e1681d7694939dd8ec84fcd6fd7c08
|
2023-06-29 23:10:37 +08:00 |
|
Ante Culo
|
a2041569e2
|
Merge "Fix Inline UWB toggle setting"
|
2023-06-29 15:03:20 +00:00 |
|
Matías Hernández
|
0f189c5f33
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: 956ff6faa8 -s ours am: 8a58078e07 -s ours am: a43c0cfa7d -s ours am: 9da3c3e771 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I3282307e81e2087b40379477e6e3f146304c54d3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:38:08 +00:00 |
|
Matías Hernández
|
cfde234b0c
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 258b971dac -s ours am: 6dbabdc572 -s ours am: b3427e5e74 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ic3ade79cc1009db655fe197b7d75cd9a485a8660
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:37:48 +00:00 |
|
Matías Hernández
|
ec12a245d1
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: df3f3ff5c2 -s ours am: a590ecb718 -s ours am: 7585147637 -s ours am: 56397425cd -s ours am: e5896026fa -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I3072414009336c9f2b4742da59d9eeca155bc7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:37:29 +00:00 |
|
Matías Hernández
|
7889c53339
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 99f3eb361b -s ours am: db5813ef3f -s ours am: d4d76a184b -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ie4b36532c5f4f01579ba4308dbb1425eeb979ea1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:37:00 +00:00 |
|
Matías Hernández
|
aafceae769
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: df3f3ff5c2 -s ours am: a590ecb718 -s ours am: b0bf5532ff -s ours am: b5fe3c7a6d -s ours am: 434fd39e24 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I2b53ce103ac5a36522c42533dc432a80190cfd2a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:36:40 +00:00 |
|
Matías Hernández
|
87e27310c2
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 99f3eb361b -s ours am: 8f29393698 -s ours am: 69c5941f7e -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I99b1e4b1925b0bf928b5452420bb434a6cb80a6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:52 +00:00 |
|
Matías Hernández
|
9da3c3e771
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: 956ff6faa8 -s ours am: 8a58078e07 -s ours am: a43c0cfa7d -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I57ef0bf516fc2c8509325af710d7e268c0e6dd9d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:40 +00:00 |
|
Matías Hernández
|
ba30d18d45
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: df3f3ff5c2 -s ours am: a590ecb718 -s ours am: b0bf5532ff -s ours am: 6e37ce9278 -s ours am: 8e5d0ed4b4 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I5d7546cfb606bb10f080958dbefca90eebbd92fb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:30 +00:00 |
|
Matías Hernández
|
b3427e5e74
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 258b971dac -s ours am: 6dbabdc572 -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Ibab5de4c74891a3408164b98ff904baf7ed1857b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:26 +00:00 |
|
Matías Hernández
|
e5896026fa
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: df3f3ff5c2 -s ours am: a590ecb718 -s ours am: 7585147637 -s ours am: 56397425cd -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: I896c5f818166d205a21ac959b667fb93fbaefa20
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:35:09 +00:00 |
|
Matías Hernández
|
d4d76a184b
|
[automerger skipped] Settings: don't try to allow NLSes with too-long component names am: f0367c98d0 am: 5985612633 am: 95fbc856ad -s ours am: 8c1394e58e -s ours am: 476dd8fba2 -s ours am: c1d4561832 -s ours am: e1745a9d28 -s ours am: 99f3eb361b -s ours am: db5813ef3f -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 b88fbf932a is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23712724
Change-Id: Iaabd6d4141fb8c34802c96ca56c37c3b1747bc88
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
|
2023-06-29 14:34:52 +00:00 |
|