Commit Graph

106970 Commits

Author SHA1 Message Date
Automerger Merge Worker
785cbaf832 Merge changes from topic "am-414a94947bed43e6a84cfcb1fa2914a3" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 4a83e4212f -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: b989753b8f -s ours
2022-06-15 16:57:44 +00:00
TreeHugger Robot
53ed759eef [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 4a83e4212f -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie24810b1dc201cf014ec862b6bbca9de1396733c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:56:26 +00:00
Bill Yi
8e92c73b8b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: b989753b8f -s ours
am skip reason: subject contains skip directive

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

Change-Id: I385ab70eb6fb2eb546fae94d7e3352e18980e6fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:56:17 +00:00
TreeHugger Robot
37d218599e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours am: 844417c14a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1cb47c57b7c38ab70396fa94e02063e24698f570
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:55:17 +00:00
Bill Yi
9ea4c77941 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours am: c4e65cf197 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I79437548fe09b5244aca383352af660920d7ff3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:55:07 +00:00
Weng Su
cf7d2ef87c Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev am: 1c25ce1937
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18802566

Change-Id: Iaa2b5a26a3ee2b8490e116c5148a371651d32ee4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:54:00 +00:00
TreeHugger Robot
4a83e4212f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d43c235439a1cfad2344b89a109cd268849e896
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:47:38 +00:00
TreeHugger Robot
844417c14a [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: dc3e340774 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibf72c73b773c475a21d43029ccf0c4c0774aff8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:47:35 +00:00
Bill Yi
b989753b8f [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I12eeeef97b1931268f958e972f5be4ae98aa1286
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:47:17 +00:00
Bill Yi
c4e65cf197 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2609fb2ccb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I56973c016a00acb084a6bfbc02ea89bdbc58ae3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:47:12 +00:00
Weng Su
1c25ce1937 Merge "Restrict WifiSlice functionality for guest user" into tm-qpr-dev 2022-06-15 16:40:03 +00:00
TreeHugger Robot
dc3e340774 Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev 2022-06-15 16:39:17 +00:00
TreeHugger Robot
6da32e8c5c Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev am: cc0754b416
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18869535

Change-Id: Ic0544cd42cf28b12f8ae470c67363b8683aec6b9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 16:34:21 +00:00
TreeHugger Robot
cc0754b416 Merge "Restrict guest user to configure WiFi by QR code" into tm-qpr-dev 2022-06-15 16:18:40 +00:00
Jason Parks
d0f7e24eb3 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b am: 9afd03c09e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I03d6b0debd1d1239af9a5fa1e1cc1cc8434b611c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:59:33 +00:00
Jason Parks
007f9d7278 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: a48c508afa am: 296fe0d0cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: Iac6683e78266adbfee3537c0c93f4164df21dc98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:59:19 +00:00
Jason Parks
6d2ab0c69c Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b am: 3f55cd8929
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I73c85f36f4edde7719e9d12ead4c10e919629a8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:48:58 +00:00
Jason Parks
9afd03c09e Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I41aea305788fc9063b50676b5594bfdd8f8873ae
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:42:13 +00:00
Jason Parks
296fe0d0cd Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: a48c508afa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I9bffe0d61056d7575015f5b20ff4b71da9714f09
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:42:03 +00:00
Jason Parks
3f55cd8929 Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91 am: 3b6fe0813b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I0fafd91b14712a6bf9a118a2512973af1fb3d502
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:42:02 +00:00
Jason Parks
3b6fe0813b Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I14d08a02a7b27ae4bf3e54c03f9c9d33c6104a8a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:14:53 +00:00
Jason Parks
a48c508afa Merge "Use API to check for the superivion component." into tm-dev am: 73276b3c91
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18817832

Change-Id: I7d5be03e04e9c500bfdaef61dfef5699288dbd98
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 13:13:24 +00:00
Jason Parks
73276b3c91 Merge "Use API to check for the superivion component." into tm-dev 2022-06-15 12:54:00 +00:00
TreeHugger Robot
8f33d7a795 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: d61b92219c -s ours am: cb303ebddb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5ff8d0c73c4715f7807db64e8e8d75a7b9a3c41c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 07:06:35 +00:00
Bill Yi
5a1720b53b [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 46611a953c -s ours am: b96acd4fac -s ours
am skip reason: subject contains skip directive

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

Change-Id: I2e8b446607dd7a54d049e1522eb01a41e0dd7ed4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 07:06:22 +00:00
TreeHugger Robot
cb303ebddb [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: d61b92219c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I08978da87652acc89b46407184d3953c56cb4116
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:40:04 +00:00
Bill Yi
b96acd4fac [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 46611a953c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I57af273bd94d9d2b70d352bcb9755b1d1bcc86f9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:39:45 +00:00
Automerger Merge Worker
3d7561c4ab Merge changes from topic "am-1da92e41bda443aeaea2b6534a421baf" into tm-qpr-dev-plus-aosp
* changes:
  [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: a1a8b5e856 -s ours
  [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: a7456fac34 -s ours
2022-06-15 06:31:01 +00:00
TreeHugger Robot
26cca4b0f0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: a1a8b5e856 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I31a39c9e4f8bc895da93426237576075c9c2ac2c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:29:46 +00:00
Bill Yi
d5086bc572 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: a7456fac34 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I745e0fb34e426e8f61baee2335094d7e3392e0cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:29:37 +00:00
TreeHugger Robot
2069ea61f5 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours am: 529d67575d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I7b2bdbf34eaf15c7777567d5f37caf234f1f04ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:28:55 +00:00
Bill Yi
c621b3bec4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours am: 09a7a53b04 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie2421b372d94b2cdfa9f7b1588e82f8e21ab53dd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:28:44 +00:00
Amy Hsu
d6167384c2 Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 16d022942f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I980075fcc6d48e61d4661a5d3922b11d98e69768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:28:23 +00:00
Amy Hsu
d68c5cd23b Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095 am: 7e0b5c8c07
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Id864846262cc794add2694833e6618d770409dcc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:21:36 +00:00
TreeHugger Robot
a1a8b5e856 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I64150ce37ea4f962599a36f3934939905c44f2cd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:21:31 +00:00
TreeHugger Robot
529d67575d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours am: 5e4e0ee275 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If296374235c6a3bfd6c73d2aa17467bea2608aaf
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:21:25 +00:00
Bill Yi
a7456fac34 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic8d0011e7ee64d4511fa8998a3bd2181783ded91
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:21:22 +00:00
Bill Yi
09a7a53b04 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours am: 588d339d4d -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6d6fe6513e6bf4091223d688f65348eddf70fdab
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:21:11 +00:00
TreeHugger Robot
d61b92219c [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: I23832d4722bd717e48189823e8557ba268ec797b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:16:59 +00:00
Bill Yi
46611a953c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie5d75ff189ee4beac391c7978d4a313868e9aa99
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:16:42 +00:00
TreeHugger Robot
5e4e0ee275 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev am: 50a74572fc -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ie4e1f5d253455ff3aea0a1b7878d2d79f43b1b9c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:16:33 +00:00
Bill Yi
588d339d4d [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f68acfb73e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4f573d48d312206e50d030707f37a2a3953e9332
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:16:20 +00:00
Amy Hsu
16d022942f Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: I399f7592e930545ba1d9e38a62d58aa58bda5b6b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:11:34 +00:00
Amy Hsu
7e0b5c8c07 Merge "Restore the density when it has been overridden" into tm-d1-dev am: be6fef3095
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/18791014

Change-Id: Ie88b0db9abc05339c9c77aa87350bcd3acf963e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 06:11:31 +00:00
Amy Hsu
be6fef3095 Merge "Restore the density when it has been overridden" into tm-d1-dev 2022-06-15 05:31:43 +00:00
TreeHugger Robot
50a74572fc Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-dev 2022-06-15 05:25:34 +00:00
Bill Yi
2609fb2ccb Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ib54c2f3b145ff0c53809022e7baf4083d5ba1ca8
2022-06-14 21:21:00 -07:00
TreeHugger Robot
7eed66e60f [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: 2fc7ce6a84 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I4377de7bdd8de4a2532807b90f8bdbe1a49e8107
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:42:21 +00:00
Bill Yi
11de0c2aea [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f84049c4e7 -s ours am: b70ab5079e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5d5286c23d1e35a4a87c5014d3b2c26e8072077a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:42:00 +00:00
TreeHugger Robot
f8a6212443 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into tm-d1-dev am: 838099408b -s ours am: eb1d552ac2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I0c71be2de6a8395a77116f0202e0ea8b793a5a1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-06-15 01:26:17 +00:00