Commit Graph

8075 Commits

Author SHA1 Message Date
TreeHugger Robot
86be069897 Merge "Report contentInsets only based on what they will be inside apps" into sc-v2-dev am: be0360c6d8
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16442237

Change-Id: I3f2382b320e7e13673e9a156e0250133e15d2d7d
2021-12-11 01:51:46 +00:00
TreeHugger Robot
a370c8880f Merge "DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks" into sc-v2-dev am: 953873dd18
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440097

Change-Id: Ifa60729ab1b7cf9031dc03698684879a202ff1f4
2021-12-11 01:51:08 +00:00
TreeHugger Robot
be0360c6d8 Merge "Report contentInsets only based on what they will be inside apps" into sc-v2-dev 2021-12-11 01:30:26 +00:00
TreeHugger Robot
953873dd18 Merge "DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks" into sc-v2-dev 2021-12-11 01:12:57 +00:00
Tony Wickham
c7b8957bbb Report contentInsets only based on what they will be inside apps
This avoids changing them when going from an app to launcher (most obvious when going to overview).

This also allows us to not change insets on apps when opening/closing IME, which reduces potential jumpiness.

Finally, also use this logic for 3P launchers by calling directly from TaskbarDragLayerController instead of TaskbarUIController (which was only overridden by LauncherTaskbarUIController). This fixes some bad issues like sending fullscreen insets when opening a folder from taskbar.

Test: Open Calculator, unstash taskbar, go to overview and ensure no jump as taskbar stashes.
Fixes: 200805319
Change-Id: I4f1cc187398d0051863ff44ea90b7ab9c6aaa8f9
2021-12-10 23:47:18 +00:00
Alex Chau
4c98374d99 DeviceProfile.overviewRowSpacing should exclude extra top margin on grid tasks
Bug: 207350366
Bug: 210158657
Test: manual
Change-Id: I28116407c4267259a75fd39637104cea9db73fe3
2021-12-10 23:29:08 +00:00
Tony Wickham
8dedf2f6bc Merge "Fix taskbar being empty" into sc-v2-dev am: 0e0e1cef09
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16439570

Change-Id: I35766ede95fe4e73c883f7a187a23ba109ccb811
2021-12-10 22:30:02 +00:00
Tony Wickham
0e0e1cef09 Merge "Fix taskbar being empty" into sc-v2-dev 2021-12-10 22:11:17 +00:00
Tony Wickham
0606773905 Fix taskbar being empty
We set mIconAlignmentForResumedState in endGestureStateOverride(), but then we call applyState() which might aniamte mIAFRS to a different value. To avoid this, set it after applyState() instead.

Specific repro:
1. Open Calculator
2. Go to Overview
3. Dismiss Calculator
  3a. This calls endGestureStateOverride() because the running tile ends
  3b. Previously, we called mIAFRS.updateValue(1) but then applyState() animated it to 0 because we're still in Overview which is an unstashed state. Now the animation to 0 is before setting explicitly to 1.
4. Go home (this sets mIconAlignmentForLauncherState = 1)
5. Open Calculator again. Previously, mIAFRS was already 0 so animating to 0 was ignored. Now, mIAFRS starts at 1 (which is right since launcher is resumed).

Test: see above
Fixes: 210109500
Change-Id: I13f40908f8636291d63ef4b885ac9d08bbf4d393
2021-12-10 18:20:13 +00:00
Alex Chau
abc325df91 Don't snap to focused task in split select am: 9ef8e2dcee
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440098

Change-Id: I7b4df5edd72b9f351629ba216cdf506ea8c8f8f9
2021-12-10 18:07:47 +00:00
Alex Chau
9ef8e2dcee Don't snap to focused task in split select
- In split select there is no overview actions, and focused task's snappign position is not centered, it's weird to snap so avoid it
- Follow-up of ag/16378986

Bug: 208644826
Test: manual
Change-Id: I260b5c6164db562717346396b1830af02d408944
2021-12-10 15:27:17 +00:00
Alex Chau
17a0eec015 Allow snapping to focused task in overview grid am: b6ad9dfaf5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16378986

Change-Id: I811324cbfa99c9ebf8ba070e6d6d03f6aa467732
2021-12-10 15:13:44 +00:00
Alex Chau
b6ad9dfaf5 Allow snapping to focused task in overview grid
Fix: 208644826
Test: manual
Change-Id: Ia6fb2ae44209042f6d40bf8db5d1f43b3b6a27ee
2021-12-10 12:07:21 +00:00
Alex Chau
809cef23a5 Merge "Add split support for 3P launcher" into sc-v2-dev am: 42cbdee25c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16416933

Change-Id: I7fa6dc108941f935a9f1987c23b9c8f2f49dad79
2021-12-10 10:10:55 +00:00
Alex Chau
42cbdee25c Merge "Add split support for 3P launcher" into sc-v2-dev 2021-12-10 09:55:00 +00:00
Hongwei Wang
51786b1084 Merge "Do not start auto-pip transition when swiping from split" into sc-v2-dev am: 293b5bc836
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16418447

Change-Id: I9cf5d3738faf0880a31fdcfbbe3eb9bcd309a06e
2021-12-10 08:45:42 +00:00
Hongwei Wang
293b5bc836 Merge "Do not start auto-pip transition when swiping from split" into sc-v2-dev 2021-12-10 08:25:28 +00:00
Hongwei Wang
8274cb287e Do not start auto-pip transition when swiping from split
Also, pass a PictureInPictureSurfaceTransaction to hide the tasks in
split-screen from Launcher to WM to avoid flicker when any one of the
tasks enters PiP.

Bug: 190855091
Bug: 205894095
Video: http://recall/-/aaaaaabFQoRHlzixHdtY/42RWtayanp2qG0mHSf4Q5
Test: manual, enter PiP from split-screen, see Video
Change-Id: Ia8b6243c0d95c2be8007beeefa2083acc856e404
2021-12-09 20:26:23 -08:00
TreeHugger Robot
1b578f3b71 Merge "Only inset IME by 48dp instead of 60dp when taskbar is present" into sc-v2-dev am: 5692501806
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16433862

Change-Id: Ia9fe894e638bdd4a2743160d16b3e9c5523cfb5a
2021-12-10 00:09:41 +00:00
TreeHugger Robot
5692501806 Merge "Only inset IME by 48dp instead of 60dp when taskbar is present" into sc-v2-dev 2021-12-09 23:48:27 +00:00
Tony Wickham
1a2d581cf0 Only inset IME by 48dp instead of 60dp when taskbar is present
- Update providedInternalImeInsets whenever taskbar height changes, since the insets are subtracted from the taskbar window height. This ensures the IME always has the same bottom inset (48dp) regardless of taskbar's window size
- Also translate nav buttons down to center in the new size when IME is showing

Test: Open IME from home and in apps, both in gesture nav and 3 button mode. Ensure IME bottom inset is always 48dp and nav buttons center within that space
Fixes: 201115344
Change-Id: I5ed25b0ffc08145b2221cc5c960e669cc21b2aa7
2021-12-09 22:17:21 +00:00
Vinit Nayak
2a93bc5b30 Add split support for 3P launcher
* Copied logic mostly from
Base/RecentsViewStateController
* There's one KI crash specific to 3P
(b/209694087)
* Swipe to home animation is TODO, but
then again it also seems incorrect for
full-screen app. 3P has many cosmetic issues
throughout.

Bug: 195607777
Test: Tested w/ Nova launcher with grid
and non-grid, able to invoke split screen with
same animations as 1P launcher

Change-Id: I35a1bc92a51caccac4214289e614000cd47bb503
2021-12-09 12:52:04 -08:00
Jerry Chang
b7218408c5 Merge "Always draw background for task thumbnail" into sc-v2-dev am: 5b2bbe7e20
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16422016

Change-Id: I91c97afe091957faa38b3a0bb237a0bdc2be6c5f
2021-12-09 02:22:51 +00:00
Jerry Chang
5b2bbe7e20 Merge "Always draw background for task thumbnail" into sc-v2-dev 2021-12-09 02:03:42 +00:00
Tony Wickham
b05ad5dcbf Merge changes I6cf84ec7,Iea599651,If3238286 into sc-v2-dev am: b5a051ca0b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16407666

Change-Id: Iffb14ab9d043a5802a92a76b2f388a62423c6625
2021-12-08 17:58:35 +00:00
Alex Chau
48908d7259 Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev am: 1b0e524d94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16419683

Change-Id: Id609eb9f37db4f4bf1b6e42bad3ffb9aa88df9e3
2021-12-08 17:58:24 +00:00
Jerry Chang
7d20de28e3 Always draw background for task thumbnail
Always draw background for task thumbnail because the task snapshot
might be translucent or partially empty.

For example, when drag-to-dismiss split screen, it will reparent tasks
from dismissing split root to the bottom of display. Task thumbnail of
those tasks might be partially empty because the snapshot was taken in
new bounds inherits from display but with split screen content.

Fix: 200096421
Test: drag to dismiss split, observed task thumbnail no longger been
      cropped.
Change-Id: I5d04daa55a558f79ccf5127080088bd0698d06d8
2021-12-09 01:44:46 +08:00
Tony Wickham
b5a051ca0b Merge changes I6cf84ec7,Iea599651,If3238286 into sc-v2-dev
* changes:
  Improve quick switch from home to taskbar
  Cleanup some taskbar/hotseat handoff issues
  Fix taskbar stash misalignment when going from app to overview
2021-12-08 17:42:54 +00:00
Alex Chau
1b0e524d94 Merge "Revert "Align OverviewActionsView for 3 button taskbar"" into sc-v2-dev 2021-12-08 17:39:32 +00:00
TreeHugger Robot
4dcdd70ce2 Merge "Fix split animation for grid RTL" into sc-v2-dev am: d1c9cd2700
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16418133

Change-Id: I98fab9b33140369690a3c893643be02515f0d11f
2021-12-08 12:27:56 +00:00
TreeHugger Robot
d1c9cd2700 Merge "Fix split animation for grid RTL" into sc-v2-dev 2021-12-08 12:06:23 +00:00
Alex Chau
bcf2060c5d Handle split select rotation am: 86ef5e924a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16405843

Change-Id: Ife26f26f92bd2f0a238ea19c9e9958d655e96083
2021-12-08 11:55:07 +00:00
Alex Chau
86ef5e924a Handle split select rotation
- Update floatingTaskView, apply splitsSelectTranslation and splitPrimaryScorllOffest when rotating while in split select
- Moved getSplitSelectTranslation to RecentsView
- When in portrait, treat STAGE_POSITION_BOTTOM_OR_RIGHT as STAGE_POSITION_TOP_OR_LEFT in split translation calculation
- Apply splitsSelectTranslation for portrait grid too

Fix: 201721153
Test: manual
Change-Id: I768a3b15de4d434674058b274c368798f5852917
2021-12-08 11:35:02 +00:00
Alex Chau
9fa58b2fee Revert "Align OverviewActionsView for 3 button taskbar"
This reverts commit 0bd0733ef4.

Reason for revert: b/209025715
Bug: 189807374

Change-Id: I477bacc318e84c16f124cf776ddd8446959755aa
2021-12-08 11:17:14 +00:00
Vinit Nayak
0f12803061 Fix split animation for grid RTL
Fixes: 202156862
Test: Tested grid + non grid,
RTL + LTR

Change-Id: I303f60efdd9f2f2ea412e31e574d9a3b50fecf30
2021-12-07 22:13:06 -08:00
Vinit Nayak
4cc39a0d4c Merge "Align OverviewActionsView for 3 button taskbar" into sc-v2-dev am: 4e0d4239e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16415376

Change-Id: Ic42943df8cdb92f2b6b5582c908d7edef437d303
2021-12-08 04:15:36 +00:00
Vinit Nayak
4e0d4239e4 Merge "Align OverviewActionsView for 3 button taskbar" into sc-v2-dev 2021-12-08 04:02:31 +00:00
Tony Wickham
24675d36b7 Improve quick switch from home to taskbar
- Add LauncherState#isTaskbarAlignedWithHotseat() which defaults to !isTaskbarStashed(), but is always false for quick switch from home
- Replaced FLAG_TRANSITION_STATE_START_STASHED and FLAG_TRANSITION_STATE_COMMITTED_STASHED with FLAG_STATE_TRANSITION_RUNNING and a reference to mLauncherState. STATE_START is equivalent to TRANSITION_RUNNING changing to true, and STATE_COMMITTED is equivalent to TRANSITION_RUNNING changing to false. Then can get details from the state such as whether taskbar is stashed and icon alignment from mLauncherState

Test: quick switch from home, both with taskbar stashed in apps and not
Fixes: 194728611
Bug: 204657916
Change-Id: I6cf84ec73a4036e14cc7268667c6f62100884c27
2021-12-07 13:13:48 -08:00
Vinit Nayak
0bd0733ef4 Align OverviewActionsView for 3 button taskbar
Bug: 189807374
Change-Id: I529dba5d4df3d0c3366c111e70991a36bec4bfc3
2021-12-07 13:07:32 -08:00
Tony Wickham
562ca940e2 Merge "Remove LauncherState.TASKBAR visible element" into sc-v2-dev am: 779879ce3d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16405551

Change-Id: I876064e6ca079acf04ffdf17ee38060e270852a7
2021-12-07 20:56:27 +00:00
Tony Wickham
779879ce3d Merge "Remove LauncherState.TASKBAR visible element" into sc-v2-dev 2021-12-07 20:42:55 +00:00
Alex Chau
992db75dae Use percentage scaling for overview thumbnail size
- Limit overview to screen ratio to be at max 70%
- Tuned row spacing and page spacing
- Added 2 more test activities to testOverviewForTablet to avoid dismissing tasks at end of grid, as more grid tasks are now shown

Bug: 207350366
Test: manual
Change-Id: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
Merged-In: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
2021-12-07 14:50:40 +00:00
Alex Chau
4f7952ead4 Use percentage scaling for overview thumbnail size
- Limit overview to screen ratio to be at max 70%
- Tuned row spacing and page spacing
- Added 2 more test activities to testOverviewForTablet to avoid dismissing tasks at end of grid, as more grid tasks are now shown

Bug: 207350366
Test: manual
Change-Id: Id04871464bdb3ef2d6b046977b0ffd9bd51bc230
2021-12-07 11:00:48 +00:00
Tony Wickham
9566290e13 Cleanup some taskbar/hotseat handoff issues
- Clearly distinguish Home <-> App icon alignment (ForResumedState and ForGestureState) from Home <-> Home states (ForLauncherState) by renaming onIconAlignmentRatioChanged() to onIconAlignmentRatioChangedForAppAndHomeTransition (for the former)
- Make sure initial state is properly applied by treating all flags as changed
- onIconAlignmentRatioChangedForStateTransition only runs when launcher is resumed (fixes 208648294)
- Animate taskbar background alpha when going between home and app, separate from icon alignment (bug: 204657916)
- Only copy hotseat's alpha to taskbar when hotseat is originally visible (also bug: 204657916)

Test: Open an app on small screen, open large screen and ensure taskbar stays at the bottom instead of aligning with non-present hotseat (bug: 208648294)
Test: Swipe up and down on home scren, ensure taskbar background never appears and there's no jump between taskbar and hotseat
Change-Id: Iea59965118f2bdbd8ce49279f76fb01fbd61f60b
2021-12-06 17:16:19 -08:00
Tony Wickham
7af54403a3 Remove LauncherState.TASKBAR visible element
It's no longer used, so removing to cleanup code and reduce confusion

Test: no functional change
Fixes: 209512651
Change-Id: Ibd671bde7190df976b5365331731a55a9abdbb35
2021-12-06 15:59:39 -08:00
Tony Wickham
f1951ce1f7 Fix taskbar stash misalignment when going from app to overview
Keep taskbar unaligned with hotseat if we're stashing anyway

Test: Swipe up from app with taskbar present to overview, check frame by frame to ensure icons morph directly into the handle instead of above it
Fixes: 208697792
Change-Id: If3238286b3383e75eb71fbd3b97d34bb3b44340b
2021-12-06 15:15:34 -08:00
Tony Wickham
a19a64e97f Merge "Fix taskbar jumping when going home" into sc-v2-dev am: 3d206ca917
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16374170

Change-Id: I8ad15ee9afd48aeb05ae1e4e89503d0e683ca5a6
2021-12-06 20:36:58 +00:00
Tony Wickham
3d206ca917 Merge "Fix taskbar jumping when going home" into sc-v2-dev 2021-12-06 20:15:20 +00:00
Jon Miranda
faedc9004c Merge "Play return to icon animation if user swipes back to All Apps." into sc-v2-dev am: 52ee4ec4aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16194658

Change-Id: If13ed6d01cd440182338c18f8317f691b9d7d33e
2021-12-06 18:38:32 +00:00
Jon Miranda
52ee4ec4aa Merge "Play return to icon animation if user swipes back to All Apps." into sc-v2-dev 2021-12-06 18:17:52 +00:00