Commit Graph

38810 Commits

Author SHA1 Message Date
TreeHugger Robot 67daf300e2 Merge "Set default value for rank field in launcher logs to ItemInfo.rank." into sc-v2-dev am: ed6cbbc9a6
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16360368

Change-Id: Ic15c841f299bd8d14d3c7c4352ad9d76fdecaa04
2021-12-13 19:07:36 +00:00
TreeHugger Robot ed6cbbc9a6 Merge "Set default value for rank field in launcher logs to ItemInfo.rank." into sc-v2-dev 2021-12-13 18:48:09 +00:00
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
TreeHugger Robot 7f4adf679e Merge "Allow restore across form factors" into sc-v2-dev am: 5599b02141
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16440220

Change-Id: I46024c6edf3539fa495ed491c679d1cdce8b5dd0
2021-12-11 00:36:04 +00:00
TreeHugger Robot 5599b02141 Merge "Allow restore across form factors" into sc-v2-dev 2021-12-11 00:11:56 +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
Jon Miranda 2539cd207e Merge "Display in-memory icon for app close while AdaptiveIcon loads." into sc-v2-dev am: b788f9f7f7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16441110

Change-Id: I21e8ad9e5df8dacba63601911f08782d8c935b0d
2021-12-10 23:38:56 +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
Jon Miranda b788f9f7f7 Merge "Display in-memory icon for app close while AdaptiveIcon loads." into sc-v2-dev 2021-12-10 23:20:42 +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
Alex Chau ab26c62c4a Allow restore across form factors
- Removed deviceTypeCompatible check and allow restore across for mfactors
- In AOSP default device_profile, mark 3x3, 4x4, and 5x5 as phone only. On tablets they'll reflow to 6x5.

Bug: 198575341
Bug: 210129187
Test: Only 3x3, 4x4 and 5x5 are enabled on phone
Test: Only 6x5 is enabled on tablet
Test: Phone backup of 4x4 get restored and reflow to 6x5 on tablet
Change-Id: I36a641d47fcee86ace0fea3d9194d61d12517f13
2021-12-10 22:00:49 +00:00
Jon Miranda 0c2f0faef1 Display in-memory icon for app close while AdaptiveIcon loads.
- We already display the BubbleTextView icon during app close
  since we need the shadows to ensure a clean handoff.
- Previously, we waited until the icon and the AdaptiveIcon were
  both loaded to show the FloatingIconView.
- This change immediately shows the BubbleTextView icon so that
  we can have something displayed in the cases where AdaptiveIcon
  is slow to load (ie. immediately after killing/restarting launcher).

Currently there are cases where we defer some BubbleTextView drawing to
ClipIconView. We can refactor in master so that ClipIconView is only used
when drawable is an AdaptiveIcon.

Bug: 207389002
Test: manual
Change-Id: Ie54642fef4258862a155ab0aba6e49cea9c9ead0
2021-12-10 13:25:39 -08:00
Jon Miranda 48d82e2c19 Merge "Clear all DragView in onSaveInstanceState" into sc-v2-dev am: 7ac2a71b94
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16425110

Change-Id: I60f6a9e8ae87bb011f9e7f4a7b11748415f044c1
2021-12-10 18:48:18 +00:00
Jon Miranda 7ac2a71b94 Merge "Clear all DragView in onSaveInstanceState" into sc-v2-dev 2021-12-10 18:36:15 +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 b944b46eeb Merge "Improving memory dump diag" into sc-v2-dev am: eea4379a5d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16434161

Change-Id: If3a45237f8a766eb6b812392e0aa979862a87a5e
2021-12-10 10:10:38 +00:00
Alex Chau 42cbdee25c Merge "Add split support for 3P launcher" into sc-v2-dev 2021-12-10 09:55:00 +00:00
Alex Chau eea4379a5d Merge "Improving memory dump diag" into sc-v2-dev 2021-12-10 09:52:53 +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
vadimt bc1da4ca98 Improving memory dump diag
atest deletes artifacts directory on the device, but saves artifacts at the host machine.

Bug: 187761685
Test: presubmit
Change-Id: I1f5244ebfe6b606c4891f5fca003541b27cc944c
2021-12-09 21:58:45 +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
Jon Miranda 14d6771aae Clear all DragView in onSaveInstanceState
Multiple users reports view getting stuck on screen. This CL
clears all DragView when user leaves launcher.

Root cause still undetermined, but happens enough that it warrants
a temp fix.

Bug: 162636845
Test: manual
Change-Id: I532b5274a1308c53f67c23c5c8ca07f2b7f9802c
2021-12-08 17:47:33 -08:00
TreeHugger Robot 287d976c91 Merge "Add launcher grid spec for tablet" into sc-v2-dev am: b1ae1ca124
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/16371727

Change-Id: Id456a1dfa7e7f3578aa80cc281eb6680575c4cef
2021-12-08 23:14:44 +00:00
TreeHugger Robot b1ae1ca124 Merge "Add launcher grid spec for tablet" into sc-v2-dev 2021-12-08 22:49:00 +00:00
Alex Chau 1c883d861e Add launcher grid spec for tablet
- Introduced device_category to allow grids to be only enabled for certain device types. By default grids are enabled for all device types, so old OEM device_profiles aren't affected
  - Removed device_profiles_split.xml as a result and merged with device_profiles.xml
- Added deviceType in InvariantDeviceProfile to replace isSplitDisplay and centralize the logic
- Only has 6x5 grid with new default layout that works better for tablets

Bug: 198575341
Test: manual
Change-Id: I03f6727ce837ffeee6321b6d7c53942338d0cf30
2021-12-08 18:22:34 +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