Bill Yi
0caa8d7dcd
[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: 2e0e5306cb -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: Ief646a803bdad6cdf36bc8ef0abf18c15927a83a
2021-08-19 19:39:32 +00:00
Bill Yi
2e0e5306cb
[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: I52c38ea935765bffaa1842a628d6e74b6ca6eead
2021-08-19 19:22:57 +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
618d4c5536
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e -s ours am: 6b38523ea7 -s ours am: d14aa78c7a -s ours am: 7cf6899a9f -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: Ifc4fb65b62b9cce12bfbcaf7a7626ceb2fbd0584
2021-08-19 18:50:52 +00:00
Automerger Merge Worker
7bc12274aa
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e -s ours am: 57f1c163d3 -s ours am: 4b72049845 -s ours am: 5104f6c447 -s ours" into sc-qpr1-dev-plus-aosp
2021-08-19 18:50:30 +00:00
Bill Yi
628e0c7de4
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e -s ours am: 57f1c163d3 -s ours am: 4b72049845 -s ours am: 5104f6c447 -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: Ie88b2dd4461fca637efb15e11ec1e8126f5c7f3e
2021-08-19 18:50:28 +00:00
Bill Yi
4a36ab840e
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e -s ours am: 6b38523ea7 -s ours am: d14aa78c7a -s ours am: af88f409b5 -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: I4fd6733f651ec285c59a5af26c080339e5c38c76
2021-08-19 18:50:26 +00:00
Bill Yi
d3b636b356
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e -s ours am: 57f1c163d3 -s ours am: 4b72049845 -s ours am: 8356f6173a -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: I3fdb4ebaafc8b175a44a46027c59fa54c67bcc34
2021-08-19 18:50:14 +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
7cf6899a9f
[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: I094bfa812ab417a3e9f2383f3c0606dd6354e4f2
2021-08-19 18:36:45 +00:00
Bill Yi
5104f6c447
[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: Id4fc45428e44702a9b37541c9daa70de82e078c4
2021-08-19 18:36:11 +00:00
Bill Yi
af88f409b5
[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: Ibb2c45d7df812ef18d601530b3b075f350a61742
2021-08-19 18:35:12 +00:00
Bill Yi
8356f6173a
[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: I408e4cdf236b3dc26114b1bc25902bec90effe71
2021-08-19 18:35:04 +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
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
Jernej Virag
a4034c602a
Add sensitivity configuration to long press power dialog am: de2f00df41
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611
Change-Id: I0d94e4a5157dc18fdbe454fe0a3e24377dc78d53
2021-08-19 15:16:26 +00:00
Jernej Virag
de2f00df41
Add sensitivity configuration to long press power dialog
...
This gives the user the ability to configure the length of the long press power gesture. The configuration values are read from config.xml and can be customized per device.
Bug: 193792060
Test: Manual test on Pixel 6 and Pixel 4 hardware devices
Test: Unit tests with make -j64 RunSettingsRoboTests ROBOTEST_FILTER="com.android.settings.gestures.*"
Change-Id: Ia6595c1337244b01e9c8b2ef04dd97a9a0f03de2
2021-08-18 19:41:10 -04:00
TreeHugger Robot
ed09bc316c
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: f4977c5e36
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: I9280c56af13dd05d67641fad0043b2b9b7811fab
2021-08-18 22:10:17 +00:00
TreeHugger Robot
9def67d894
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: 27f9d9ce04
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: Ic349cb0e82e5c6a596ab232d3b23e333b1723241
2021-08-18 22:09:41 +00:00
TreeHugger Robot
f4977c5e36
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: Id383cf7ad45bed45a88fdc1c5583097357634248
2021-08-18 21:56:42 +00:00
TreeHugger Robot
27f9d9ce04
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: I8d7ecb3c01a7480669e39e0f371030a9ffa905f7
2021-08-18 21:55:56 +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
7e8d554a59
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: 59fb9ccac7
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: Iba630d04864c8f2ee8df3387a2454a5274ea7397
2021-08-18 18:26:08 +00:00
Neha Jain
92171172ec
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: I575d9f32e028249f49360b37dacfab9df9404e7f
2021-08-18 18:12:40 +00:00
TreeHugger Robot
a513ecb2da
Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651
Change-Id: Ia854e365a828137bcc3f6d112695ed2b1c051313
2021-08-18 18:12:32 +00:00
Neha Jain
bc0cf0d87f
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: I04fdc7c76285de7ad43b83846de10a377eb4f151
2021-08-18 18:12:08 +00:00
Neha Jain
59fb9ccac7
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: If854986d16aeca997c309da10b5153600131389e
2021-08-18 18:11:06 +00:00
Neha Jain
abd0f6a5f6
Merge "Remove CDM entries in Connected Device." into sc-dev
2021-08-18 18:01:00 +00:00
TreeHugger Robot
190603f53d
Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev
2021-08-18 17:56:51 +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
Calvin Pan
f687c1ea61
Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134
Change-Id: I27ae050157e9143c0472d4e18ad7c29dab42d8c2
2021-08-18 06:56:25 +00:00
Calvin Pan
abb8a6abdc
Merge "Remove unnecessary condition" into sc-qpr1-dev
2021-08-18 06:43:59 +00: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
87231f645a
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: ebdc111881 -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: I22c1fc7d7c0c7b0b0750a2431d6851b8cb917290
2021-08-18 00:02:02 +00:00
TreeHugger Robot
f30d081a94
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: a26ca75570 -s ours am: cee3e9bfce -s ours am: c3d27dad60 -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: Ifb21bb093047d9628bce7f6c911750b4d5fab8a5
2021-08-17 23:56:06 +00:00
TreeHugger Robot
ebdc111881
[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: I46a0db7c5e375574da88ac20db52790c3ccf29ea
2021-08-17 23:43:42 +00:00
TreeHugger Robot
c3d27dad60
[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: I01a092f96b4633ff98b538c88e77d00a26484b98
2021-08-17 23:40:25 +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
634884e7ba
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: 2aa1ba2fba -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: Ic7d5d96ea07750d6d6e54a5c6f946c755f3e7629
2021-08-17 22:36:19 +00:00
Bill Yi
28c5c2fdb6
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 88e247bfe9 -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: I1f12e045a36ec8de65c9682575ebc9817769b659
2021-08-17 22:35:47 +00:00
Bill Yi
db14bcbe3b
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 28dea4a78c -s ours am: f3da5afffa -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: If65541ea0389dabf3ab0764ed4825b45f5ed16bd
2021-08-17 22:30:18 +00:00
Bill Yi
1492ac1bfd
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into sc-dev am: 0fe195f2b0 -s ours am: 63f455688c -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: I0f54867e8c75f7a4f98b1d802425ea1d051dd788
2021-08-17 22:29:04 +00:00
Bill Yi
aeb3f24e59
Merge changes from topic "presubmit-am-cdddcf78595b4111a60c29aad3e575f9" into sc-dev-plus-aosp am: 6b6e3e88b9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15591587
Change-Id: I644ec2547cf5dec240e7219e45936c7eb3310a32
2021-08-17 22:24:41 +00:00
Bill Yi
743457a225
[automerger skipped] [automerged blank] Import translations. DO NOT MERGE ANYWHERE 2p: d1e4f888fb am: 635d7a2949 -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: I4acff956f43f72294cd6059fcaadeb7def76a4c5
2021-08-17 22:24:40 +00:00
