Vadim Tryshev
08764fc1eb
Merge "Converting some TAPL sequence mismatches to human-readable diags." into sc-dev am: eead98d493 am: 93eac82376 am: 8aac22d68e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15150391
Change-Id: Ib9842fcc586c91a89bdbb8a4e5f429d4f745d015
2021-07-01 18:02:34 +00:00
Vadim Tryshev
98d5af6114
Merge "Verifying success of setting default Launcher in tests" into sc-dev am: ba302e8a6a am: 0b1eeaed4f am: 90c056a560
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158349
Change-Id: I2ec006e4e3eb11efc9b7373e62c7afe82a26e233
2021-07-01 17:56:34 +00:00
Brian Isganitis
f8d860ea18
[automerger skipped] Merge "Intercept touch events for launcher preview root view" into sc-dev am: e99ed7b9d1 am: 2dbe380c34 -s ours am: f1c63402c6 -s ours
...
am skip reason: Merged-In I98d462eca699cf368dcd5894f15584f280932ccc with SHA-1 3b39f3164b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15146793
Change-Id: I883cefa0b2fc750034a3090223dd028355bad3e5
2021-07-01 17:49:38 +00:00
Tracy Zhou
99adef95b3
Do not switch to screenshot and finish recents animation for menu options that already do so
...
The issue is that in landscape mode we add overview shortcuts (e.g. screenshot) to the task view menu, where we switch to screenshot and finish recents animation before executing the shortcut action. However for shortcut actions like screenshot, we do the same, resulting in two chained "switch to screenshot and finish". This is a temporary fix for S given it's late in the cycle and we don't want to introduce unwanted regressions.
Fixes: 192272546
Test: manual
Change-Id: I7ef596e8bce6c15aa4a27163197beac12359b691
2021-07-01 17:46:44 +00:00
Alex Chau
e0fcee01b3
Restore previous currentPage in applyLoadPlan in case task is re-ordered
...
Fix: 186537288
Test: Repeatededly launch task from home and swipe to home, animation is correct
Test: Quick switch, launch task then swipe up, there is no jump
Change-Id: I9fd7416d9811ce4e54a1c6d20374d89d00417cd5
2021-07-01 18:43:20 +01:00
Tony Wickham
5fac02bc5e
Fix some touch issues during gesture nav transition
...
- Don't recreate the laucher transition controller if we've already ended it, as it could clobber a touch interaction that started in the meantime
- Test: swipe up from an app to overivew, swipe to dismiss it during the transition.
- Previously, we were ending the controller twice (once on touch down as we started proxying, and again in setupLauncherUiAfterSwipeUpToRecentsAnimation()), and the second one could happen after starting the dismiss interaction.
- Don't recreateControllers() if orientation didn't change
- Test: swipe up to go from an app to home, swipe up to all apps during the transition.
- Previously, we were getting the following sequence:
1. Touch down on home to start swiping to all apps - all current controllers get this down event to start determining whether to intercept
2. Before reaching touch slop, we recreateControllers(), so all new controllers won't get the down event and thus won't intercept
- Now, we avoid unnecessarily recreateControllers(), so the original controllers can still intercept.
Test: see above
Fixes: 189700453
Change-Id: I7b5fb3d21ab7a7a7044fcec7f2c1e39afe23c5dd
2021-07-01 07:39:59 -10:00
Winson Chung
a12450e7dd
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2 am: bc5819ad4c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: Ie3e85c1f419e9faecc3a9bc73db1626001978be7
2021-07-01 17:28:10 +00:00
Cyrus Boadway
0113aa9fd8
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: 2c0058d280
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I8102fdf54c026e8ff723e34ef74e728c8a31e0fd
2021-07-01 17:27:56 +00:00
Winson Chung
927059c8be
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2 am: 2ae6a3e3c9
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I717210002017b6ed71bfa49a90171f4e32a7532f
2021-07-01 17:16:24 +00:00
Cyrus Boadway
e6bd0f1e3c
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: 270a9c734f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I4d1c78c6e3de0e0778996548196d2f20756c8ae3
2021-07-01 17:16:21 +00:00
Winson Chung
2ae6a3e3c9
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I4183018dbe6ad644824f842cae259ab0786c9657
2021-07-01 17:15:48 +00:00
Cyrus Boadway
270a9c734f
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I6b6b6bf2ecb367f81fdb82321c7e7bb3cd8a228a
2021-07-01 17:15:38 +00:00
Winson Chung
a717b7b45a
Merge "Remove unused logs" into sc-v2-dev am: efa5e9f5ea
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15167125
Change-Id: I12a6c3dd689fdeda918809b6848772b97bd9b376
2021-07-01 17:15:29 +00:00
Winson Chung
bc5819ad4c
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: Ic27229e49360d62d6fcd6bda498bfbb601b5e7ee
2021-07-01 17:14:55 +00:00
Winson Chung
277e9c83c7
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I4ed3c6d9009dcff282b08e6597fecd9dcfdecd0e
2021-07-01 17:14:51 +00:00
Cyrus Boadway
c857d45d97
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I33e41f1886bc0ce57b291acc60b2e8d3b5d65d7b
2021-07-01 17:14:46 +00:00
Cyrus Boadway
2c0058d280
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: Ie26953aae751be9f834da654b620ab9213c6a964
2021-07-01 17:14:41 +00:00
Winson Chung
eb0a38c5f2
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev
2021-07-01 17:11:35 +00:00
Winson Chung
6a777d84b8
Remove unused logs
...
Bug: 191698994
Test: Just removing logs
Change-Id: Ia6ae528f1444cbdbe3823657492deeb6c4a3d6ce
Merged-In: Ia6ae528f1444cbdbe3823657492deeb6c4a3d6ce
2021-07-01 17:09:40 +00:00
Winson Chung
efa5e9f5ea
Merge "Remove unused logs" into sc-v2-dev
2021-07-01 17:09:22 +00:00
Samuel Fufa
8ab6e371c5
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4 am: 1d7a4410e3
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: I98615d6ff79d692dbbb7a66aa394a4f0b40fa1f3
2021-07-01 17:09:13 +00:00
Cyrus Boadway
048a858575
Merge "Use nullable field and boolean rather than optional" into sc-dev
2021-07-01 16:57:24 +00:00
Samuel Fufa
0b2ad34aab
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4 am: cdf9aac97e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: Ied42c78e51c4cd4b0e4a6083eaa29101cfd640fe
2021-07-01 16:51:46 +00:00
Hongwei Wang
053fc98038
Merge "Polish auto-enter-pip from landscape and split-screen" into sc-dev am: 005e269220 am: 52df9c8580 am: 873319b273
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15132509
Change-Id: Ieaabde21fff22d14c41138137e4648a9372f3a14
2021-07-01 16:47:56 +00:00
Vadim Tryshev
aa6932ddab
Merge "Verifying success of setting default Launcher in tests" into sc-dev am: ba302e8a6a am: 0c3a3125a5 am: 99fa44a679
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158349
Change-Id: I77dcedc4da08b859f35d170a3030ec2c82e23728
2021-07-01 16:47:43 +00:00
Brian Isganitis
7f6593d949
[automerger skipped] Merge "Intercept touch events for launcher preview root view" into sc-dev am: e99ed7b9d1 -s ours am: bb6b8eef8f -s ours am: 0c1c62901b -s ours
...
am skip reason: Merged-In I98d462eca699cf368dcd5894f15584f280932ccc with SHA-1 3b39f3164b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15146793
Change-Id: Ifd28c3128fbeeaba46c512e277334c90911d1c0c
2021-07-01 16:47:34 +00:00
Samuel Fufa
1d7a4410e3
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: Ic3aa2d63e943b41eb65517d2f25154128edb0432
2021-07-01 16:43:29 +00:00
Hongwei Wang
c73c16b53f
Merge "Polish auto-enter-pip from landscape and split-screen" into sc-dev am: 005e269220 am: c3a9f0e75b am: 4b38eb6f95
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15132509
Change-Id: Iaa16181537eea90b946558be67fad0653fc052f3
2021-07-01 16:42:50 +00:00
Jon Spivack
fed20d349d
Merge "NIU Actions: Add privacy confirmation dialog" into sc-dev am: 4e0bc773c8 am: b83b605fe8 am: e89270662a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098029
Change-Id: If6d23979c4ca237242268874d83f0a0d88c4aecb
2021-07-01 16:42:37 +00:00
Samuel Fufa
4ace63d141
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: I4a49c0e8c8418d6e1f9c4c128541e8d32717cd1e
2021-07-01 16:42:34 +00:00
Samuel Fufa
cdf9aac97e
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: If0bc0972ab333012562246bee9a906a7a7bcca8a
2021-07-01 16:42:34 +00:00
Jon Spivack
6ec5219676
Merge "NIU Actions: Add privacy confirmation dialog" into sc-dev am: 4e0bc773c8 am: c135e5ad01 am: 517530491d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15098029
Change-Id: I9c469394964d7fda0e201c9db8cba88acd5e43ea
2021-07-01 16:42:28 +00:00
Yogisha Dixit
ff27a155aa
Merge "Log widgets source." into sc-dev am: f9acf1d5d4 am: ba28286260 am: a03a7ed02f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690879
Change-Id: I1b229d15259136436b4aaa8b5ecd5896b09c7d2b
2021-07-01 16:42:19 +00:00
Yogisha Dixit
0ade67b37d
Merge "Log widgets source." into sc-dev am: f9acf1d5d4 am: 669bac8bd6 am: 8235d49e74
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690879
Change-Id: Ieb8804472768bfc03fdc53b7bc723c67a62d7539
2021-07-01 16:42:10 +00:00
Vinit Nayak
aba759602e
Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae am: 7f5fa6d1e6 am: 3da704144f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15152173
Change-Id: I10df9eefb92f8a71b8954649c608b828ae9a9aa8
2021-07-01 16:42:02 +00:00
Yogisha Dixit
80e914a988
Merge "Log widget features to new features field." into sc-dev am: f91abaa6f9 am: aacc518984 am: 4d744724a4
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133002
Change-Id: I4ad76919ea58900efc7ea2db46ed281abcf0f096
2021-07-01 16:39:37 +00:00
Vinit Nayak
d26f44cf65
Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae am: 0a740a074a am: 0a708332b8
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15152173
Change-Id: I2f9d630cdb5fbfa06304aa9199fcd1b69f2188ff
2021-07-01 16:39:28 +00:00
Yogisha Dixit
eac443c2d4
Merge "Log widget features to new features field." into sc-dev am: f91abaa6f9 am: 1e143f2c6b am: 9d096bb34c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133002
Change-Id: I668aa4dd2b2310c8a2b9bae60afb299e1f2ff421
2021-07-01 16:39:12 +00:00
Cyrus Boadway
91d06db5e3
Merge "Defer onColorsChanged updates during widget-to-home animation" into sc-dev am: 1edaed8790 am: 9d609707c1 am: 5d52c966ff
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15147896
Change-Id: I875cfeaf0b6fefe06fbfeeb7811e4698365f1d1d
2021-07-01 16:39:03 +00:00
Cyrus Boadway
8a074aeb54
Merge "resolve merge conflicts of 8cf91e4bcc to master"
2021-07-01 16:33:29 +00:00
Samuel Fufa
9010e773e4
Merge "Polish changes for work tab" into sc-dev
2021-07-01 16:30:39 +00:00
Cyrus Boadway
551b4297ed
Use nullable field and boolean rather than optional
...
Optional won't hold null parameters, so use a boolean flag and
colorschange fields to represent the value and whether changes are
present.
Bug: 190818220
Test: manual
Change-Id: I794507340345864e73f04039f12a035c8053fd96
2021-07-01 15:05:43 +00:00
Alina Zaidi
676e0e5bf0
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19 am: 03007e3a50
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531
Change-Id: I2ffb1a4a5d9ee0bc32a7100631a45fe97f1acecf
2021-07-01 14:19:08 +00:00
Steven Ng
9c0bafea47
[automerger skipped] Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc am: 322bde8da4 -s ours
...
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 b5c9b67b5e is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: If5295b033b6aa241019b1eb647f5f4839c9916cf
2021-07-01 14:18:24 +00:00
TreeHugger Robot
007e15d55f
[automerger skipped] Merge "Correct color extraction on App Widget drop." into sc-dev am: 25e37a85ae am: 90322514fc -s ours
...
am skip reason: Merged-In If573641e4bb5a98ed6b5008e00f70f4bbe492c24 with SHA-1 2881801c7b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15121736
Change-Id: I4e316f83a637757b7de5a1c83bb808f3da9e237d
2021-07-01 14:16:32 +00:00
Vadim Tryshev
8ec43bbce8
Merge "Converting some TAPL sequence mismatches to human-readable diags." into sc-dev am: eead98d493 am: c24d41d183
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15150391
Change-Id: I9643b7fcc07d9b419326fe54b8c1d962742a1e42
2021-07-01 14:16:25 +00:00
Vadim Tryshev
1a937a76f7
Merge "Verifying success of setting default Launcher in tests" into sc-dev am: ba302e8a6a am: ee33c8263f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158349
Change-Id: I9dd001a750f975f11ceab7c67cf24f4065e44f14
2021-07-01 14:15:22 +00:00
Brian Isganitis
c88968473a
[automerger skipped] Merge "Intercept touch events for launcher preview root view" into sc-dev am: e99ed7b9d1 am: 41c463f3fa -s ours
...
am skip reason: Merged-In I98d462eca699cf368dcd5894f15584f280932ccc with SHA-1 3b39f3164b is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15146793
Change-Id: If0e15f0f8d95997cf5e6410babedd304dbd482ff
2021-07-01 14:06:25 +00:00
Cyrus Boadway
be2038d306
resolve merge conflicts of 8cf91e4bcc to master
...
Bug: 192467834
Change-Id: I2fe910d57cee43fe9f893319626d843d787ac382
2021-07-01 13:58:05 +00:00
Hongwei Wang
dcfe1eab2f
Merge "Polish auto-enter-pip from landscape and split-screen" into sc-dev am: 005e269220 am: b4a1448ae2
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15132509
Change-Id: I8853abffe95a33dec942a69e92be5bc9579776d0
2021-07-01 13:43:35 +00:00