Commit Graph

10954 Commits

Author SHA1 Message Date
Lynn Yeh
4a01d58d9a Merge "Update KQS task view layouts to new specs" into 24D1-dev 2024-04-17 08:20:55 +00:00
Saumya Prakash
ca987a3dff Merge "Fix incorrect fragment in gesture tutorial when rotating the screen" into 24D1-dev 2024-04-15 21:22:26 +00:00
Lynn Yeh
f99f04608b Merge "Close the KQS view when touching the gesture nav region" into 24D1-dev 2024-04-15 14:36:52 +00:00
David Lin
cb37425710 Merge "Do not report finish in mergeAnimation..." into 24D1-dev 2024-04-15 10:08:18 +00:00
Treehugger Robot
028e1fcd9d Merge "Launch AppPair live tile when not visible" into 24D1-dev 2024-04-12 03:59:27 +00:00
Treehugger Robot
8119d72903 Merge "Add placeholder divider view when starting split tasks" into 24D1-dev 2024-04-12 03:48:46 +00:00
Vinit Nayak
95a7ca485e Launch AppPair live tile when not visible
* End the recents animation and then relaunch as if
from scratch
* We explicitly ignore the anim for end of recents animation
since that will cause the taskbar to quickly show and stash
again, and we know in this case that we'll quickly be launching
right back into an app

Test: Tested w/ live tile + non live,
fullscreen + app pairs
Bug: 316485863

Change-Id: I6ae8cccc01401935bf96fba8a154216e6b1ad701
(cherry picked from commit 637274ebc9)
Merged-In: I6ae8cccc01401935bf96fba8a154216e6b1ad701
2024-04-12 03:41:20 +00:00
Vinit Nayak
32700f81ec Add placeholder divider view when starting split tasks
* This prevents launcher underneath from peaking through
while the split apps are loading

Bug: 299640096
Test: Launched from recents, home and all apps
Doesn't seem to affect small screen since recents scrolls
away and the scrim is only left

Change-Id: I32e394a0bc361489473ee657161c8f3bcbf1e422
(cherry picked from commit cdaabc6199)
Merged-In: I32e394a0bc361489473ee657161c8f3bcbf1e422
2024-04-12 03:24:46 +00:00
Saumya Prakash
f44e8e5feb Merge "Adjust where the back button is rendered for new SUW requirements." into 24D1-dev 2024-04-12 00:22:02 +00:00
Jeremy Sim
1ece740e7a Prevent menu items from showing on split tasks
This CL changes the TaskShortcutFactory for SCREENSHOT and MODAL so that the associated menu options ("Screenshot" and "Select") don't show up on split tasks. These actions are not fully supported on splitscreen tiles (they will only work on one of the two apps), so we disable them.

Bug: 327434215
Flag: N/A
Test: Manual
Change-Id: I121a9c28fa7570f10e13be2de6489182e3362cfc
(cherry picked from commit 6a60c3b113)
Merged-In: I121a9c28fa7570f10e13be2de6489182e3362cfc
2024-04-11 23:41:42 +00:00
Jeremy Sim
ee1fdb4abc Fix bug where app pair title was not updating with language
This CL adds the ability for an app pair icon to update its title string when package changes are detected. It also reorganizes some code in the app pairs classes for readability.

Fixes: 316051810
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual
Change-Id: I833e4f9766b7da8c0a3a5fb4b9fc050d8897437e
(cherry picked from commit 24284467b5)
Merged-In: I833e4f9766b7da8c0a3a5fb4b9fc050d8897437e
2024-04-11 23:38:41 +00:00
Saumya Prakash
92b20d89a6 Fix incorrect fragment in gesture tutorial when rotating the screen
This change makes the current fragment load on configuration changes for
the gesture navigation tutorial. Previously, the old fragment would be recreated causing inconsistencies when rotating the screen. Not marking a flag as this change is for both the previous gesture tutorial and the current one.

Fix: 317162126
Test: Run the tutorial and rotate the screen after each step. The
tutorial should progress like normal.
Flag: N/A

Change-Id: I09c40006dd0ef6e9e78fa44e36962a678918420a
(cherry picked from commit c028cc7699)
2024-04-11 22:04:32 +00:00
Saumya Prakash
afc6cfcd3b Adjust where the back button is rendered for new SUW requirements.
Large screen devices in landscape mode and devices that have mostly a
square aspect ratio are undergoing a redesign in Setup wizard that makes
most screens two-pane. As part of this redesign, the back button is
aligned in this change. This change doesn't use a flag because the Setup
Wizard change is not flagged.

Fixes: 323778778
Fixes: 328017929
Test: Run Setup Wizard and see if the back button aligns with the Skip
button in two pane screens.
Flag: N/A

Change-Id: I22680f40c0ddf7cd03ab1da69406eb14184b0174
Merged-In: I22680f40c0ddf7cd03ab1da69406eb14184b0174
2024-04-11 21:25:49 +00:00
Vinit Nayak
559aeb2c45 Merge "Allow app pairs in folders" into 24D1-dev 2024-04-11 20:55:33 +00:00
Andreas Agvard
98e57de7a8 Merge "Removes recovery" into 24D1-dev 2024-04-11 19:37:47 +00:00
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
Vinit Nayak
674aa03862 Add CUJ Jank interactions for App Pair saving and launching
* Added finishCallback consumer to LauncherAccessibilityDelegate
to inform when adding an item to workspace was completed.
* The logic seemed to be dependent on the parameter
"focusForAccessibility", but all callers of that are currently
passing in true

Bug: 328646540
Test: https://paste.googleplex.com/6232597136408576
Newly added CUJs showing up when playing w/ device

Change-Id: Ia4944f8d23634bb92296938ea2d07a6babf6f77c
Merged-In: Ia4944f8d23634bb92296938ea2d07a6babf6f77c
2024-04-09 00:17:21 +00:00
Treehugger Robot
dcb860a22a Merge "Explicitly set animation and timings for split cancel button" into 24D1-dev 2024-04-06 07:30:28 +00:00
Tony Wickham
3205876bf5 Apply insets to top-level providers, not just paramsForRotation
Bug: 329012507
Flag: none
Test: trigger assistant, ensure bottom insets are removed in
gesture nav mode; also verify IME inset override correctly
applies in 3 button mode

Change-Id: I823d0d360a7e3b41cc291f6949d9371e0dc32efb
2024-04-05 19:46:11 +00:00
Tony Wickham
fa696568e5 Unstash taskbar due to IME immediately when system gesture starts
This is reversing a previous change from a few years ago
(ag/16325264) because we now clip the recent apps on the bottom
during gesture nav, whereas before we left them unclipped until
you swiped up.

Flag: none
Fixes: 305977350
Test: verified visuals manually in persistent, transient, and 3
button nav; also tested interactions with All Apps

Change-Id: Ib3823a9bd9aebf923ad481c010c7e8544bcb6a4d
(cherry picked from commit a6b29968a4)
2024-04-05 15:50:15 +00:00
Andreas Agvard
c43b7163a2 Removes recovery
Flag: NONE
Bug: 326143814
Test: Unit
Change-Id: Icbebeade552cb101eb4b8bae4965b4d6c972f22e
Merged-In: Icbebeade552cb101eb4b8bae4965b4d6c972f22e
2024-04-05 06:10:04 +00:00
Vinit Nayak
74a3314172 Explicitly set animation and timings for split cancel button
* Mismatched animation durations were causing recents task
thumbnails to flash in at the end.
* Following a similar pattern started at ag/26378432, except
here we manually call all the steps to create launcherState
animation

Fixes: 321863575
Test: Repro steps from bug no longer occur.
Tested on phone and large screen, workspace, overview and all apps

Change-Id: I02696c0470bf4cfe6a278f0a2bc0786367a9fe37
(cherry picked from commit aeb9595b37)
2024-04-05 00:07:26 +00:00
Treehugger Robot
df537d249b Merge "Reland "Update Split button visibility based on DeviceProfile change"" into 24D1-dev 2024-04-04 14:18:38 +00:00
Pat Manning
05bb8f39e9 Merge "Set next page immediately on subsequent arrow/tab presses when navigating overivew." into 24D1-dev 2024-04-04 13:38:53 +00:00
Alex Chau
ddb12d7a0c Reland "Update Split button visibility based on DeviceProfile change"
This reverts commit 38bc885de9.

- Always request layout of action_buttons after changing visibility of its children
- Update Split button visibility based on DeviceProfile change in updateDimension() only
- Update Split button visibility based on 3P launcher in initialization only
- Also simplified action_buttons to wrap_content and layout in middle of parent
- Also removed the space between buttons and use marginStart
- Fixed TAPL to not expect save app pair button on phone. Before this CL actions_buttons are still on view hierarchy despite they're not visible on screen.

Fix: 321291049
Fix: 329255757
Test: Clear all tasks, fold, launch app, swipe up to Overivew; repeat in RTL
Test: OverviewImageTest
Flag: None
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7d0edb46ac0a09aa0c801598b46cd338d04886a9)
Merged-In: I9ecf872279f6f07d2d9bc33fb09031568023cb77
Change-Id: I9ecf872279f6f07d2d9bc33fb09031568023cb77
2024-04-04 12:19:44 +00:00
Vinit Nayak
c9ab1dcd98 Merge "Refactor how app pair icons draw" into 24D1-dev 2024-04-03 04:12:43 +00:00
Jeremy Sim
fcbef122e6 Refactor how app pair icons draw
This changes (and cleans up) the way app pair icons are composed. Previously, the background and 2 icons were drawn individually and separately onto the canvas. Now, they are composed into a combined drawable first. This also allows the full icon drawable to be requested by external functions (which will be needed for display app pairs in folder previews).

Bug: 315731527
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Visually confirmed that app pairs loooks the same in all scenarios: rotation, disabled, themed, taskbar, pinned taskbar. Screenshot test to follow.
Change-Id: I7242e0c525ef578a54a06fb9137fcfc42c6f0e86
(cherry picked from commit b37faec287)
Merged-In: I7242e0c525ef578a54a06fb9137fcfc42c6f0e86
2024-04-02 23:38:47 +00:00
Jeremy Sim
370d05a276 Merge "Update save app pair icon" into 24D1-dev 2024-03-30 03:36:21 +00:00
Alex Chau
2165ad7b0e Revert "Log split button visibility to debug spacing issue"
This reverts commit 2d55c9c679.

Reason for revert: Logs not helpful in figuring out the issue and is too spammy
Bug: 321291049
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:a5d55fe5efad4db1678dfe7960f82df68b664b7d)
Merged-In: I88a4350277ea3e965493da6386cf4c83c5c564e4
Change-Id: I88a4350277ea3e965493da6386cf4c83c5c564e4
2024-03-28 12:13:30 +00:00
Schneider Victor-tulias
5a85b4f2df Close the KQS view when touching the gesture nav region
Also, stop handling KQS open/close during gestures

Flag: LEGACY ENABLE_KEYBOARD_QUICK_SWITCH ENABLED
Fixes: 328689890
Fixes: 328689534
Fixes: 328692760
Test: attempted gestures while KQS is shown. attempted KQS while attempting gestures
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:14d912b062e69fe8bc4729b6f8b40e53d5b4a669)
Merged-In: Idbd1f9cef09d9fbf611350d0847d94ccf8300369
Change-Id: Idbd1f9cef09d9fbf611350d0847d94ccf8300369
24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.
2024-03-28 07:27:09 +00:00
wilsonshih
cc39a10dd0 Do not report finish in mergeAnimation...
...if the handler don't know how to process the transition.
So the Transitions can pass that transition to next handler.

Flag: NONE
Bug: 328619216
Test: manual, use alt+tab to relaunch a task where it's activity
is destroyed.
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:7130116894eb7f756a16da6b5ff0e754a356d50d)
Merged-In: Idf3f78103a56e91806ec2f6e364c6e8e7f4e205c
Change-Id: Idf3f78103a56e91806ec2f6e364c6e8e7f4e205c
24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.
2024-03-28 07:21:57 +00:00
Schneider Victor-tulias
3d001dee6b Update KQS task view layouts to new specs
The small size of the screenshots and make text look odd. Implementing new UI specs to improve this.

- Updated icon position and size
- Added some blur to the thumbnail

Flag: LEGACY ENABLE_KEYBOARD_QUICK_SWITCH ENABLED
Fixes: 328259439
Fixes: 328692456
Test: opened KQS in dark and light mode
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:dba7cbae1adfde615060598a55b5ee0edfedef9f)
Merged-In: I2b20100ddeb562291edf5f0bacbce916002eee45
Change-Id: I2b20100ddeb562291edf5f0bacbce916002eee45
24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.
2024-03-28 06:56:20 +00:00
Jeremy Sim
de9b132f08 Update save app pair icon
This CL changes the save app pair menu icon to the latest spec. It looks good!

Fixes: 331525186
Flag: N/A
Test: Manual
Change-Id: Ic73f78a27372aca565fce2e3be3e9f3b8ef1d942
(cherry picked from commit 1d48159bd5)
2024-03-28 04:44:18 +00:00
Andy Wickham
d6b0dc8970 Merge "Consolidate settings for Assist." into 24D1-dev 2024-03-27 23:56:23 +00:00
Brandon Dayauon
50f9dbd0a5 Disable two line text legacy flag.
Will now repurpose the twolinetoggle flag to be the flag that will
make twoline text enabled/disabled.

bug: 316027081
Test: presubmit
manually: https://screenshot.googleplex.com/BsZGCm7DrTZLwG4
Flag: com.android.launcher3.enable_twoline_toggle Staging
Merged-In: Idef427bad6551ae56b13e35393e076b8e000af5a
Change-Id: Idef427bad6551ae56b13e35393e076b8e000af5a
2024-03-27 17:07:04 +00:00
Liana Kazanova
036a83cd99 Revert "Support toggling Taskbar All Apps with 3P Launcher."
This reverts commit 176f186a6d.

Reason for revert: DroidMonitor: Potential culprit for http://b/331438065 - verifying through ABTD before revert submission. This is part of the standard investigation process, and does not mean your CL will be reverted.

Change-Id: Ie375277ad2f65199749f0211ab50037d4b37e664
Merged-In: Ie375277ad2f65199749f0211ab50037d4b37e664
2024-03-26 20:34:09 +00:00
Brian Isganitis
176f186a6d Support toggling Taskbar All Apps with 3P Launcher.
Taskbar All Apps exists regardless of the default launcher. Thus, we can
toggle it on large screen devices. This CL ties registering the system
action to default launcher and taskbar's enablement.

Test: adb shell input keyevent 117
Test: AllAppsActionManagerTest
Flag: LEGACY ENABLE_ALL_APPS_SEARCH_IN_TASKBAR ENABLED
Fix: 317259709
Change-Id: I26f0ed9e921beac762f3f9e6aaceb1002ad4801a
(cherry picked from commit c113b277e6)
2024-03-26 01:16:39 +00:00
Tiger Huang
ee28d64d27 Merge "Let taskbar can trigger insets resize animation" into 24D1-dev 2024-03-22 18:39:16 +00:00
Lynn Yeh
5bdca26a12 Merge "When mLastComputedTaskSize is empty we will recalculate and set it before determining scale and pivot" into 24D1-dev 2024-03-22 08:53:29 +00:00
Tiger
3a9c464eb3 Let taskbar can trigger insets resize animation
All the system bar can trigger insets resize animation before, but some
sources might not have the resize animation. The framework now will only
trigger insets resize animation for sources which apply
FLAG_ANIMATE_RESIZING. So this CL applies the flag for gesture taskbar
because it can toggle its size via "Always show Taskbar"

Bug: 291562764
Flag: NA
Test: Fold and unfold a foldable device and ensure that won't create
      InsetsResizeAnimationRunner.
Merged-In: I0d915422d160a81f12c3992ffe53200fd957f6d7
Change-Id: I0d915422d160a81f12c3992ffe53200fd957f6d7
2024-03-22 07:36:34 +00:00
Tony Wickham
50d2fad5f2 Merge "Cancel animations after reading MotionPauseDetector#isPaused()" into 24D1-dev 2024-03-21 22:03:18 +00:00
Andy Wickham
88972311a2 Consolidate settings for Assist.
Now there is just 1 toggle for all entrypoints.

Bug: 324036308
Test: Manual and unit tests
Flag: NA
Change-Id: Id4463345c44fa4daba4eac67b5ad00aff7f3a606
Merged-In: Id4463345c44fa4daba4eac67b5ad00aff7f3a606
2024-03-21 20:27:54 +00:00
Andreas Agvard
eccda6f363 Merge "Adds new AssistStateManager settings" into 24D1-dev 2024-03-21 10:55:01 +00:00
Tony Wickham
3c58551e12 Cancel animations after reading MotionPauseDetector#isPaused()
Otherwise, it clears MotionPauseDetector so isPaused returns false.

Fixes: 330186943
Flag: none
Test: manual
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:77802d6da48320e5f5cf5c420fe31a1aa14e478e)
Merged-In: I9e0982c18cc5264a1fab53077ac551d2880a6eae
Change-Id: I9e0982c18cc5264a1fab53077ac551d2880a6eae
24D1-dev is based on 24Q2-release. Therefore, we merged this CL to 24D1-dev.
2024-03-21 07:57:56 +00:00
Vinit Nayak
41e0e65bd4 Merge "Call setOverviewDragState() whenever taskbar is recreated" into 24D1-dev 2024-03-21 02:43:11 +00:00
Jeremy Sim
c22b39a319 Prevent Save App Pair from showing up on 3p launcher
This CL adds a check so that app pairs can't be saved on 3p launchers. This affects the Overview icon dropdown menu and the Overview Actions Bar.

Fixes: 326155701
Flag: ACONFIG com.android.wm.shell.enable_app_pairs TRUNKFOOD
Test: Manual, option does not show up when Nova Launcher is set as default home app, and shows up again for Pixel Launcher.
Change-Id: I60d6fd3b3eb39921edafb12faace743d16de270f
(cherry picked from commit 2b2d8cc90b)
Merged-In: I60d6fd3b3eb39921edafb12faace743d16de270f
2024-03-20 23:35:29 +00:00
Vinit Nayak
3b63408ad1 Call setOverviewDragState() whenever taskbar is recreated
* Un/Pinning taskbar re-creates controllers which led to
stale state for checking if we are allowing split selection

Test: Crash/immediately going into split no longer repros after
un/pinning taskbar in overview and trying to split
Fixes: 326356246

Change-Id: I06cfc4d1c3c7fe071f04414c3134eaff7960ade6
(cherry picked from commit 0adca26744)
2024-03-20 19:42:03 +00:00
Sihua Ma
f0518bb89f Fix out-of-sync updates during grid change
This is a combination of two issues:

1. Widget updates are not passed to the holder when the launcher binding starts
2. Updates from widgetHost.startListening() are overriden by out-of-date info

Fix: 322919716
Test: Manual
Flag: N/A
Change-Id: I9665117412c87b19ed5d98263bb4f9b8da21c5c7
(cherry picked from commit f418b2e16d)
2024-03-20 16:58:00 +00:00
randypfohl
c91aad150c When mLastComputedTaskSize is empty we will recalculate and set it before determining scale and pivot
Bug: 326550571

Test: manually set computed task size to 0 simulating unset circumstance, and ran logs verifying infinite, added fix, and verified logs showing the same scale before and after with get tasksize set

Flag: none

(cherry picked from commit fca7ee23ba)
(cherry picked from https://googleplex-android-review.googlesource.com/q/commit:9c4039e12dbc20dabf1d7e62b06bfd650706eaa7)
Merged-In: I0f928885e2fc6cfc0d6a064d6e9f1c614bf7a5af
Change-Id: I0f928885e2fc6cfc0d6a064d6e9f1c614bf7a5af
2024-03-20 16:37:55 +00:00