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
TreeHugger Robot
ed2f3d979e
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-28 07:45:13 +00:00
TreeHugger Robot
5d4fa6d717
Merge "Import translations. DO NOT MERGE ANYWHERE"
2021-08-28 07:43:30 +00:00
Dmitri Plotnikov
ad0bb5b7fe
Remove uses of deprecated class BatterySipper
...
also, remove the obsolete class FakeUid
Test: make RunSettingsRoboTests
Test: make RunSettingsGoogleRoboTests
Change-Id: I2f235a18dcca3b5b3a2839408b76553bbc4f655a
2021-08-27 18:19:36 -07: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
100306ae4a
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 483d6621f3
2p: 6eddd0869b
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697678
Change-Id: I1a4a0a4a1979961b4da1c8b90dac8c89a8fc83c7
2021-08-27 22:30:41 +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
6eddd0869b
[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: I73bfd2d6c6099eb4da2ea2c4bb1f8b2bb3132854
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
Bill Yi
0e9fe6d45d
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I1c1ca6c68d7651cb8d4e0f5d98a00d5a1ae52abf
2021-08-27 22:26:18 +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
8c2dd29f38
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: dbd589e440
2p: c93e98fb75
...
Blank merge reason: parent was merged -s ours
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15691667
Change-Id: I246c67692a7778992164a669f496e5756ee73bc4
2021-08-27 22:19:42 +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
c93e98fb75
[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: I05d24a785e4746bdb8c074dde0f3fcfae1189754
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
cdffe034fa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I5c4a8f99bf0fe570404c477aceac8fc7f0b08177
2021-08-27 22:17:51 +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
d79f13a5bc
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: ef02a83e5b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697439
Change-Id: I1c4c189b4abdb5f84a4c206cb47756d5bfc43d37
2021-08-27 22:04:07 +00:00
Bill Yi
ef02a83e5b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib7b2eef3aba7245076cc735b4001b5f80481e853
2021-08-27 22:03:48 +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
ca66a13767
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: f73ff37faa
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15697172
Change-Id: Ia60c4a1af77830fc230e67d463d3d13534ea420a
2021-08-27 21:56:42 +00:00
Bill Yi
f73ff37faa
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iae6f88d73eb8b04bfcaee96a54413de03b398d8f
2021-08-27 21:56:32 +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
bc1bfec0a6
[automerger skipped] Merge "Initialize UwbManager only if supported on device." into sc-qpr1-dev am: 029b6397a8
am: da15cbb50e
-s ours am: da1192472c
-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: I5502ea5a6c2a7f3a4008c9393198ace8f7cd1d7e
2021-08-27 10:51:11 +00:00
Victor Liu
26f4eeb22b
[automerger skipped] Merge "Revert "Revert "UWB: Re-enable UWB toggle""" into sc-qpr1-dev am: 989edd731d
am: 1d35b1cd1b
-s ours am: f05bcacc5a
-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: Ie63feede6e1424f1585037245f078db55afbba3d
2021-08-27 10:51:10 +00:00
Android Build Prod User
fb466945f7
[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: 1f7161281e
-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: Icebd1fd731c27dfa730369246c08decf97596b55
2021-08-27 10:49:31 +00:00
Android Build Prod User
93bce43a4d
[automerger skipped] Merge "[QPR1][Security] Fix RequestIgnoreBatteryOptimizations info disclosure" into sc-qpr1-dev am: 71327943dc
am: ca8e67d144
-s ours am: 55325fc38d
-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: I94f80c874c85924279ccbead2a5712627f385b0c
2021-08-27 10:46:49 +00:00
Betty Chang
524983a043
[automerger skipped] Merge "Change the Network preference summary for wifi option" into sc-qpr1-dev am: 6a3b697141
am: 7e7b237092
-s ours am: 1089b11bd0
-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: I4e1ce48c8b6bcd4efdba0abd49065bb3e555a1b2
2021-08-27 10:43:31 +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