Commit Graph
27 Commits
Author SHA1 Message Date
Jeremy Sim 9109e43f02 Allow app pairs in folders
This CL substantially refactors folders to be able to take contents of type AppPairInfo. App pairs can now be moved in and out of folders, and launch from folders.

This CL contains only logic and model changes; animation and style changes (for dropping items into folders, color changes to app pair surfaces, etc.) will be in a following CL. Another CL (hopefully) will contain tests. I'm planning to submit them together, but this patch should also be able to stand alone with no issues (except janky transitions).

Bug: 315731527
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual, more to follow in another CL.
Change-Id: I73732fcaefbdc61bf6e02a5be365962b8bbc3e41
(cherry picked from commit a596f589c4)
Merged-In: I73732fcaefbdc61bf6e02a5be365962b8bbc3e41
2024-04-11 03:51:53 +00:00
Jeremy Sim 00bf2488d1 Reparent folders and app pairs
Previously, app pairs and folders shared a common data model, FolderInfo. Now we need to separate them, so a new type, CollectionInfo, will serve as the parent of both types.

Bug: 315731527
Fixes: 326664798
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual, unit tests to follow
Change-Id: Ia8c429cf6e6a376f2554ae1866549ef0bcab2a22
Merged-In: Ia8c429cf6e6a376f2554ae1866549ef0bcab2a22
2024-04-10 18:44:12 +00:00
Sunny Goyal df71298af6 Using fractions in MultiValueUpdateListener instead of absolute durations
This ensures that any global animation scale applies properly

Bug: 327645429
Flag: NONE
Test: Manual
Change-Id: I12205429dca5a87208fa9964b3307fb718af4fd0
(cherry picked from commit f584b32811)
2024-03-11 22:06:41 +00:00
Vinit Nayak 9c29c1e1c4 Update animation timing for split dismiss animation
* We weren't specifying an animation duration for the
dismiss placeholder animation, and it wasn't inheriting
from the animatorSet since that didn't have any duration
set on it.
* Now we explicitly set a duration (usually matching that of
the current launcher state config) to the timings line up
well

Test: Repro steps don't show bug. Also tested on large screen dismissing
contextual split from overview and home, seems fine
Fixes: 314860754

Change-Id: I701e4f88c1ddd92561da4fb76715a859f587c91e
2024-02-27 12:10:44 -08:00
Sam Cackett becd601c68 Merge "Translate IconMenu to top / left of thumbnail view" into main 2024-02-22 08:59:42 +00:00
Vinit Nayak 2b031727f0 Merge "Log split metrics through individual sessions" into main 2024-02-21 00:20:44 +00:00
samcackett 6eaa509481 Translate IconMenu to top / left of thumbnail view
When splitting a task that is already part of a split app pair from the
 TaskBar, with the enableOverviewIconMenu feature enabled, position the
 IconMenu to the left of a leftRightSplitApp pair, or the top of a
 topBottomSplitApp pair

Fixes: 317001670
Test: Manual
Flag: ACONFIG com.android.launcher3.enable_overview_icon_menu TEAMFOOD
Flag: ACONFIG com.android.launcher3.enable_grid_only_overview TEAMFOOD
Change-Id: I4740d7c96635ee9542f7061938baf6fbf2ca01d4
2024-02-20 16:05:10 +00:00
Vinit Nayak 5a9d4af170 Log split metrics through individual sessions
* Now we log the original source of the first selected app
as soon as the user selects it (previously we only did when user
selected second app)
* We log the item info for the second app to determine second
surface.
* Added new metrics to log after user has started a split session
and ended a split session
* We log different cancellation reasons (cancel button,
home gesture, general other app interruptions, etc).
* One KI/Bug: When the second app is selected via taskbar in
overview, the container will say hotseat because we are using
Launcher's logger and not Taskbar's. Taskbar's logger manually
overwrites the container in TaskbarActivityContext, we may be
able to make something hacky that can allow us to overwrite, but
that'll have to be a separate change

Bug: 322551862
Test: Logged metrics manually with event and itemInfo
Change-Id: I177623fd00ce62acf2d4ee983b58561d8c946d59
2024-02-13 17:55:08 -08:00
Jeremy Sim cf9132e07c Fix app pairs launch from in-app Taskbar
This CL adds a handler function in SplitAnimationController that manages the complicated logic flow for launching an app pair when already inside of an app.

To give an idea of the complicated logic:
If the user tapped on an app pair while already in an app pair, there are 4 general cases:
  a) Clicked app pair A|B, but both apps are already running on screen
  b) App A is already on-screen, but App B isn't
  c) App B is on-screen, but App A isn't
  d) Neither is on-screen

If the user tapped an app pair while inside a single app, there are 3 cases:
   a) The on-screen app is App A of the app pair
   b) The on-screen app is App B of the app pair
   c) It is neither

For each case, we call a different animation and launch the app pair in a different way.

When merged, this patch will fix all animation glitches that are currently happening in these situations, and get us 90% of the way to having the ideal animation in all cases. There are still a few complicated cases that need a polished animation (like when you launch app pairs with custom ratios), which will be implemented in a following patch soon (I thought this CL was big enough already as is).

Bug: 316485863
Fixes: 315190686
Test: Manual testing of all the different launch combinations
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TEAMFOOD
Change-Id: I5c0e03512bb706360c575d833cac6ed02a5de936
2024-02-09 13:41:29 +08:00
Jeremy Sim c2b598434c Use fade-in launcher for app pair launches from in-app taskbar
This CL temporarily patches a crash in this situation:

Inside of an app > Launch an unrelated app pair from Taskbar > Crash

The crash occurs because TaskbarActivityContext can't create a launcher animation (because Launcher isn't running). A different launch animation is needed for this case (similar to single apps), but for now, falling back to the fade-in launch at least allows the user to proceed without a crash.

Bug: 316485863
Test: Enter an app, launch an unrelated app pair, no crash
Flag: ACONFIG com.android.wm.shell.enable_app_pairs DEVELOPMENT
Change-Id: I72b2956b5b44616367e24263f2287824ee1e8212
2023-12-19 11:27:04 +09:00
Jeremy Sim 9330619ee0 Fixes crash when launching app pairs with intent+intent
This CL adds a new case for app pair launches. When we launch app pairs with intents, we receive initialTaskId and secondTaskId as -1, which was previously unhandled and caused a crash. With this change, we find the left/top app leash a different way, by looking for windowingMode=WINDOWING_MODE_MULTI_WINDOW and endAbsBounds.left/top == 0.

Fixes: 316050315
Test: Clear all running tasks from Overview, launch app pair, no longer crashes
Flag: ACONFIG com.android.wm.shell.enable_app_pairs DEVELOPMENT
Change-Id: Ic356d71ad267f079242213ebc59322bf1fb86b7c
2023-12-15 17:17:24 +09:00
Jeremy Sim 23fcbf2f73 App Pairs: Launch animation
[App Pairs 7/?]

This patch implements the app pair launch animation from icon. Adds a new function, composeFadeInSplitLaunchAnimator(), in SplitAnimationController, that builds the combined launcher + shell animation.

Bug: 309618233
Flag: ACONFIG com.android.wm.shell.enable_app_pairs DEVELOPMENT
Test: Manual
Change-Id: I8e95f629ae2a71f1bd6cbb356f5e33233e5c2906
2023-12-11 13:09:06 +09:00
Vinit Nayak 717c4f51ff Merge "Remove unused animation of splitInstructionsView text" into main 2023-12-01 20:00:27 +00:00
Winson Chung abb4483f6f Merge "Add Launcher support for left-right splits on portrait foldables" into main 2023-11-30 05:52:57 +00:00
Winson Chung 104a4c8b69 Add Launcher support for left-right splits on portrait foldables
Bug: 291018646
Test: Manual
Flag: enable_left_right_split_in_portrait

Change-Id: I92af7ffd83770f7e942c3892a12b1611ff5b50f4
Signed-off-by: Winson Chung <winsonc@google.com>
2023-11-29 20:20:14 +00:00
Vinit Nayak e5277ab8e7 Remove unused animation of splitInstructionsView text
* The animation of the overall view is
sufficient and we don't need this separate one

Flag: None
Bug: 295983387
Test: Visually appears the same
Change-Id: I6e3fe7191df8af869a50abab820d30e95e23696c
2023-11-28 14:39:18 -08:00
Vinit Nayak d6efde5cbb Change SplitInstructionsView cancel from X to "Cancel"
* Styling (accent color) is still a TODO,
just made it bold for now.

Flag: ACONFIG com.android.wm.shell.enable_split_contextual DEVELOPMENT
Bug: 295983387
Test: Tested w/ flag on and off, cancel doesn't show
with flag off

Change-Id: Id5214a86abbe0cf095e32f6f75522ea51d6b1f3c
2023-11-28 14:34:12 -08:00
Vinit Nayak a1be4c1123 Use aconfig flag enable_split_contextual
Bug: 276361926
Test: Basic split contextual operations work
as expected

Change-Id: I7202654f8452a0c57e5e728c9baaadf85fa22a96
2023-10-25 01:37:17 +00:00
Vinit Nayak ae3c5749ef Support fullscreen split selection launch for contextual
* Migrate animating split placeholder to fullscreen into
SplitAnimationController from RecentsView to consolidate
* Reset state from RecentsView via a callback

Fixes: 295457117
Test: Tapping on placeholder in overview and home works
as expected

Change-Id: Id9a74eddc134a0470110845b90729c05193a1f93
2023-10-04 16:05:03 -07:00
Pat Manning 1695cc724c Create icon app chip menu for overview tasks.
Fix: 257951354
Test: TaplTestsQuickstep
Test: TaplTestsSplitscreen
Flag: ENABLE_OVERVIEW_ICON_MENU
Change-Id: Id8a14b1970ae42bcc74e95419caeaf52ef63638b
2023-10-02 12:51:56 +00:00
Vinit Nayak 257bb9641e Move splitInstructionsView reference out of RecentsView
* Consolidate it to be same object as workspace
SplitInstructionsView

Bug: 276361926
Test: Created split from home and overview, disapears
on exit or success as expected

Change-Id: I837a7c37fb4d1a39c13fe0d66b2e3ecefedef2df
2023-08-07 15:29:50 -07:00
Vinit Nayak a1d0d8269c Remove split instructions view on split launch success
* We weren't removing the instance of the view
that is created when split initiated from workspace
* Fewer bugs like this once RecentsView + workspace
instructions view are consolidated

Bug: 292590703
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Test: Swiping to home after split apps launch
hides the view

Change-Id: I6b5037c024e6e0c456b687bc802076f691a955b2
2023-07-27 14:11:27 -07:00
Vinit Nayak 5f09091583 Show split select instructions toast when starting split on workspace
* Used same animation properties that RecentsView uses to
show the instructions view unfolding
* TODOs:
  * UI polish (correct asset, animation timings, etc)
  * Hook into existing animations (if possible)
  * Migrate recentsView splitInstructionsView to use same/similar code path;
    remove RecentsView#safeRemoveDragLayerView

Bug: 276361926
Test: Create split w/ and w/o flag, works as expected
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE
Change-Id: I7a51b71c358902399ad73b650287cdbf1dad07c6
2023-07-14 17:49:42 -07:00
Vinit Nayak f6c2e87747 Dismiss split select when tapping on home button
Bug: 276361926
Test: Initate split, dismiss whenever home is pressed,
doesn't dismiss when all apps dragged down
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE

Change-Id: Idc95123e27963c3913d04c6eb27f0e4c9b1eb401
2023-07-10 11:06:42 -07:00
Vinit Nayak 5e2a2564e8 Reset split selection state when swiping to home
Bug: 276361926
Fixes: 238651489
Flag: ENABLE_SPLIT_FROM_WORKSPACE_TO_WORKSPACE

Change-Id: Ic1439561f37b50ebf9dfb99edbeece21520798b1
2023-07-06 15:08:05 -07:00
Vinit Nayak ecca8eacbc Default to using SplitSelectSource drawable if TaskView icon drawable is null
* Alternative solution could be to set
onTaskViewVisibilityChanged(true) for the taskView that is about
to be dismissed so it loads it's taskIcon/thumbnail back from the cache
* However, that does still leave us open to race conditions (even though
we can be reasonably confident the icon is probably in the cache)
* Also made other changes to allow already public fields on some classes
to be mockable for unit testing

Fixes: 275267738
Test: Tested with fullscreen task at end of overview,
GroupedTaskView at end of overview,
Initiating split from home,
Initiating split from overview actions,
Initiating split from overview app icon

Change-Id: Ic9059c93c07b90f61c9f418d5d36d6ba201ff96a
2023-03-30 15:26:57 -07:00
Vinit Nayak aa7bf8b394 Add initial split from GroupedTaskView animation
* Created SplitAnimationController to prevent more
RecentsView bloat
* Extract SplitSelectSource attributes into separate class
* http://recall/-/cMb5xTTxhmZtFt04eYnmQj/eACJq1un8Ef91LgmQblpAw

Bug: 267370106
Change-Id: I5d430c091ac84bbbc30319e7b78711b610a21252
2023-03-08 15:17:57 -08:00