Jonathan Miranda
4e021bcc56
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: aa560506ba
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I89d96ed914f33f0803cf943d2b74a9482d4e6dcb
2021-07-01 18:48:34 +00:00
Sunny Goyal
cac11af5a1
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1 am: 2e5176e51f
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: Ie2e2042efc2048e9d2d66a5fea40b5470b771359
2021-07-01 18:48:29 +00:00
Jonathan Miranda
35bcb6f40d
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120 am: 1376feeb22
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: I2af5ce38052ad6eaf8234bfff93603e52f7e0e2d
2021-07-01 18:48:18 +00:00
Jonathan Miranda
0382ba2d27
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c am: b018ea34fe
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I87c9e1863a9bd7097b419bdeedbddc3c3b8beb04
2021-07-01 18:48:12 +00:00
Sunny Goyal
835dce9cde
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1 am: ebd8b75a9e
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: Ide88a388dc866aef38e2bf4d7ceb7cff179a7799
2021-07-01 18:48:04 +00:00
Jonathan Miranda
e6f0509d1d
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: I38ace4adec4591e9259a8859ed547e1b951b922c
2021-07-01 18:36:20 +00:00
Jonathan Miranda
aa560506ba
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I667763f65219cf259b8cf0db929d7dc0c848163e
2021-07-01 18:36:16 +00:00
Jonathan Miranda
1376feeb22
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: Ib47cb13c6af50c0c9d5c6ec285beca09e88f2d41
2021-07-01 18:35:36 +00:00
Jonathan Miranda
d156f372f5
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev am: 3334c32120
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164770
Change-Id: I3680615723b0ef5edf175db01fd44ed068f2147f
2021-07-01 18:35:30 +00:00
Jonathan Miranda
b018ea34fe
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I2315f7c54cb98c32f2318ded19f7563f3709cb42
2021-07-01 18:35:27 +00:00
Jonathan Miranda
a47a2017e4
Merge "Cancel existing preview item animation during non-animated update." into sc-dev am: 81501a563c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15164771
Change-Id: I2f4175a5b0b232184d2b8cd2200b3e2926903555
2021-07-01 18:35:25 +00:00
Jonathan Miranda
3334c32120
Merge "Fix bug where app icon is gone for first frame on cold start." into sc-dev
2021-07-01 18:34:47 +00:00
Jonathan Miranda
81501a563c
Merge "Cancel existing preview item animation during non-animated update." into sc-dev
2021-07-01 18:32:49 +00:00
Sunny Goyal
2e5176e51f
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: I3e8d01451a9ad4b14128bf90a9d758e922d04f4e
2021-07-01 18:32:02 +00:00
Sunny Goyal
ebd8b75a9e
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: I33bdf5f8dbacef076c6441a2309c308252143370
2021-07-01 18:31:07 +00:00
Sunny Goyal
08fa7008b0
Merge "Fixing some dimentions in AllSet activity" into sc-dev am: f3d3dcf4a1
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160037
Change-Id: I8f187fe98130bc8c35864a97b21fc31fb1161e30
2021-07-01 18:31:02 +00:00
Sunny Goyal
f3d3dcf4a1
Merge "Fixing some dimentions in AllSet activity" into sc-dev
2021-07-01 18:16:45 +00:00
Winson Chung
6a51172270
Merge "Defer cleaning up screenshot until after we actually switch to screenshot" into sc-dev am: eb0a38c5f2 am: 2ae6a3e3c9 am: 927059c8be
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15160033
Change-Id: I2659b9716d6392bc5c471d4ad42577050380c6cc
2021-07-01 18:09:23 +00:00
Cyrus Boadway
44d42d228a
Merge "Use nullable field and boolean rather than optional" into sc-dev am: 048a858575 am: 270a9c734f am: e6bd0f1e3c
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171711
Change-Id: I558a9a2995cd92fc3d7ca87b5e516a70bb1a8ba0
2021-07-01 18:06:17 +00:00
Winson Chung
d9cff07959
Merge "Remove unused logs" into sc-v2-dev am: efa5e9f5ea am: a717b7b45a
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15167125
Change-Id: I36a13d6621db04060c6d26c9bbc86a907b35f50f
2021-07-01 18:05:23 +00:00
Samuel Fufa
cb4a33b7b5
Merge "Polish changes for work tab" into sc-dev am: 9010e773e4 am: 1d7a4410e3 am: 8ab6e371c5
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15157942
Change-Id: Ie91bb7112b4b2c0c058d3ac52170a4e05f7e5d8b
2021-07-01 18:03:16 +00:00
Alina Zaidi
056c4e8e1c
Merge "Reduce margin for DropTargetBar to avoid buttons to be truncated." into sc-dev am: eefccccb19 am: f03b1aeeb6 am: f273be1019
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15155531
Change-Id: Ife4e91f79708eff4cdf5f5628a9809db1fc1eef2
2021-07-01 18:03:08 +00:00
Steven Ng
056ada4037
[automerger skipped] Merge "Fix widget animation truncated at drop if a widget is resized" into sc-dev am: d9128413cc -s ours am: 5dce7fef9b -s ours am: 3dfd83fc23 -s ours
...
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 39a87fda17 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15159890
Change-Id: Ia60726ffa89ad3452bcf0dfd5296e708c48812d7
2021-07-01 18:03:02 +00:00
Pierre Barbier de Reuille
37154fc347
[automerger skipped] Merge "resolve merge conflicts of 25e37a85ae to sc-v2-dev" into sc-v2-dev am: 2fa6e35341 am: c30fcad112 -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/+/15171390
Change-Id: I66879d0e393dc1861a9da2af564e7a5bf7d5395c
2021-07-01 18:02:56 +00:00
Steven Ng
54b836c65a
[automerger skipped] Fix widget animation truncated at drop if a widget is resized am: 39a87fda17 am: c3a5df6188 -s ours
...
am skip reason: Merged-In I901743f8ba392de37f3ef69ca386c4b36bfebd7f with SHA-1 12b0dfb826 is already in history
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15171710
Change-Id: I8b579a9f1db795b2533a3ea8df4103498eada9ac
2021-07-01 18:02:51 +00:00
Tracy Zhou
4986376828
Merge "[Live Tile] App surface is above launcher even after reaching Overview" into sc-v2-dev am: d25ee3294c am: 89f8d0763d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15158868
Change-Id: I09acf90f0b002e801c9706d8cd88bf9dbf9d853d
2021-07-01 18:02:45 +00:00
Vadim Tryshev
6f42d6f4f0
Merge "Converting some TAPL sequence mismatches to human-readable diags." into sc-dev am: eead98d493 am: 36b0ba3a98 am: 145e5d915d
...
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15150391
Change-Id: I376d28f37ca9e9f67d2d16b1306096cf618926e3
2021-07-01 18:02:40 +00:00
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