Commit Graph

3793 Commits

Author SHA1 Message Date
Alex Chau 790ce5bf28 Merge "Allow dragging outside TaskView on fallback recents" into sc-v2-dev am: 41655c3d4a am: 7386f5615f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15179053

Change-Id: I66928f0164d296fc32cf2ea82b381fb869d0d3d6
2021-07-05 15:03:35 +00:00
Alex Chau 41655c3d4a Merge "Allow dragging outside TaskView on fallback recents" into sc-v2-dev 2021-07-05 14:37:03 +00:00
Lucas Dupin 9f3ad05e6f Merge "Use launcher surface when removing launch target" into sc-dev am: e55878cedf am: 2327552bad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15193282

Change-Id: I6757587d671c2de1c6e8866b860331e72cdb1b8b
2021-07-03 17:46:51 +00:00
Lucas Dupin 1f5a4c9522 Merge "Use launcher surface when removing launch target" into sc-dev am: e55878cedf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15193282

Change-Id: If0f2f60cae7d7d00ab5cf386b32f00247af887d6
2021-07-03 17:29:49 +00:00
Lucas Dupin e55878cedf Merge "Use launcher surface when removing launch target" into sc-dev 2021-07-03 17:14:32 +00:00
Winson Chung a87e251a6b Merge "Fix crash when handling recents animation canceled" into sc-dev am: a82403ab09 am: 9b3c0a7ae8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15192339

Change-Id: I7e23e46f1f88650cf274be66dd3dc189e930996a
2021-07-03 03:59:16 +00:00
Winson Chung 3ab305e759 Merge "Fix crash when handling recents animation canceled" into sc-dev am: a82403ab09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15192339

Change-Id: Id8f402766124ecbb648d81527124e41495e182b5
2021-07-03 03:43:07 +00:00
Winson Chung a82403ab09 Merge "Fix crash when handling recents animation canceled" into sc-dev 2021-07-03 03:26:26 +00:00
Winson Chung 553d978012 Fix crash when handling recents animation canceled
- If Launcher finishes the animation, that also cleans up the screenshot
  on the server side, so we can skip calling it

Fixes: 192684578
Test: N/a, adding a null check
Change-Id: Ia6b99b4262e72f925e7d622ea8833d3c88252633
2021-07-03 03:26:16 +00:00
Lucas Dupin 20a13047ae Use launcher surface when removing launch target
Otherwise events won't be dispatched properly and window opacity will be
wrong.

Test: manual
Fixes: 191149025
Change-Id: Ice7ea86252282c7dc1cb5925dd1bdb8cade89c08
2021-07-02 17:39:10 -07:00
Tracy Zhou ee5dc1149e Merge "[DO NOT MERGE] Make the cutout slightly smaller" into sc-dev 2021-07-02 21:41:28 +00:00
Tracy Zhou 26f47c711a [DO NOT MERGE] Make the cutout slightly smaller
Temporary fix for S. Leaving the bug open for a proper fix in T.

Bug: 189265196
Test: https://screenshot.googleplex.com/75fgCva736rqwg5
Change-Id: Ice3b189a41f759e090334e360e44543eabc4836d
2021-07-02 13:35:50 -07:00
Sunny Goyal b7477c97e5 Merge "Fix some touch issues during gesture nav transition" into sc-dev am: 6348858734 am: e6704c17f2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15137733

Change-Id: Ie31b8673cadabf99149665f9a7b1a9fb95d953a3
2021-07-02 18:57:51 +00:00
Tracy Zhou ed5b2b3bab Merge "Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp" into sc-dev am: fa72529b05 am: f3e9774ca6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184810

Change-Id: I32da1bf258c69d9c694465428e37ffbd110950f5
2021-07-02 18:56:35 +00:00
Sunny Goyal 535c4957e6 Merge "Fix some touch issues during gesture nav transition" into sc-dev am: 6348858734
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15137733

Change-Id: I298c261a148e909d1f68926b6d865fa6f2b44825
2021-07-02 18:37:41 +00:00
Tracy Zhou cd5ebbdaf4 Merge "Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp" into sc-dev am: fa72529b05
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15184810

Change-Id: I9cb5e7e4ca2269c56ef835eee93bdc5b605583ac
2021-07-02 18:37:22 +00:00
Sunny Goyal 6348858734 Merge "Fix some touch issues during gesture nav transition" into sc-dev 2021-07-02 18:33:34 +00:00
Tracy Zhou fa72529b05 Merge "Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp" into sc-dev 2021-07-02 18:18:23 +00:00
Alex Chau befa11295b Allow dragging outside TaskView on fallback recents
- Similar to LauncherRecentsView.onTouchEvent, don't allow touch to escape if overview UI is shown
- Add FLAG_OVERVIEW_UI to RecentsState

Fix: 192658511
Test: FallbackRecentsTest.testOverview on pixel_jumbojack
Change-Id: I80270da6c077e8302f75384edeb521cfa81266ec
2021-07-02 16:36:47 +01:00
Tracy Zhou d2039614e0 Check if live tile targetSet is null in launchSideTaskInLiveTileModeForRestartedApp
Fixes: 192458435
Test: N/A
Change-Id: I3f0b828bf9fa9645bbd253612aa073f37b21e4b2
2021-07-01 23:52:34 -07:00
Tracy Zhou ba5a129f32 Enable live tile in 3 button mode am: d09ebe660f am: 740b2381c4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133050

Change-Id: Ie928474fe22f10bd3b246679ab47ab20a7052b7d
2021-07-02 05:30:11 +00:00
Tracy Zhou 1fe5fda3d8 Enable live tile in 3 button mode
- Previously we rely on whether launcher is resumed as a signal to see what "toggle" means. This no longer works since launcher is not resumed in Overview. Instead, we need to check the live tile signals.
- Use screenshot doesn't propagate after setting a new current task. So followed the logic around mRunningTaskIconScaledDown to work it out.
- Get rid of NavigationModeFeatureFlag, pending on 3rd party launcher change ag/14409355

Fixes: 185934639
Test: (1) Toggle overview from home screen and toggle back to fullscreen. (2) Toggle overview from app and keep toggling.

Change-Id: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
Merged-In: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
2021-07-02 05:19:32 +00:00
Tracy Zhou d09ebe660f Enable live tile in 3 button mode
- Previously we rely on whether launcher is resumed as a signal to see what "toggle" means. This no longer works since launcher is not resumed in Overview. Instead, we need to check the live tile signals.
- Use screenshot doesn't propagate after setting a new current task. So followed the logic around mRunningTaskIconScaledDown to work it out.
- Get rid of NavigationModeFeatureFlag, pending on 3rd party launcher change ag/14409355

Fixes: 185934639
Test: (1) Toggle overview from home screen and toggle back to fullscreen. (2) Toggle overview from app and keep toggling.

Change-Id: Iffaea18afb2179b5bb7dadda49e56efefa5658bc
2021-07-01 18:40:56 -07:00
Alex Chau 35d8b03a97 Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca am: 66b5af2ac2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15175270

Change-Id: I016cc95e7d86f145ef7dde642c811099c4049d1f
2021-07-01 22:36:55 +00:00
Alex Chau e526fd6a00 Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev am: 679f8bb9ca
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15175270

Change-Id: I4cc43374c577299c7be3d63bb8a7393a90447231
2021-07-01 22:28:30 +00:00
Alex Chau 679f8bb9ca Merge "Restore previous currentPage in applyLoadPlan in case task is re-ordered" into sc-dev 2021-07-01 22:12:54 +00:00
Tracy Zhou e54f789de9 Merge "Do not switch to screenshot and finish recents animation for menu options that already do so" into sc-dev 2021-07-01 19:32:39 +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 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 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
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
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
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
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
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
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
Yogisha Dixit c0425b05c6 Merge "Log widgets source." into sc-dev am: f9acf1d5d4 am: 0f8e5a8a3f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690879

Change-Id: If1ec9ea5acee39e6b83b5beb51a3cb109aaf219b
2021-07-01 13:43:21 +00:00
Vinit Nayak 80edc3a54c Merge "Take margin insets into account when setting position" into sc-dev am: 0f3053ceae am: e8ea68582f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15152173

Change-Id: I86391bfa2d276c15b72ea6511b2d5b536467309d
2021-07-01 13:43:15 +00:00
Yogisha Dixit e79c6ae8a8 Merge "Log widget features to new features field." into sc-dev am: f91abaa6f9 am: 0d36d3d9bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15133002

Change-Id: I211c9d19c46c772e48ec2c1a6e09bc9155cf6547
2021-07-01 13:43:06 +00:00
Cyrus Boadway f3bd6d81c7 resolve merge conflicts of 239e0b5408 to master
Bug: 192467834
Change-Id: Iaa856c8606561980be3d41251a68ca87eb419def
2021-07-01 11:42:00 +00:00
Winson Chung 8185663b6e Remove unused logs
Bug: 191698994
Test: Just removing logs
Change-Id: Ia6ae528f1444cbdbe3823657492deeb6c4a3d6ce
2021-07-01 04:44:04 +00:00
Tracy Zhou d25ee3294c Merge "[Live Tile] App surface is above launcher even after reaching Overview" into sc-v2-dev 2021-07-01 01:11:11 +00:00
Jon Miranda 17cc821c28 Fix bug where app icon is gone for first frame on cold start.
We need the icon to be full alpha during the init pass, then when
the actual animation starts, we can swap the icon with the window
(splash screen that draws the icon).

Bug: 192366079
Test: slow down window animations
      check no empty frame on cold start app launch
      check no empty frame on warm start app launch

Change-Id: I16a1779e5252d8e88bc3c408e1dc40b264fe4cf4
2021-07-01 00:11:41 +00:00
Hongwei Wang c3a9f0e75b Merge "Polish auto-enter-pip from landscape and split-screen" into sc-dev am: 005e269220
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/15132509

Change-Id: Id256786bd820ea5f01174c136fc992fc2cd82999
2021-06-30 20:35:28 +00:00
Hongwei Wang 005e269220 Merge "Polish auto-enter-pip from landscape and split-screen" into sc-dev 2021-06-30 20:23:23 +00:00
Winson Chung a7d7f78c08 Defer cleaning up screenshot until after we actually switch to screenshot
- In the case where we get a screenshot on cancel, we should wait to
  finish the recents animation until the view gets a chance to update

Bug: 185643608
Test: Swipe up to overview in 2 button, hit home
Change-Id: I2ac3567006f6fa7e6f473499f6862e5e408dfc3d
2021-06-30 12:03:33 -07:00
Yogisha Dixit ba28286260 Merge "Log widgets source." into sc-dev am: f9acf1d5d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/14690879

Change-Id: I2fa39b66ca31549f7754657b7d3bde6bdf8a5f59
2021-06-30 18:33:44 +00:00