Commit Graph

120372 Commits

Author SHA1 Message Date
William Escande
17a6f54b56 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4 am: 4df2d78817
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I94a513c6fc45aed0922f0747da4856c42a5bcf55
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 09:09:02 +00:00
William Escande
4df2d78817 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f am: 6ea3322de4
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: Ied121b87732ecf6603441a61678be5f5c5f89829
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:46:59 +00:00
William Escande
6ea3322de4 Merge "Snoop Logger: fix descriptions" am: 5fd265405c am: 57f3e9428f
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I34edde4f5dc5b5290f796d1bd8b5e8f07eab9a4c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 08:11:05 +00:00
William Escande
57f3e9428f Merge "Snoop Logger: fix descriptions" am: 5fd265405c
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2446822

Change-Id: I824b93316a8ee98b1358eadaf3c498f459f59a05
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 07:21:57 +00:00
Anvesh Renikindi
eaf3ecceae Merge "Update EmbeddingAspectRatio to the latest" 2023-02-23 06:38:08 +00:00
William Escande
5fd265405c Merge "Snoop Logger: fix descriptions" 2023-02-23 05:58:19 +00:00
TreeHugger Robot
0b8905c899 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: d7b8a73da9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ieec24470468667b24be0a41a7bcb5f9e954f2c28
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 23:06:24 +00:00
Bill Yi
73b23bd877 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 48957d9e2b -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iba2cb15dd2524f8a6275e583ab0743f7ec7fb4a1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 23:06:20 +00:00
TreeHugger Robot
a3819b8984 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 7d1dbd3e1e -s ours
am skip reason: subject contains skip directive

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

Change-Id: If88901f310f6e293b4f72b52e20a520ef6351cf0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 23:06:13 +00:00
Bill Yi
b57f9b481e [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 1051b47c26 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I297ec7aac1619dc69b0214cc4ed8212b3f2561be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 23:05:55 +00:00
TreeHugger Robot
df6ca5042e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev am: 2593eaea99 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ib35c6faebc4595262e49ce8b8d82651bba40948b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 23:05:44 +00:00
Bill Yi
6f41b549cb [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 899ab27b2f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5be0de35574a19dd96fc77598890a20b48123f5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 23:05:37 +00:00
Bill Yi
00181c65d8 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-22 22:54:05 +00:00
Bill Yi
02895aca61 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-22 22:54:05 +00:00
Bill Yi
d2394e7eb2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2023-02-22 22:54:05 +00:00
TreeHugger Robot
d7b8a73da9 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-02-22 22:29:16 +00:00
TreeHugger Robot
7d1dbd3e1e Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-02-22 22:29:16 +00:00
TreeHugger Robot
2593eaea99 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-dev 2023-02-22 22:29:16 +00:00
TreeHugger Robot
1a2cd2f231 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours am: 24c843fb30 -s ours am: 3648275e0e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Id594fd5c868b27bb815de220b8c47df0832c180c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 22:18:16 +00:00
Bill Yi
8c2a537db4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours am: 07b4ad75b4 -s ours am: 69803e4b8f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2eb1dbe379dd60388973a5619844de63e27b1a00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 22:18:06 +00:00
TreeHugger Robot
a8cdf1d6c7 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours am: 95d0cc1766 -s ours am: 6ac3ac9e63 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6b5fa355630196f70bec7afec648b43f9aff232a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 22:17:51 +00:00
Bill Yi
bb8a56689d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours am: 881db50b16 -s ours am: 88743c60d1 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0666f24c1d6bdfe58759887fd7b29a9c6535c9d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 22:17:39 +00:00
TreeHugger Robot
3648275e0e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours am: 24c843fb30 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I70e3fed8ce7a06b6f0e7225f0d9e0c6905d07ee6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:35:15 +00:00
Bill Yi
69803e4b8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours am: 07b4ad75b4 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3597d9a1692f48194af397c7265e87406477797c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:35:11 +00:00
TreeHugger Robot
6ac3ac9e63 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours am: 95d0cc1766 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9e07f47fd852dc41754a4ddaeeee9e714c59340c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:35:00 +00:00
Bill Yi
88743c60d1 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours am: 881db50b16 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I01733befb823376d5c46a3f467cfba395d1d4335
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:34:27 +00:00
TreeHugger Robot
24c843fb30 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: 0e28d1212e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I181ec169fe63702914c012f349dbe327bfbbbe15
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:13:57 +00:00
Bill Yi
07b4ad75b4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b68f49055e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I55edf94ba4c2952f50d2757ee3de2eac8236eccc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:13:49 +00:00
TreeHugger Robot
95d0cc1766 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev am: decc8d0759 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I516ae5d20d4f21a3bc455c02328b873d18a9a427
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:13:44 +00:00
Bill Yi
881db50b16 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 26e205dfb9 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic1d40a8aad4b268384097ce8ca3e310aeb31bb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 21:13:13 +00:00
TreeHugger Robot
0e28d1212e Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-22 20:59:45 +00:00
TreeHugger Robot
decc8d0759 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-qpr-dev 2023-02-22 20:59:45 +00:00
TreeHugger Robot
17b826c715 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours am: cb5e97de8a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9038fc225657da1c2f08dd13ffb540919e0fd9a9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:56:57 +00:00
Brian Lee
6ee1e33ec4 Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev am: 79effa02d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21526915

Change-Id: I3a9dfc470d76dbe69df8d930dcf457b8ac1e3221
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:55:36 +00:00
TreeHugger Robot
d1a5cdb191 Merge changes from topic "tc_change_23022120_22" into udc-dev am: 97675e3475
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/21517268

Change-Id: I012645ac5c552ea0ee063d904bc7169ac2304157
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:53:13 +00:00
Bill Yi
0a767ee9ee [automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652 am: 5bdc27be54 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Icddf5d14f16b066e4fe416748135c9862e83f416
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:53:08 +00:00
TreeHugger Robot
cb5e97de8a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod am: 5699a3d93d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I18425b81f49cd14ace2e42f9122b46338e78a76b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 20:50:10 +00:00
Brian Lee
79effa02d3 Merge "Update RemoteLockscreenValidation detail strings and char limits." into udc-dev 2023-02-22 20:34:17 +00:00
TreeHugger Robot
5699a3d93d Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-mainline-prod 2023-02-22 20:15:56 +00:00
TreeHugger Robot
97675e3475 Merge changes from topic "tc_change_23022120_22" into udc-dev
* changes:
  [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 08d0cbb652
  Import translations. DO NOT MERGE ANYWHERE
2023-02-22 20:15:45 +00:00
Henri Chataing
982a113065 [automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours am: fd0203ee28 -s ours
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history

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

Change-Id: I66a89730ce744eb2da071a52c5026d8e6844979b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:55:26 +00:00
Jack Yu
55cb4a639b [automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours am: 8b0fa20c98 -s ours
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history

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

Change-Id: I29b19d96431b33cf9f2ed4055097a5582e319918
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:55:16 +00:00
Jack Yu
c593b5a7b9 [automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours am: 3c0d7c9bfb -s ours
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history

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

Change-Id: Ib29fafa20655fcaa78a5eb79d94bf84f0a72a3e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:55:10 +00:00
Jack Yu
1c96b93f69 [automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours am: bac3cfcbfe -s ours
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history

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

Change-Id: Id3ccba52081879abf79f5110e57f1198930982b5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:55:03 +00:00
Henri Chataing
fd0203ee28 [automerger skipped] Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba am: 6a7031515e -s ours
am skip reason: Merged-In Id12e3c10dc04816d4a69692b2d922840a8e84c61 with SHA-1 bcf2efe31e is already in history

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

Change-Id: I948a11f2df4444b9d64fed97fb661ea35f33e3ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:36:01 +00:00
Jack Yu
8b0fa20c98 [automerger skipped] Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417 am: 252dd209b3 -s ours
am skip reason: Merged-In I531c85fd77934ad7821c480df07465a8cd8f24f9 with SHA-1 d270f29cc8 is already in history

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

Change-Id: Ie49b1ae7183f6a432fae4f2eee8bd70cf338113b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:35:58 +00:00
Jack Yu
3c0d7c9bfb [automerger skipped] Add a new NFC developer setting option for NFC vendor verbose log am: 8f1794043c am: 0797feaf7b am: 86a6c6a9a7 -s ours
am skip reason: Merged-In Ic837bbcc32979c44732e99d51e4dcf93eb201cf1 with SHA-1 3d2aff896e is already in history

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

Change-Id: Ie6c1e6ab59c24778de5c503281b991658c7acd9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:35:53 +00:00
Jack Yu
bac3cfcbfe [automerger skipped] Add a new NFC developer setting option for NFCSNOOP am: a2f8944942 am: 81f481fac4 am: 08c64a4414 -s ours
am skip reason: Merged-In I3fd34500e5e7093c9d77ff737987a35f6866814e with SHA-1 b71de640b5 is already in history

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

Change-Id: Ide65bf95812fe09989230b73301c8007d652518f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:35:45 +00:00
Henri Chataing
6a7031515e Merge changes from topic "nfc_logging_control" am: 4de9ff1a8f am: 4886f28aba
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332205

Change-Id: I938ce76f23b82ffc4f4b0f95364120dadc7cdb00
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:16:49 +00:00
Jack Yu
252dd209b3 Show reboot dialog when users disable developer options am: d91e7a0565 am: e1dfe3d417
Original change: https://android-review.googlesource.com/c/platform/packages/apps/Settings/+/2332204

Change-Id: I7225161683a0b68b6eebf188ec99f39e57a33851
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-22 19:16:48 +00:00