Commit Graph

124836 Commits

Author SHA1 Message Date
Taran Singh
dd2cb171bb [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours am: 8afe7cadee -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1cfc1ab2ac961dc94515a955b801690eb27126fc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 01:41:59 +00:00
Taran Singh
8afe7cadee [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours am: 030a2fa4f3 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic3a3a22e63cda10c242f912b38ce398c8daab057
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:59:29 +00:00
Taran Singh
030a2fa4f3 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours am: 4a95efc3bc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5dcf65359d0e6729683c995a28854c6ea25b166c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:14:42 +00:00
Taran Singh
4a95efc3bc [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d am: eda2ffbeca -s ours
am skip reason: skipped by user tarandeep

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

Change-Id: I34f7f296eda9c53206da6c482e6917db6ee44d0a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 23:21:41 +00:00
Treehugger Robot
ee43e81804 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 am: 60da71ecfb -s ours am: f75d9a6e26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib4df92cd1a65ed7ded756675ff0ac97c183fa16e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:50:01 +00:00
Taran Singh
987348c147 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df am: 73becab672 -s ours am: 92e234f89b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie6dc25d4e40508d9dddde9d4252cff4224591176
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:49:59 +00:00
Treehugger Robot
a0d739518b [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: b94d42a51a -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieaaf04e3bb4ea7748a409f422939a43192bb65c2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:49:43 +00:00
Taran Singh
0524d2a6ab [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 9f09ec9203 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I585234b71f59a6d4b839ee51ac64b337073afaef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:49:40 +00:00
Treehugger Robot
6630f7e14f [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours am: f87cff76ff -s ours
am skip reason: subject contains skip directive

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

Change-Id: I884443606fd2c28eff73ffb06385f26e0f42e988
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:47:23 +00:00
Taran Singh
fa58331cae [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours am: 2ac035a723 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5c1b6b77c2f0b6b4bd597885e1062296e5a74d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:47:20 +00:00
Treehugger Robot
f75d9a6e26 [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 am: 60da71ecfb -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iaedaa236573f184ca5378574fb01cf62178f2f48
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:27:33 +00:00
Taran Singh
92e234f89b [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df am: 73becab672 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic10ce918b2643f0877cb2e468c5391b712116d23
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:27:29 +00:00
Taran Singh
eda2ffbeca DO NOT MERGE: Prevent non-system IME from becoming device admin am: 0976cd789d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545068

Change-Id: Ifa32ff76702ededcc32e36c975c35db920e343ac
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:08:52 +00:00
Treehugger Robot
b94d42a51a [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18d13f6ce7527ea530ed980b2e424a21bcc8cff7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:06:18 +00:00
Taran Singh
9f09ec9203 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I8ddbba740a4dea4b6da9ee79c7f93b2ca47ab085
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:06:13 +00:00
Treehugger Robot
f87cff76ff [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours am: faa7a8af3d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7672d7a7fd2be3c0fb1b794e57b26d0e270e9dba
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:05:45 +00:00
Taran Singh
2ac035a723 [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours am: 14f11e845b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I840417aa2a6033b66b08c2281e31d12410b0fbbb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 21:05:43 +00:00
Treehugger Robot
60da71ecfb Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218

Change-Id: I68ecb31f7dc41ff09208bcce533264db9a853ca1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 20:43:51 +00:00
Taran Singh
73becab672 DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23545218

Change-Id: Icc9e0866bcf0a1f41911c697936d5cb31c4f3b78
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 20:43:47 +00:00
Treehugger Robot
faa7a8af3d [automerger skipped] Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev am: fbe97f1ee4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I46d1a6d58214292929bc45c769cca4005c2aa4f7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 20:42:59 +00:00
Taran Singh
14f11e845b [automerger skipped] DO NOT MERGE: Prevent non-system IME from becoming device admin am: f753a3c8df -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3abe84b4918e7be076136db9abc4589bf0bd8633
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 20:42:54 +00:00
Treehugger Robot
fbe97f1ee4 Merge "DO NOT MERGE: Prevent non-system IME from becoming device admin" into tm-qpr-dev 2023-07-06 20:04:21 +00:00
Michael Mikhail
c2ddd3e581 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: f7b82efb83
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I4a9b2877ea13e7bd6ce6d187d416d233141560a3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 16:34:28 +00:00
Michael Mikhail
1db4bc3676 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563 am: 7c53d299a2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I95fc65d5a3fd0ef2962742769927deacfd92620d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 16:29:52 +00:00
Michael Mikhail
7c53d299a2 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: I978498d9acbb734534bf2ad1dad7e5cfb2434237
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 15:51:23 +00:00
Michael Mikhail
f7b82efb83 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev am: 83c13d6563
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830044

Change-Id: If9ced263d3b60723d39ec471d1e32f800334c046
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-05 15:47:08 +00:00
Michael Mikhail
83c13d6563 Merge changes I4bd65bdb,Ibe80b4b1 into udc-dev
* changes:
  Trigger talkback for notification volume change
  Add content description to volume title in settings.
2023-07-05 15:11:09 +00:00
Chaohui Wang
eb8948e309 Fix DataUsagePreferenceController ANR am: d42cc8e5e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23896225

Change-Id: I6893681f93746af66e6566d2a642c2e1a93aef51
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-04 08:59:57 +00:00
Chaohui Wang
d42cc8e5e2 Fix DataUsagePreferenceController ANR
Offload calculation work from main thread to fix.

Fix: 286082055
Test: manual - on Mobile Settings page
Test: unit test
Change-Id: I7865823d6af2c812afa35d047bd79b60ae4b0fb7
2023-07-04 12:06:53 +08:00
Automerger Merge Worker
902b39c57d 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 am: e4b8bdcead -s ours
am skip reason: Merged-In Ifc048311746c027e3683cdcf65f1079d04cf7c56 with SHA-1 f1af8c5292 is already in history

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

Change-Id: I6a51c90e5b6b699b7fb8d1416ab4a73c2bdce2d6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:11:49 +00:00
Matías Hernández
d5d0ba64cd [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: a2c213f4f6 -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: Ib79e52e66e8a3487715a6d919490d08cb272d4c1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:11:44 +00:00
Matías Hernández
721c4098e8 [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: 97062b969e -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: Icabc8b2319b429685c5ab366ee24cf4f537dd975
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:10:36 +00:00
Hao Dong
b911186928 Merge "Fix pattern rotation header text." into udc-d1-dev am: 04b1932b25
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23833033

Change-Id: Icf5479eba2dd94fa40c41cdea7ae4d86e9f58a25
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:07:43 +00:00
Hao Dong
55ec9b88d6 Merge "Fix Fingerprint enrollment UI when display size is largest." into udc-d1-dev am: 72f2058d3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/23830605

Change-Id: I0411207e8f9a2c955c268b456b83f0b9c871dbb7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:06:58 +00:00
Matías Hernández
e943c371a8 [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: 62bd80ee29 -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: If20b826b8880656e2fa36cd33a959dabc7af056f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-30 00:06:02 +00:00
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
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
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
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
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
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
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