Commit Graph
78 Commits
Author SHA1 Message Date
randypfohl 4b40965346 Fixing tests related to abstraction
Flag: NONE - fixing tests

Test: built and ran locally, verified test pass in presubmit

Bug: 224595066

Change-Id: Ifefab1e1696853c5bd816a361314082073ba8a20
2024-06-13 10:26:12 -07:00
Treehugger Robot 9aafa6bd76 Merge changes I8411fb83,I5b757558 into main
* changes:
  Move Desktop running apps support into TaskbarRecentAppsController
  Add flag for Recents in Taskbar
2024-06-11 02:16:56 +00:00
Tony Wickham a2b510dc23 Move Desktop running apps support into TaskbarRecentAppsController
- Merged DesktopTaskbarRunningAppsController up into
  TaskbarRecentAppsController, which is now initialized directly
- The old TaskbarRecentAppsController was effectively a no-op
  that was always overridden, so merging the one subclass up makes
  things simpler (especially for the follow up CLs which will add
  support for switching between Running and Recent tasks using
  the same underlying data).

Flag: com.android.launcher3.enable_recents_in_taskbar
Test: TaskbarRecentAppsControllerTest
Bug: 315354060
Change-Id: I8411fb832e5dd3d76201d2694dec0b11bd70bbf9
2024-06-11 00:18:23 +00:00
Shamali P d69e21f8fe Ensure widgets from WidgetSections.xml are included in suggestions
Additionally, let only prediction system provide suggestions, since the
UI surface has been there for a while, adding locally filtered widgets
from app package isn't required.

Bug: 345520128
Test: Unit tests
Flag: EXEMPT bugfix
Change-Id: Ia97f0743fefeae750e07a694bb19d24a5cc11ffe
2024-06-06 22:23:35 +00:00
Pierre Barbier de Reuille f60dd5471c Update desktop mode to identify minimized tasks
When a task is minimised, it becomes invisible but is still running.
WMShell now signals to the launcher when a task's visibility changes.
The task bar takes the visibility into account to know if a running task
is, in fact, minimised.

Test: atest NexusLauncherTests:DesktopTaskbarRunningAppsControllerTest
Flag: com.android.window.flags.enable_desktop_windowing_taskbar_running_apps
Bug: 333872717
Change-Id: Iaff6b1240d354bb3c4de8e4884948acf9bf40112
2024-05-23 20:59:16 +01:00
Chris Göllner 0cd995e4ef Convert SysUiState flags from int to long
We already reached the limit of 32 flags for an int. To be able to have
more, changing from int to long.

This is needed, as new flags have to be added.

Flag: NONE
Test: Manually running SysUI and Launcher
Test: Unit tests in CL
Bug: 335625543
Change-Id: Iec1d40218264c7c64c50fd09764aa07c0caa7787
2024-05-13 14:47:33 +01:00
Treehugger Robot a3009176a9 Merge "Give bubble team owners on the correct launcher bubble dirs" into main 2024-05-02 19:47:20 +00:00
Liran Binyamin 841411d122 Give bubble team owners on the correct launcher bubble dirs
Whoops.

Flag: N/A
Test: treehugger
Bug: none
Change-Id: I25df1a161d94bd1acac976bc61217a59b3657074
2024-05-02 15:33:16 -04:00
Gustav Sennton f74d8b7264 Re-fetch DesktopVisibilityController when needed instead of just once
When creating DesktopTaskbarRunningAppsController the Quickstep Launcher
might not be available, meaning we pass a null
DesktopVisibilityController to DesktopTaskbarRunningAppsController.
With this CL we refetch DesktopVisibilityController whenever needed.

Bug: 338035946
Test: manual, and DesktopTaskbarRunningAppsControllerTest
Flag: ACONFIG com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps DEVELOPMENT
Change-Id: I8b806e2d0addbf8fb5ab6a3d419a4691c445f223
2024-04-30 16:07:13 +00:00
Gustav Sennton 0eaf9ebdaa Remove references to FEATURE_PC and related Desktop classes in Launcher
Also clean up TaskbarRecentAppsController APIs

Flag: NA
Test: DesktopTaskbarRunningAppsControllerTest
Bug: 330551930
Change-Id: Ibd9c3d6aa1d5423b51a48ed0a972196752d5199a
2024-04-30 13:15:28 +00:00
Gustav Sennton 52a8b7e24b [Desktop Mode] Show indicators under Taskbar app icons for running apps
In Desktop Mode we show running Desktop apps in the Taskbar. With this
change we also show an indicator under the app icon for each such
running app.

Bug: 332504528
Test: manual
Test: DesktopTaskbarRunningAppsControllerTest
Flag: ACONFIG com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps DEVELOPMENT
Change-Id: If0906dab8ad0bd8a78d93a4e99db47550e763bed
2024-04-26 15:29:00 +00:00
Gustav Sennton 568e0bff90 Merge "Show running apps in Taskbar when in Desktop Mode" into main 2024-04-23 14:02:11 +00:00
Gustav Sennton 0b33b172fb Show running apps in Taskbar when in Desktop Mode
In Desktop Mode: show currently running (Desktop) apps in Taskbar

Bug: 332504528
Test: DesktopTaskbarRunningAppsControllerTest
Flag: ACONFIG com.android.window.flags.Flags.enableDesktopWindowingTaskbarRunningApps DEVELOPMENT

Change-Id: I10dec022f4b16562e81d7cbd5f9ce835474e9d20
2024-04-23 10:43:27 +00:00
Liran Binyamin b8ae441c10 Give bubble team owners on launcher bubble dirs
Flag: N/A
Test: treehugger
Bug: none
Change-Id: Ic5f69f34a1561ffb5a879a88b1532754e4b38f42
2024-04-18 12:18:21 -04:00
Uwais Ashraf 7a0150d02e Use script to auto-enable all tests that are currently working
Fix: 325088906
Test: presubmits passing, gradle robo run passing locally
Flag: NA
Change-Id: I481bfe9caeb8cc18b3e01ec8b7a58fb0eb36fdaa
2024-04-08 20:59:23 +00:00
Shamali P 7ae51788da Update the WidgetPickerActivity to display recommendations for hub host
- Accepts a ui_surface param of format "widgets{_hub}" and existing
widgets on the surface to be excluded from predictions
- Refactored the widgets prediction update task to extract reusable
logic that maps the predictions to widget items and reused it.

http://screencast/cast/NjE1MTA5MDI0NzU2NTMxMnwzMGE3NTMwNi1hZg

Bug: 326092660
Test: WidgetsPredictionHelperTest and see screencast above.
Flag: N/A
Change-Id: I6ceeb752c167893bab4ed496cedc5e8081e1b950
2024-04-01 20:16:37 +00:00
Tony Wickham 86d8386ab6 Merge "Add TaplTestsQuickstep#testExcludeFromRecents" into main 2024-03-19 20:28:58 +00:00
Tony Wickham b84b8524a1 Add TaplTestsQuickstep#testExcludeFromRecents
- Add ExcludeFromRecentsTestActivity, and add it to the manifest
  with excludeFromRecents="true"
- Add the test to check the current Overview task content
  description, ensuring that the excludeFromRecents task is
  present directly after a gesture but not after going home.
Bug: 324495241
Flag: None
Test: TaplTestsQuickstep#testExcludeFromRecents

Change-Id: I06be53673f0ac06924f79b44f19744da066cc7ea
2024-03-18 22:30:13 +00:00
Uwais Ashraf cf70589921 Merge "Enable tests which do not require any modification" into main 2024-03-13 15:42:07 +00:00
Uwais Ashraf 4ee1701fd1 Enable tests which do not require any modification
Fix: 329052420
Flag: NA
Test: Presubmits + :NexusLauncher:testGoogleWithQuickstepDebugUnitTest
Change-Id: I27e847c923076e4e978fd7359c9c62745d4f5f0a
2024-03-13 12:27:46 +00:00
Shamali P 20a5f4e8d1 Update labels for the categories to match the UX writer provided strings
Also fix issue that user was not passed when getting application info.
(error noticed by Zak)
http://screen/8fiiTSHvo2SfYdE

Bug: 318410881
Flag: N/A
Test: Unit test
Change-Id: Id85feec0d95d3d4d183a673f7eed40906b0043e2
2024-03-08 19:58:23 +00:00
Tracy Zhou b263e2d94a Update phone gesture nav test in NavButtonLayoutFactoryTest
I think the test was written in the first version of NavButtonLayoutFactoryTest where phone gesture nav layouter didn't exist (verified with the revision history), hence updating the logic here

Bug: 324989451
Test atest NavButtonLayoutFactoryTest

Change-Id: I325a5d47db86add8d094e61b1de923f50a2db309
2024-02-15 23:42:21 -08:00
Tracy Zhou 6800a71f95 Fix NavButtonLayoutFactoryTest init dependency to turn on enableTaskbarNavbarUnification
Fixes: 325084350
Test: run the unit test with the unification flag on, make sure it passes
Change-Id: I5f811585ec0c5c04578cbf7990b9790bdb900ee5
2024-02-14 07:17:23 +00:00
Tracy Zhou d6bd6ae769 Fix NavButtonLayoutFactoryTest setup to turn on enableTaskbarNavbarUnification
Fixes: 325084350
Test: run the unit test without guarding the flag, make sure it passes
Change-Id: If902aeb7e9f06bfa4fa2876995cb67e350839a91
2024-02-13 11:18:46 -08:00
Vadim Tryshev 6a0c468563 Merge "Revert "Add unit test for StatusBarTouchController.java"" into main 2024-02-07 18:54:43 +00:00
Shamali Patwa efebbb21fe Merge "Update prediction task to provide categorized suggestions." into main 2024-02-06 21:36:14 +00:00
Shamali P 57c1eedbc6 Update prediction task to provide categorized suggestions.
Also adds a helper in popup data provider to provide categorized
suggestions. Used in follow up CL to update the UI.

Bug: 318410881
Test: WidgetsPredictionUpdateTaskTest and manual with follow up changes
Flag: ACONFIG com.android.launcher3.enable_categorized_widget_recommendations DEVELOPMENT
Change-Id: Ie80e8ba7bbe874f7c4b0e579446edf571036555e
2024-02-06 18:14:49 +00:00
Ram Muthiah 87b5785548 Revert "Add unit test for StatusBarTouchController.java"
This reverts commit 1f0465e9f2.

Reason for revert: Droidmonitor investigation of test suite failure

Bug: 323976612
Change-Id: I07895d5c10984def103c240664755b96b79f1fb5
2024-02-06 16:50:10 +00:00
Fengjiang Li 1f0465e9f2 Add unit test for StatusBarTouchController.java
Test: this one
Flag: NONE
Bug: 282945183
Change-Id: I76eb4389d71d7a03e038ed6b01b6f5b7923fd11a
2024-02-05 11:51:01 -08:00
Tracy Zhou 419140aede Make sure touch only goes to the nearest button when it makes sense
- In NearestTouchFrame, we can't use view bounds alone since the buttons do not have the same root (3 buttons are in the main container, while the contextual buttons are in the contextual button container). This currently caused the issue that contextual button region, when the contextual buttons are invisible, triggers overview
- Need to add an empty space in the left / top area of the button nav to prevent view clicks from going into back (that's how it works in navigationbar/)

Bug: 25768138
Test: left and right of 3 buttons don't trigger back or overview
Change-Id: Idc26c0c8ac0ecc000300a6db2e3e6251f678dada
2024-01-30 14:27:48 -08:00
Tracy Zhou 9c9befae5f Use nearest region for all the nav buttons in 3-button folded mode
Bug: 230395757
Test: In 3-button folded mode, make sure that the touches that happen between nav buttons go to the nearest button. No regression in other modes.

Change-Id: Icb776a9a4ed4fc31d33dc3267c7053f2b0da0bfc
2024-01-24 11:06:01 -08:00
Sunny Goyal 6449a21062 Fixing some launcher model tests
> Removing static mocks and using Sandbox context instead
> Removing inheritence in LauncherModel and converting LauncherApps.Callbacks
  to a separate class. decMaker sometimes fails because of API changes in
  LauncherApps.Callbacks

Bug: 319877828
Test: atest LoaderTaskTest
Flag: N/A
Change-Id: If78b5d83595627a355b284f52d887d75fef53014
2024-01-12 12:30:52 -08:00
Himanshu Gupta 314afce4f9 Fixing UserHandle for AppTarget Event from Launcher.
Currently, every non-foreground user AppTarget Event
is assigned the first userhandle present in the list
of UserProfiles cached with Launcher.
This causes issues when more than one profile is
present, as then appevents from either profiles are
indistinguishable.
This chane fixes that, based upon the recent fixes to
make Launcher and ItemInfo user profile aware.

Bug: 314124511
Test: Manual by clicking diff app targets
Flag: ACONFIG com.android.launcher3.Flags.enable_private_space TEAMFOOD
Change-Id: I188c828eeeff9b617ddf9a75bccea9b9ab38e506
2023-12-18 19:10:23 +00:00
Tracy Zhou f2d7be1cec Make enableTaskbarNoRecreate() depend on ENABLE_TASKBAR_PINNING and ENABLE_TASKBAR_NAVBAR_UNIFICATION
We want to turn on the flag when either of the dependent features is on

Bug: 299193589
Test: N/A
Change-Id: I7b48ff2be0cf9da3b6bc00d75370fa585ce4140d
2023-11-08 14:52:58 -08:00
Tracy Zhou 6fe69f5a2a Migrate HIDE_NAVBAR_WINDOW to aconfig and rename is to enable_taskbar_navbar_unification
Bug: 309671494
Test: N/A
Change-Id: If35d807c17351146029498a876a055384eff3c2f
2023-11-07 13:51:38 -08:00
Jagrut Desai 631b284836 Taskbar pinning animation with no recreate
Test: Manual, Visual
Bug: 265436799
Flag: LEGACY ENABLE_TASKBAR_PINNING DISABLED

Change-Id: I84a4d1efdb0bd4a0f856fa1f46b6489ef54a3841
2023-10-26 10:36:48 -07:00
Pat Manning 5643e7c047 Increase pinned taskbar height to fit tooltips.
Fix: 305706286
Flag: ACONFIG com.android.launcher3.enable_cursor_hover_states TRUNKFOOD
Test: TaskbarHoverToolTipControllerTest

Change-Id: I767947a752eae7a928d59fe332bc62b9fd5b5f37
2023-10-23 15:52:48 +01:00
Brian Isganitis 06139e079c Migrate Kotlin tests to use mockito-kotlin2.
Test: atest
Bug: 300509464
Flag: No
Change-Id: I5e0d0f1f29d51cdbfacd51f7229afddf8bd66f7e
2023-10-03 16:04:19 -04:00
Tracy Zhou a9194c54ef Repostion contextual buttons upon layout changes
Also make sure the contextual buttons are centered in its respective orientation

Fixes: 300849078
Test: Rotate around, and make sure the rotation button stays in the same corner
Change-Id: Ibc40739eff050f258b938ccf94c2056ed1ee596b
2023-09-26 19:09:59 -07:00
Pat Manning 2db8ce7e94 Remove taskbar tooltip hover delay.
Fix issue when setting fullscreen drag layer causes hover exit/enter events.

Update ArrowTipView paddings to match spec.

Update ArrowTipView to check on each time it is shown if it should point up or down, not only the first time.

Fix: 295851126
Fix: 295315397
Test: TaskbarHoverToolTipControllerTest
Change-Id: I314c65cb9fce3fb8d6002d8917bd5c97301d9dbc
2023-09-15 12:24:51 +01:00
Andy Wickham 976876ec5b Add tests for LPH override for 3 button mode Taskbar.
Override == Launcher handles via AssistUtils instead of SysUI.

Bug: 297561673
Test: TaskbarNavButtonControllerTest + bug bash session
Change-Id: I079d4b9045d6f7d94d74e91bcabbbc182de6e17d
2023-08-30 14:45:18 -07:00
Andy Wickham f7554ff718 Use new AssistUtils(Base) to override SysUI Assist invocations.
AssistUtils#getSysUiAssistOverrideInvocationTypes(): Sent
over SysUiProxy to request overriding these invocation types.

AssistUtils#tryStartAssistOverride(): Called by OverviewProxy
(TouchInteractionService) for previously requested overrides.
Also used within Launcher for Taskbar and QSB to override
other invocation logic. May return false to indicate that
the override was not handled, so a fallback may be desired.

Bug: 295874732
Test: Manual
Change-Id: I488f3b7da1feb2663feab5d04dfa8d605c070efb
2023-08-23 15:49:02 -07:00
Pat Manning a3d564ce34 Set taskbar to fullscreen for tooltip only once it is shown.
Fix: 293490434
Test: TaskbarHoverToolTipControllerTest
Change-Id: Iba59ce241933a52e7f49036188660bef93ea6dcb
2023-08-01 14:33:59 +01:00
Pat Manning f351e515f7 Merge "Show tooltips on cursor hover of taskbar icons." into udc-qpr-dev 2023-07-17 10:15:46 +00:00
Pat Manning da69661add Show tooltips on cursor hover of taskbar icons.
Fix: 250092437
Test: TaskbarHoverToolTipControllerTest
Flag: ENABLE_CURSOR_HOVER_STATES
Change-Id: Ia0463518d13b313b354328078685930215fb7636
2023-07-14 13:42:30 +01:00
Fengjiang Li ff15fbffec Recreate hotseat predictor whenever we query it due to workspace change
Fix: b/289013842
Test: unit test, also verified moving icons will recreate hotseat predictor
Change-Id: I1f19b17654b87156132a4e4dee26e12312589dba
2023-07-12 10:11:12 -07:00
Vinit Nayak 15a9feb67f Add support for taskbar phone 3 button seascape
* Ignore orientation check from ag/22709055 for now,
that will be reverted. This causes recreateTaskbar() to
not run when folding the device

Bug: 274517647
Test: Tested 3 button nav in portrait/landscape/seascape
Flag: persist.wm.debug.hide_navbar_window
Change-Id: Ied02ead677d496b465c748257e32b7db5eb9580c
2023-07-06 13:58:30 -07:00
Vadim Tryshev 167ff73108 Merge "Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"" into udc-dev am: af641a6e80 am: 27e2251b7d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23662872

Change-Id: I81d60e0d7d92267cadad309450a90ed39be0bc84
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-12 23:07:01 +00:00
Vadim Tryshev b5057c496a Revert "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test"
This reverts commit 1a2462914d.

Reason for revert: Likely culprit for b/286115393

Change-Id: I613ca9f62c5b9f43f2e3cd240e45bc1a0db0e661
2023-06-12 17:40:22 +00:00
Fengjiang Li 7d6a8b1c3a Merge "Fix NPE of handling ACTION_MOVE in StatusBarTouchController and added unit test" into udc-dev am: 3dca7b3c6a am: 69a9a4cd52
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23300979

Change-Id: If1ffa619e26ab7b76d6e0b946bcd29d121cd7219
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-06-06 19:43:54 +00:00