Bill Yi
cdbbc26870
[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: 618d4c5536 -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: I444a61bfb177631c9e2ba4c1e8959486fef17312
2021-08-19 19:10:14 +00:00
Automerger Merge Worker
5133a7231f
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 am: 7bc12274aa -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: I561085ebef8d6c808748d2a19f8f4a8cdbd52423
2021-08-19 19:10:06 +00:00
Bill Yi
90ba44b4a9
[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: 4a36ab840e -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: I4b4966a07e7d6e4a5fae9659406b4a375be04389
2021-08-19 19:09:55 +00:00
Bill Yi
aa112c9a2b
[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: d3b636b356 -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: I750c00eda41881a0e223707e16e4ab9649e50fa9
2021-08-19 19:09:33 +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
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
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
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
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
Jernej Virag
b5b95034d2
Add sensitivity configuration to long press power dialog am: de2f00df41 am: 5d37f9b93d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611
Change-Id: Ia8c8fb91bb8adc4fa6203e099907cf5cabb1876f
2021-08-19 15:32:54 +00:00
Jernej Virag
4ff3404ebf
Add sensitivity configuration to long press power dialog am: de2f00df41 am: a4034c602a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611
Change-Id: I4dce1c3176544f7df08c4ef9b3d28daddcd5a3ac
2021-08-19 15:28:52 +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
5d37f9b93d
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: Iee7ce4a08a1a132e95eb9f4313b58c7fbe3eafd2
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
63e76d5871
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: f4977c5e36 am: 3fa1d36367
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: I6fb61ab378d34f1b9446188f97d3690c0d542a69
2021-08-18 22:39:07 +00:00
TreeHugger Robot
597e904d84
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: f4977c5e36 am: ed09bc316c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: I9fbb9ad87697ffb8422d46fe26809ada6583d378
2021-08-18 22:18:50 +00:00
TreeHugger Robot
4f014f690c
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139 am: 27f9d9ce04 am: 9def67d894
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: Ie39d75d5f53fdcac88b8578af0cafd0ec4a6dafa
2021-08-18 22:18:44 +00: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
3fa1d36367
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: I01256184429ddc1f337a5453b6a73ac6b441cfe4
2021-08-18 22:10:16 +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
5cfb365c68
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: 59fb9ccac7 am: 7e8d554a59
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: I523cd10e6aa0d26bf6823685139c9521df848fe7
2021-08-18 18:31:35 +00:00
Automerger Merge Worker
6f1fa17967
Merge "Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547" into sc-v2-dev-plus-aosp
2021-08-18 18:31:28 +00:00
Neha Jain
ba1178c72d
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 48efcc5547
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: I5d4dd3e9aaeb60c0b9e6fb3e600fa923921930c9
2021-08-18 18:31:25 +00:00
Neha Jain
0b96b6d13b
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6 am: bc0cf0d87f am: 92171172ec
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: Ic16ea6b43b4ee5cfc2a7d1f1e9a3287d62ab491c
2021-08-18 18:31:24 +00:00
TreeHugger Robot
f87021b354
Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d am: e39485b4b2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651
Change-Id: I2d4a4a4c3e261030684411330b6509df9a548e5b
2021-08-18 18:31:09 +00:00
TreeHugger Robot
8fc64966fa
Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d am: a513ecb2da
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651
Change-Id: I7abe37232b3d60328d1c67f36b61057ea2399b76
2021-08-18 18:30:59 +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
48efcc5547
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: I59640625b9f47dd7493acb0d919b6680e1f25660
2021-08-18 18:12:52 +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
TreeHugger Robot
e39485b4b2
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: Ibe5966344f9c2ca2e13b40bdc6b69ebb0342f169
2021-08-18 18:12:23 +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
f2711c3e59
Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: 186ea2cd3b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134
Change-Id: I9c002966cafac1352c1f5e731b36316b31c2bd4f
2021-08-18 07:06:13 +00:00
Calvin Pan
cad9603b2e
Merge "Remove unnecessary condition" into sc-qpr1-dev am: abb8a6abdc am: f687c1ea61
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542134
Change-Id: I9fef74a954ee2ab03037e4c3abaa2539749f8d9e
2021-08-18 07:05:33 +00: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
