Bill Yi
8c862d6a9b
[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: 90ba44b4a9
-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: I3a7f35819a41ef236b611aaff84c0dcaf1d2b873
2021-08-19 19:27:13 +00:00
Bill Yi
503d80d5c9
[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: aa112c9a2b
-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: I95415a462b9a3bb19063e3151e61fc1ab0326a40
2021-08-19 19:26:18 +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
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
cb6d369c8a
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 6b38523ea7
-s ours am: d14aa78c7a
-s ours am: 82cbd3697f
-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: I8f31aa7815aeb5c279ecb5fc6df329edff16afeb
2021-08-19 18:49:39 +00:00
Bill Yi
3a35914442
[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 15b602ca6e
-s ours am: 57f1c163d3
-s ours am: 4b72049845
-s ours am: 3fe28ed480
-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: Icfcb83304a064e99853c917d56dd48b283a3d0e9
2021-08-19 18:49:32 +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
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
98f485fead
Add sensitivity configuration to long press power dialog am: de2f00df41
am: 5d37f9b93d
am: b5b95034d2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611
Change-Id: Ifc9ab12ead636e6e2b536b819e16be7d7ba86801
2021-08-19 15:42:21 +00:00
Jernej Virag
7a0e4ae189
Add sensitivity configuration to long press power dialog am: de2f00df41
am: a4034c602a
am: 4ff3404ebf
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15542611
Change-Id: I421bde212de03e3b09d33bc8488c2c2430795742
2021-08-19 15:42:04 +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
TreeHugger Robot
836480ba16
Merge "Import the window extension libary in the Settings app"
2021-08-19 13:58:45 +00:00
Tsung-Mao Fang
18ad0c49a8
Import the window extension libary in the Settings app
...
Test: Rebuilt apk and run apk successfully.
Bug: 196939216
Change-Id: If9040ae9a1c72097e4964c8d40ea9785cf2f01dc
2021-08-19 17:23:11 +08:00
Bonian Chen
c47726f29c
Merge "[Settings] Avoid from floating overlay when displaying SIM selection UI"
2021-08-19 07:37:46 +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
b25603bcc7
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
am: f4977c5e36
am: 3fa1d36367
am: 63e76d5871
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: I916966919716cadfa0d9c0cdc64d1ea3ba98c4be
2021-08-18 22:53:24 +00: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
efa8338c83
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
am: f4977c5e36
am: ed09bc316c
am: 597e904d84
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: Ic76ea9d28ca121acaaecaacd75450730aed40325
2021-08-18 22:34:12 +00:00
TreeHugger Robot
7dc7e1f072
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
am: 27f9d9ce04
am: 9def67d894
am: 4f014f690c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: Ib317b4b3aadac927636dc19c8e96fa62f834d849
2021-08-18 22:33:46 +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
23b9aad3f5
Merge "LPP will now always launch either GlobalActions or the Assistant." into sc-dev am: 6bf17de139
am: 95d2eb7376
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15603279
Change-Id: I3d211177777a9fd9ef570c19e1509fcb4f58236e
2021-08-18 22:05:09 +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
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
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
256921f7bf
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
am: 59fb9ccac7
am: 7e8d554a59
am: 5cfb365c68
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: I10abbfae3a57119082e2a32bbd623107b834642d
2021-08-18 18:46:53 +00:00
Automerger Merge Worker
e28351b5bd
Merge "Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
am: bc0cf0d87f
am: 48efcc5547" into sc-v2-dev-plus-aosp am: 6f1fa17967
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: I131e90d3b9bee09242a0c9ce5787ebd82e8d46ea
2021-08-18 18:46:47 +00:00
Neha Jain
44ea43dc31
Merge "Remove CDM entries in Connected Device." into sc-dev am: abd0f6a5f6
am: bc0cf0d87f
am: 92171172ec
am: 0b96b6d13b
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15486674
Change-Id: Id7ca862cf98c856f8737a6f21e5ba0ef03e64234
2021-08-18 18:46:34 +00:00
TreeHugger Robot
f30f4b4dac
Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d
am: e39485b4b2
am: f87021b354
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651
Change-Id: I2e2007349d8bf2cf1b3d83fd1f50f84c3d9132e5
2021-08-18 18:46:09 +00:00
TreeHugger Robot
b1ca0b6db2
Merge "Move Automatic System Updates from Developer Options to System" into sc-qpr1-dev am: 190603f53d
am: a513ecb2da
am: 8fc64966fa
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Settings/+/15552651
Change-Id: Ibc9082d528bbc161f0f8e6177feb6d4ac219eae6
2021-08-18 18:45:56 +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