Commit Graph

78507 Commits

Author SHA1 Message Date
Treehugger Robot 2f44cb5898 Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77 am: 6dcf6f0e42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986

Change-Id: Ia724acf48b14640be312fc59e7ac983987b86dbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:53:33 +00:00
Winson Chung edb735e7a5 Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c am: 485267061f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: I14cb5542c3d0de0382295f544c4bc029be930bfd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:52:54 +00:00
Jerry Chang 303d6101fb Merge "Fix not tracking splitting tasks correctly" into udc-dev 2023-05-12 00:49:21 +00:00
Treehugger Robot 99dab78a0e Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77 am: 6dcf6f0e42
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986

Change-Id: Ib6334ff398c49f983186323fb27668486de7cfbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:43:52 +00:00
Winson Chung 03e384c3b4 Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c am: 485267061f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: Ida864ed458f2e27b1455530b6094628852de02cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:43:46 +00:00
Winson Chung 59acbb80b0 Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c am: ce1017e075
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: I00bf1c82361c14edb62943c3895ffb62afb3eed9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:42:29 +00:00
Tony Wickham deb445d480 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2 am: bb176e243a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: I2cbe2698d291474ce3c1822535a9fe1a5d34d2be
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:42:06 +00:00
Treehugger Robot 2ba03e8d11 Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77 am: 06f1b97214
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986

Change-Id: Ib13851f91544921d4e54c9b2977195a46401b751
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:41:26 +00:00
Tony Wickham b97a6d9176 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2 am: 9b83175350
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: Id64254e6999b5a8932c23e5a50ac95efe48ad3f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:41:23 +00:00
Winson Chung 3e62b41ea3 Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c am: 436229450b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: I64d9efcc3af0dcdb2d81d3d3dbd8208cbfa46ddb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:41:17 +00:00
Tony Wickham c75bd69dbc Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2 am: cfa7876f2a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: I0f7894052c65cfa8d7798474da43aa4eefdb445c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:38:48 +00:00
Tony Wickham b7ddcba5ed Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2 am: bb176e243a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: I418c5c7f3d9ec7cbccb09a57044d4ae00c535692
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:37:02 +00:00
Treehugger Robot 6dcf6f0e42 Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986

Change-Id: I09cff1e8be14c47fbe4e6d1457334d69d4675531
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:22:52 +00:00
Jeremy Sim a80aa0a91c Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: 37c9f10a26 am: 3d7ea7aa22
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: If2ab3ce4136ae3b9b7fb682c69ca7c2734d54f8e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:21:14 +00:00
Sunny Goyal 88cd580a0c Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: 71d20b0ed7 am: 38ccd68d92
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I8c0aca38a062e3a0b5e4ad56819737020f5d14cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:20:27 +00:00
Treehugger Robot 06f1b97214 Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev am: e201480e77
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23174986

Change-Id: I4643c76b6511c771e05ee46d22e0117a8a9190e6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:20:16 +00:00
Jeremy Sim 19c74f6657 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: 7b6b368537 am: 05a0826cab
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: I871c5710749abe44cb997fd91675cd269487cb86
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:16:31 +00:00
Sunny Goyal 5307b5b970 Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: bfe800cd55 am: 51512614f5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I1704c5897cd48488000865e4529dc00ee94c40d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:16:24 +00:00
Jeremy Sim 6ce65da612 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: 37c9f10a26 am: 4454123fbc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: Ibde3de1e4e1a94fa5ac2f431defe006cd527010e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:15:57 +00:00
Sunny Goyal ab4879a037 Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: 71d20b0ed7 am: e7c53279ff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I86f8d72c768e9be061b6189f0be91255090135ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:15:19 +00:00
Treehugger Robot e201480e77 Merge "Add logs to check which userId is used for workProfile matcher" into udc-dev 2023-05-12 00:07:37 +00:00
Winson Chung 485267061f Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: I4cb69a140791bceeed78a24bbc43be0a70d1e142
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-12 00:00:45 +00:00
Winson Chung 436229450b Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: If3358102e727d7f58538780c6337ddc9c325f385
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:59:15 +00:00
Tony Wickham cfa7876f2a Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: Iec7ffcf1962731ad929fc630e860a1931e250c01
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:58:56 +00:00
Tony Wickham bb176e243a Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: I0ea3bef525d76dd8801e66d2e35334b39b66e6cc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:58:27 +00:00
Winson Chung ce1017e075 Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev am: e04071e19c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23151004

Change-Id: If5bef04bd9e704371df3bf4568297be4f084ee50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:56:18 +00:00
Tony Wickham 9b83175350 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev am: 8d402efac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23122637

Change-Id: I16f2310feec73c677ae603649205bdeb233388d5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:55:29 +00:00
Jeremy Sim 05a0826cab Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: 7b6b368537
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: I5a97e0f52b253ff06e89faaeaeb3570e8dd68e41
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:38:06 +00:00
Android Build Coastguard Worker 70a690e1ce Snap for 10113759 from fda9f3d430 to udc-release
Change-Id: I4e1e66c02f5e1fcb187faf540ae364ca4be3cbf8
2023-05-11 23:36:09 +00:00
Sunny Goyal 51512614f5 Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: bfe800cd55
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: Ie38cc1f17ef846a345af88aa9e7035a0476b92e2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:35:39 +00:00
Jeremy Sim 3d7ea7aa22 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: 37c9f10a26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: I355dcde40d6fcbd6bec6fdd3ef36a09b2dbbf722
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:34:28 +00:00
Sunny Goyal 38ccd68d92 Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: 71d20b0ed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I5b35a96ec61daf3991d0158069fdc992fe4e7dc0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:34:16 +00:00
Jeremy Sim 6b41662ac8 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: b13f3456cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: I274aa922f51af456ce8b06a857c31f39f8464ded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:33:34 +00:00
Sunny Goyal 1758f9db7b Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: 396abeecaf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I67919780cb245058f85bb8f048f49c7803f88d57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:33:02 +00:00
Jeremy Sim 4454123fbc Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2 am: 37c9f10a26
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: Ic1f2dbd6445bc327e022bed6dfd11c53f1eee24a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:32:36 +00:00
Vinit Nayak f68f1fa3cc Cleanup SettingsChangeLogger onClose()
* Correct name for San*d*box

Bug: 280463854
Flag: none
Test: v2/gnl-eng/unbundled/launcher/nexus_unit_test_multi_device_platform
Change-Id: I2446871c8ea0b146ccfa2ea7caa1727aec42dd42
2023-05-11 16:32:27 -07:00
Sunny Goyal e7c53279ff Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba am: 71d20b0ed7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I535d02ff6153c9136d84bdbe18131115bfc4423c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:32:07 +00:00
Winson Chung e04071e19c Merge "Only refresh the launcher resume state when the task launch fails" into udc-dev 2023-05-11 23:31:21 +00:00
Winson Chung de1b42b957 Only refresh the launcher resume state when the task launch fails
- The previous call from TaskbarLauncherStateController caused a
  regression due to the inability for the code to distinguish
  Normal -> Background -> Normal when tapping on the bar area
  or from failing to launch a task, so both cases were triggering
  the resumed state to cycle and start an animation.  For now we can
  only handle the task-launch fail case.

Bug: 268448123
Fixes: 281966662
Test: Quickswitch to an activity that finishes when resumed
Change-Id: Ie4692dd85252540ff47633978c0e6e4adbb1bdd0
2023-05-11 23:31:14 +00:00
Tony Wickham 8d402efac2 Merge "Consistently multiply touch slop for InputConsumers" into udc-dev 2023-05-11 23:21:33 +00:00
Treehugger Robot 318ead6cb7 Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 3b7009bc57 am: eb288b9a78
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: I7dc2fa201441c3d4a3ce6abf208fb1c9d9e5644f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:18:04 +00:00
Sunny Goyal 414b2aef12 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: a0db88cee5 am: eed29d5b49
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: Ief01e20602a040bc52be1ff2305ec35f0c81fba1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:17:20 +00:00
Treehugger Robot 0424b11f9a Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 1e92350f86 am: 821c7cc64d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: I7e9bf96c71b1c0688c7ca5c2174c0f86b0d25f95
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:16:09 +00:00
Sunny Goyal 620833b727 Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: 4e4da5c95e am: a0231eafa3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: I07524861b29c01e095f1930fd5d5404e33f2f58d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:15:40 +00:00
Treehugger Robot 689bc856eb Merge "Revert "Modify Taskbar code to accommodate bubble bar gesture to stash/unstash"" into udc-dev am: 52d4764576 am: 3b7009bc57 am: 4d5b3e50f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23177739

Change-Id: I55df5e452698d50cd56ba67250ed71ac67428bf3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:14:39 +00:00
Sunny Goyal f11d62b58b Merge "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly""""" into udc-dev am: 04a6211120 am: a0db88cee5 am: 0eaf9b0e75
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23117443

Change-Id: I63a0ca4a33e9fca71ea3b326ef1a4b9ffced29d2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 23:13:02 +00:00
Jeremy Sim b13f3456cd Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: Ie52ab1c28b229b6364a3b80ec1eadb0fb0a55b54
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:56:03 +00:00
Jeremy Sim 37c9f10a26 Merge "Fix animation canceling crash bug (short swipe during split select)" into udc-dev am: 7158d2d0e2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22146539

Change-Id: Ie1a029935d313dd87ad663db298c04aa815f7d46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:55:23 +00:00
Sunny Goyal 396abeecaf Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I3612fcd5bbd3da3d665ab591e880a5424865cc90
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:53:43 +00:00
Sunny Goyal 71d20b0ed7 Merge "Revert "Revert "Revert "Revert "Revert "Changing GridMigrationTask to use ModelDbController directly"""""" into udc-dev am: c110587dba
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23159152

Change-Id: I3dc4f94a4dc8a9eb00044e23742add37120ed195
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-05-11 22:53:34 +00:00