Commit Graph

87309 Commits

Author SHA1 Message Date
Bill Yi
5a0fe94bbf [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 9b3d8a4629 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I746c3ebb1c78bbd6e8bfd3cc8a78dba461bbe7f9
2021-08-28 08:52:45 +00:00
Bill Yi
9c4c7980a4 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours am: 2d8f65e4f8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I81d7badc620c81a527277b2dfd81cd9a8261d692
2021-08-28 08:52:31 +00:00
TreeHugger Robot
82f0ae4930 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I010271c153b50c9212a4e01afb37db572250f252
2021-08-28 08:38:28 +00:00
TreeHugger Robot
cf5b05d878 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours am: c60b803327 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I94d31a6410c30f8a60630080903996c52e8fe51d
2021-08-28 08:38:25 +00:00
Bill Yi
eb2a13ee8a [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ibc16e48f3fd33b2b0b0a6946cac9af62ca940512
2021-08-28 08:38:08 +00:00
TreeHugger Robot
80725024e0 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours am: 4d7546b098 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ic53cd7193ff5af103c1a35dd1ede8649dabb698f
2021-08-28 08:38:00 +00:00
TreeHugger Robot
e8c88b9a3d [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours am: c60b803327 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Iadb11471eb919eceac5f3a0367b481db4c54c5a7
2021-08-28 08:37:48 +00:00
Bill Yi
9b3d8a4629 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9d46d4c15e98ede68881bc469ff81d684f3f9205
2021-08-28 08:37:45 +00:00
Bill Yi
cec1d12392 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours am: 3ff9a07c89 -s ours
am skip reason: subject contains skip directive

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

Change-Id: Ifea8261408bf561c44bb36363f8f353b14a870a1
2021-08-28 08:37:44 +00:00
TreeHugger Robot
4abbf430b8 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3575b70b77 -s ours am: c11ebc1965 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I1e55b44f1241520bd94fd7d8cc821107526a8829
2021-08-28 08:36:53 +00:00
Bill Yi
2d8f65e4f8 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours am: 118a531c2c -s ours
am skip reason: subject contains skip directive

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

Change-Id: I153e392027e665de2af74b3ed332c31e52150a6a
2021-08-28 08:36:34 +00:00
TreeHugger Robot
964594d222 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 74b4a3c8fb -s ours am: db00136fc2 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I5a85f0a26ab7a90f679d7d86d5ffc855b8c4d109
2021-08-28 08:36:30 +00:00
TreeHugger Robot
4d7546b098 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 4c1ee5ab6a -s ours
am skip reason: subject contains skip directive

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

Change-Id: I06fd20aafcd319c0e0e7b6a9d006197f984b74ce
2021-08-28 08:34:17 +00:00
TreeHugger Robot
028f8bbb2e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3575b70b77 -s ours am: bb548328d6 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I553d4cac530897c387f097474e903fd743af681f
2021-08-28 08:23:15 +00:00
TreeHugger Robot
ed11be7b13 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 74b4a3c8fb -s ours am: b94dc03090 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I11c15d16968594da68e5e9e64da3b40fe995871c
2021-08-28 08:23:11 +00:00
TreeHugger Robot
c60b803327 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 41642f5ba8 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I14af6577b6f8600267781913930812d6e8442476
2021-08-28 08:23:06 +00:00
Bill Yi
3ff9a07c89 [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: af04cc6ba7 -s ours
am skip reason: subject contains skip directive

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

Change-Id: If94cc75281d2f0c4876fee80a9673a4da160bd34
2021-08-28 08:22:40 +00:00
TreeHugger Robot
bb548328d6 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3575b70b77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I6a8b95c79f3f1b790afc12967602426359de04f9
2021-08-28 08:19:11 +00:00
TreeHugger Robot
b94dc03090 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 74b4a3c8fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I02965e6c3633315502c74fccc83153e69c1db742
2021-08-28 08:19:06 +00:00
TreeHugger Robot
c11ebc1965 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 3575b70b77 -s ours
am skip reason: subject contains skip directive

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

Change-Id: I72fa381ace8bbd65b4a49b0d23fd4e0956d23c91
2021-08-28 08:18:55 +00:00
TreeHugger Robot
db00136fc2 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev am: 74b4a3c8fb -s ours
am skip reason: subject contains skip directive

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

Change-Id: I9260571f24340d07d1e0299aef7ba11739af50fe
2021-08-28 08:18:41 +00:00
TreeHugger Robot
08b0103a93 [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 21bba0a43b -s ours
am skip reason: subject contains skip directive

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

Change-Id: I37d645b3477ef4366d9926d1154c538e8137a036
2021-08-28 08:18:25 +00:00
Bill Yi
118a531c2c [automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: be9d9c91bd -s ours
am skip reason: subject contains skip directive

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

Change-Id: I474ea1b8a7f6c15b4cd15b46c36202b45b3803ab
2021-08-28 08:18:16 +00:00
TreeHugger Robot
ff0df4401e [automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev am: 2e009c1a9e -s ours
am skip reason: subject contains skip directive

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

Change-Id: I3e60c653beeef3622d1a6118adcfa3010330e012
2021-08-28 08:17:47 +00:00
TreeHugger Robot
4c1ee5ab6a Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod 2021-08-28 08:07:08 +00:00
TreeHugger Robot
41642f5ba8 Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev 2021-08-28 08:05:30 +00:00
TreeHugger Robot
21bba0a43b Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-28 08:02:33 +00:00
TreeHugger Robot
3575b70b77 Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:02:29 +00:00
TreeHugger Robot
2e009c1a9e Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-v2-dev 2021-08-28 08:02:19 +00:00
TreeHugger Robot
74b4a3c8fb Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-qpr1-dev 2021-08-28 08:01:49 +00:00
Bill Yi
213015767f Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iad6d2f05b128a85f5b72a6948cbfdf11b80eb837
2021-08-27 22:38:13 +00:00
Bill Yi
4f31189088 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5227d933dcb559cb1be8bb5a0bbcce612b0da2a4
2021-08-27 22:34:10 +00:00
Bill Yi
30f4367fed [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
Blank merge reason: commit message contains skip directive

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

Change-Id: I16a98faa8d54fe2cf6b7056f0bf4fdd0947560ba
2021-08-27 22:30:39 +00:00
Bill Yi
a60710d90a [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
Blank merge reason: commit message contains skip directive

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

Change-Id: I67cb3ffc9dea46b3d78c3aad461c660c98543851
2021-08-27 22:30:39 +00:00
Bill Yi
483d6621f3 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Ibe92bbdc1c48b03b289f618ec57204de1e5742ac
2021-08-27 22:30:19 +00:00
Joe Bolinger
dbac832ae9 Fix crash when error messages are triggered due to configuration changes.
Bug: 197265282
Test: Manaul (start enrollment and switch active display)
Change-Id: Id83ea58dc6b06461f48cddf90e85cc682ac2451c
2021-08-27 15:24:16 -07:00
Bill Yi
5e948972d5 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5c1e4dfed1e6cfce314da6968ea38b7cc7a9dd9d
2021-08-27 22:22:36 +00:00
Bill Yi
e3d99cf9c6 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I148b65f26df0f4c99f650bad6beef65918ae4870
2021-08-27 22:20:59 +00:00
Bill Yi
1a1eba9262 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
Blank merge reason: commit message contains skip directive

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

Change-Id: If8edcfcbb2ef4292543e75d6c55e209802e168d5
2021-08-27 22:19:38 +00:00
Bill Yi
df34345697 [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
Blank merge reason: commit message contains skip directive

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

Change-Id: Id6040dd2c8250cfdb0b01b90ea996aced7114132
2021-08-27 22:19:38 +00:00
Bill Yi
dbd589e440 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I96dd7efe4261508234fbb971a0d7e406d548a503
2021-08-27 22:19:26 +00:00
Bill Yi
af04cc6ba7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I5a77348c77e612c03205df8f99434e19242984a1
2021-08-27 22:14:52 +00:00
Bill Yi
5785856ca7 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I568912c51296854b465c0aa429f06d26e1d017a0
2021-08-27 22:11:23 +00:00
Bill Yi
be9d9c91bd Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8f04d37f7882ae5e9f83a319f940d846c552f820
2021-08-27 22:00:01 +00:00
Bill Yi
d42af21890 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I8ea9f0996c12b58f25d2e9884387c8e15347824e
2021-08-27 21:54:57 +00:00
Victor Liu
da1192472c [automerger skipped] Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8 am: da15cbb50e -s ours
am skip reason: Merged-In I8346f4c2f3e3cc52e21a9214ab3fd428180c5d8d with SHA-1 14aee30625 is already in history

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

Change-Id: Iccb81d915c824650661bf7fb507f660c7cd2962e
2021-08-27 10:34:00 +00:00
Victor Liu
f05bcacc5a [automerger skipped] Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d am: 1d35b1cd1b -s ours
am skip reason: Merged-In Ib0fee46471c7f110b265faedc62a3f66610bf7c2 with SHA-1 63976c2051 is already in history

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

Change-Id: Iab4eb00b849316422f1fe0a6d72f9acdde62d1c9
2021-08-27 10:33:59 +00:00
Android Build Prod User
1f7161281e [automerger skipped] Merge "[QPR1] Add time unit into battery usage chart and refine some UI" into sc-qpr1-dev am: 33af17ff31 am: 0b8ff007b7 -s ours
am skip reason: Merged-In I5b35b0fa808eb8a5f607962ee973c2896529b078 with SHA-1 0791d77df0 is already in history

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

Change-Id: I761469178dc8ad80464384b2c274ddbfa94fd0c5
2021-08-27 10:33:30 +00:00
Android Build Prod User
55325fc38d [automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc am: ca8e67d144 -s ours
am skip reason: Merged-In Ia2e47c493c206e96b0bc1d9f08735c0f9474c233 with SHA-1 5589007530 is already in history

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

Change-Id: Ic02568f9af4ec588193c180c5dda86d679b42c3c
2021-08-27 10:32:20 +00:00
Betty Chang
1089b11bd0 [automerger skipped] Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141 am: 7e7b237092 -s ours
am skip reason: Merged-In I3892386f8fe2e5c3e29cd7e91f88db65c3693990 with SHA-1 b1b2da9aca is already in history

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

Change-Id: I6e69becb33f5c3bef0569b676eb366b90272445e
2021-08-27 10:12:25 +00:00