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
cb4d8096f9
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 46902bd366
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: I58f268fd7d26810a26cca56473268696e8a0dc1a
2021-08-23 04:37:10 +00:00
Bill Yi
7faa876046
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-mainline-prod
2021-08-23 04:22:11 +00:00
Bill Yi
46902bd366
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-23 04:21:54 +00:00
Bill Yi
f75d95cc99
Merge changes from topic "presubmit-am-ebe8a352b317462aa31e9ffb6caeb6a5" into sc-mainline-prod
...
* changes:
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
Import translations. DO NOT MERGE ANYWHERE
2021-08-23 04:21:54 +00:00
Bill Yi
33f540213a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours am: 3ed7097ead
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: I36ff2be3ac56b532491235567b28486736b411f5
2021-08-22 18:17:27 +00:00
Bill Yi
cc357115f8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours am: 7643d374b5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: I794248c5648d7a82dd30ae511329380af527984d
2021-08-22 18:17:11 +00:00
Bill Yi
3ed7097ead
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: b762f335e3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649787
Change-Id: Iccc05891ae6764d10ebfef8e47ac43ffa07956ac
2021-08-22 18:07:39 +00:00
Bill Yi
7643d374b5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 70b0c311a5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649790
Change-Id: Ic0611b0fd5f645d0c69ee539ebc746fddd4d59be
2021-08-22 18:02:27 +00:00
Bill Yi
ce5eb2ba02
[automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: 93eb76377b
...
Blank merge reason: commit message contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15649792
Change-Id: Ib3eaf863bc9e6417be9f83dcd118384e5c7df616
2021-08-21 10:46:13 +00:00
Bill Yi
93eb76377b
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4c088fc157f34994615725c8c2e9815e174a6508
2021-08-21 10:45:59 +00:00
Bill Yi
70b0c311a5
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I53bc4eea899bfa40183a478e99878438c78f2d7b
2021-08-21 10:31:37 +00:00
Bill Yi
a79808bce4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I8ab907c4c7fd33571a971f14c46abe98e00af4db
2021-08-21 10:21:11 +00:00
Bill Yi
b762f335e3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ieab1a39a1764ced3fe6dce11e5e8f9aa2b12498b
2021-08-21 10:17:34 +00:00
Bill Yi
744d926374
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: cae8b13289
-s ours am: a131a4e35d
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I5b0b0484733da619661dc0a0c7cc0de6c9294f73
2021-08-19 19:24:01 +00:00
Bill Yi
d9a284c9b0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: dbb7139670
-s ours am: f56033304c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ie65d3b80b92bcd22beeb094978873654a72047d7
2021-08-19 19:23:56 +00:00
Bill Yi
3332171452
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: c748a50c90
-s ours am: de6423d2ee
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Id0fb829e1d9c86df4d0b1f7dbdc30aee4d57d006
2021-08-19 19:23:51 +00:00
Bill Yi
d51c0b4e15
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: 214068856c
-s ours am: d46732c0d0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ie92d776f881bb523c60e3063e98b5a9364cc6665
2021-08-19 19:23:44 +00:00
Bill Yi
a131a4e35d
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: cae8b13289
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I1b4c1cf3fe9a91519f752241d93ddf50b7f1db4b
2021-08-19 19:11:00 +00:00
Bill Yi
f56033304c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: dbb7139670
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I5fa1bc908b59a08170c75434094b8a2ec18de9d9
2021-08-19 19:10:19 +00:00
Bill Yi
de6423d2ee
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours am: c748a50c90
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ife7f670a35fb40793148e383f0ec61977befffa5
2021-08-19 19:09:12 +00:00
Bill Yi
d46732c0d0
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours am: 214068856c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I9dc1c790b19badc9293ccb7ceb8e2719b4f2d9a0
2021-08-19 19:09:03 +00:00
Bill Yi
c748a50c90
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I51d44b97eafa5c3d0afba3314060168c75c0cc7c
2021-08-19 18:45:15 +00:00
Bill Yi
cae8b13289
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours am: 5333f656cb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ic9b3f52f4d391c410ba9fce4dd3c06ff271eb9f5
2021-08-19 18:45:11 +00:00
Bill Yi
214068856c
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I1ec620bc435cc8cade11eedcd40b14aecd74a5bc
2021-08-19 18:45:10 +00:00
Bill Yi
dbb7139670
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours am: d26b631da5
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ia20257ffd7d365143c7f20da2c8694f07695f721
2021-08-19 18:45:08 +00:00
Bill Yi
82cbd3697f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours am: d14aa78c7a
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: If2bcb4db7bff8501b70068b13678f8062fae9c44
2021-08-19 18:35:30 +00:00
Bill Yi
3fe28ed480
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 57f1c163d3
-s ours am: 4b72049845
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: Ie5a079d8c55e411d2dd75226da3e56a529d09aee
2021-08-19 18:35:26 +00:00
Bill Yi
5333f656cb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours am: 2906d7dceb
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I282f2eb8c069e363b31ff018ff51f1a45b37e757
2021-08-19 18:30:11 +00:00
Bill Yi
d26b631da5
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours am: 6a0b815394
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: I034015cd37baa3a0e64c4821684ecaf08348c2b8
2021-08-19 18:30:04 +00:00
Bill Yi
d14aa78c7a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I471e1732559ef8be5da269d0ac57e8e9248d0b0a
2021-08-19 18:17:42 +00:00
Bill Yi
4b72049845
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 57f1c163d3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: Ia6128614996ae93777b01760b0fd26e0b402597e
2021-08-19 18:17:06 +00:00
Bill Yi
2906d7dceb
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours am: 6718e1ee7b
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: I3258ebd4e22af98fd20e0310512cd3db1ed2d160
2021-08-19 18:17:06 +00:00
Bill Yi
6718e1ee7b
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 88a0994ed8
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15608116
Change-Id: Ia7592c1857dab18371f6284e5f6583217b148be9
2021-08-19 18:13:12 +00:00
Bill Yi
6a0b815394
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f391df2089
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607375
Change-Id: Ib07c6a9383e2256c8e995ad1d6b67ee4bfb02cb8
2021-08-19 18:12:15 +00:00
Bill Yi
57f1c163d3
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I7cf4e45992855e576ad9f0e4a25d1ea6e4405a1a
2021-08-19 18:05:22 +00:00
Bill Yi
6b38523ea7
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15607372
Change-Id: I4a515aa1670ef66c889987cb1adbf3f891a5d41c
2021-08-19 18:05:22 +00:00
TreeHugger Robot
95d2eb7376
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: I7dd8ab28c69371890fa84b54e28b7cdc81b3bee3
2021-08-18 21:55:57 +00:00
TreeHugger Robot
6bf17de139
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev
2021-08-18 21:38:32 +00:00
Neha Jain
fa31f577ca
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: I56b549ffb3b76f8004b447e973e2e35e6d77e53c
2021-08-18 18:11:21 +00:00
Neha Jain
abd0f6a5f6
Merge "Remove CDM entries in Connected Device." into sc-dev
2021-08-18 18:01:00 +00:00
Daniel Sandler
509670cb0d
LPP will now always launch either GlobalActions or the Assistant.
...
Previously, on devices that default to launching Assistant
on long-press power, toggling this checkbox in Settings
would switch between that default (launching Assistant) and
a no-op. Those devices now toggle between Assistant and
GlobalActions (the power menu), just like devices that have
the old default behavior of LPP launching GlobalActions.
Change-Id: Id36031e70825da195f9c30ce05b3ae3d5e49b5fb
Test: make RunSettingsRoboTests \
ROBOTEST_FILTER=LongPressPowerButtonPreferenceControllerTest
Bug: 192946325
2021-08-18 11:06:54 -04:00
Bill Yi
88a0994ed8
Import translations. DO NOT MERGE ANYWHERE
...
BUG:167403112
Auto-generated-cl: translation import
Change-Id: Id5c579245cf72f10f4d15fcb69d24bcf58dd281a
2021-08-17 22:14:24 -07:00
Bill Yi
f391df2089
Import translations. DO NOT MERGE ANYWHERE
...
BUG:167403112
Auto-generated-cl: translation import
Change-Id: I64cf73c3bf8cfc4e1135a40d5c6fa26066fc287e
2021-08-17 22:10:17 -07:00
Bill Yi
15b602ca6e
Import translations. DO NOT MERGE ANYWHERE
...
BUG:167403112
Auto-generated-cl: translation import
Change-Id: I6301742cc4a1941e287bd8824a55ef5f17f72f4d
2021-08-17 22:02:57 -07:00
TreeHugger Robot
171722b764
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570
-s ours am: cee3e9bfce
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591581
Change-Id: I669169439a94eb1a0d287ca24e48a23e66dec2f4
2021-08-17 23:42:15 +00:00
TreeHugger Robot
cee3e9bfce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591581
Change-Id: I0c0963f016e83b020dcffc91517604cfd0197468
2021-08-17 23:27:43 +00:00
TreeHugger Robot
a26ca75570
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-17 23:08:15 +00:00
Bill Yi
a4ccf79b5d
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I7c1df04c8feb457b41ad223bdd95f4550ef1b124
2021-08-17 22:20:42 +00:00
Bill Yi
c9d25efe7a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591583
Change-Id: I88a611868c9f39b230067de33d0617f746ebe77b
2021-08-17 22:20:10 +00:00