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
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
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
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
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
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
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
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
28dea4a78c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-17 22:06:14 +00:00
Bill Yi
0fe195f2b0
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-17 22:04:16 +00:00
TreeHugger Robot
9aeb396178
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: dd0e1a338c
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590649
Change-Id: I7b04dbbc9369c89ca837fe2dccb86a3c9445dbdb
2021-08-17 20:28:48 +00:00
Bill Yi
3e49192ffc
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 6f047583bc
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590652
Change-Id: I983cb558895e64cd0455dbe51eb169e0fe7bd634
2021-08-17 20:28:41 +00:00
TreeHugger Robot
dd0e1a338c
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-08-17 20:14:28 +00:00
Bill Yi
fa3505fdd8
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: f82b80a567
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15590657
Change-Id: Ib5eb493e9092ee4f57bea4cc9238a995284b1cf8
2021-08-17 20:06:51 +00:00
Bill Yi
d1e4f888fb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Icabf059c62f547d2bf1bef0bc04e8e22d1613bc9
2021-08-16 22:49:25 -07:00
Bill Yi
21392f9ffb
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I0e71e551f5efede9979e39aa215cfb597bb3135d
2021-08-16 22:35:06 -07:00
Bill Yi
25b3ab76e4
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I4be1756b35504ec9d49bc7b8d6bd7b7e753aae8b
2021-08-16 22:29:11 -07:00
Bill Yi
f82b80a567
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ie28ab84cb3ef23d6602af63e2e531d7057000d2f
2021-08-16 22:24:38 -07:00
Bill Yi
6f047583bc
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I6680983f470525631710e359072fe27a81a322be
2021-08-16 22:09:54 -07:00
Bill Yi
a687e17227
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Iaed09e1a4628fec8391ad74d6eb451c8dbb997a0
2021-08-16 22:02:55 -07:00
Curtis Belmonte
7fb2316a21
Merge "Remove/replace old fingerprint icon in SUW/Settings" into sc-dev
2021-08-17 00:47:58 +00:00
Yomna Nasser
cf77b7a248
Merge "Move "Allow 2G" controller under DisabledSubscriptionController." into sc-dev
2021-08-17 00:12:39 +00:00
Curtis Belmonte
dc9b53c446
Remove/replace old fingerprint icon in SUW/Settings
...
Replaces instances of the old fingerprint icon shown during Setup Wizard
or in Settings with either an updated version or an entirely different
icon.
Test: Manual
Fixes: 196600265
Change-Id: If78e8f0dbdb033f557614a019d4c9dde4493b6c6
2021-08-16 14:44:15 -07:00
TreeHugger Robot
d3a02937ce
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod am: 87a7ebe1d9
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15550359
Change-Id: Iad4634164373b9bdfff5b8a8ad9895c9696bca40
2021-08-13 19:18:31 +00:00
Bill Yi
04c33bbf71
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: ca003ac628
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551606
Change-Id: Ic593602b09a52dc77d36de8f7f7133668fc0182a
2021-08-13 19:17:59 +00:00
TreeHugger Robot
87a7ebe1d9
Merge "Import translations. DO NOT MERGE ANYWHERE" into mainline-prod
2021-08-13 19:08:56 +00:00
TreeHugger Robot
737f4d76c9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:50:16 +00:00
TreeHugger Robot
65d286f6a9
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:45:05 +00:00
TreeHugger Robot
b75551a41c
Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev
2021-08-13 18:39:35 +00:00
TreeHugger Robot
ede03fcc17
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 1fca8341c4
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551611
Change-Id: Ibdd232bdacd1459c383ae9dffcec8ad5f22beae1
2021-08-13 18:07:10 +00:00
Bill Yi
7eb41e014f
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: dff93bb6b3
-s ours
...
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15551617
Change-Id: I83e695e78c6e05bb2c37e7d1b0188f1f9579f6f0
2021-08-13 18:06:19 +00:00
TreeHugger Robot
1fca8341c4
Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev
2021-08-13 17:59:41 +00:00
Bill Yi
d486302dc9
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ifc717c2991b14f66c2f9f6af95aab4a68113bf57
2021-08-13 03:48:58 +00:00
Bill Yi
f30152962c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Ib9973baa15d3f4d64436daf4afa21dc213118f6a
2021-08-13 03:42:27 +00:00
Bill Yi
d9ba125bb8
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I34d0556797fbf5a0e80e97c5e76b7d805b303e83
2021-08-13 03:32:57 +00:00
Bill Yi
dff93bb6b3
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: I42ad0edeea635e7c8c12ebffad01b2e0d6bba1a8
2021-08-13 03:28:24 +00:00
Bill Yi
d54aa0fb4c
Import translations. DO NOT MERGE ANYWHERE
...
Auto-generated-cl: translation import
Change-Id: Id8e88bc2762dcd1996cbaa52d7ac66d58320bfc9
2021-08-13 03:24:52 +00:00