Commit Graph
54 Commits
Author SHA1 Message Date
Graciela Wissen Putri b6488e052c Add displayId to back event
This will allow core to determine which display the back event was
started from.

Flag: com.android.window.flags.enable_independent_back_in_projected
Bug: 401530192
Test: atest TaskbarNavButtonControllerTest
Change-Id: I181aae3e9f5009f99e6ce21092dd45caeeae20cc
2025-04-08 13:28:02 +00:00
Will Osborn 90ac376da8 Taskbar nav per-display
Test: local + unit
Bug: 402364626
Flag: com.android.launcher3.enable_overview_on_connected_displays

Change-Id: I9643367e19b107a2811e93db4e3dd32e9355da71
2025-04-04 10:32:46 +00:00
Johannes Gallmann 528bf70f61 Play haptic on ACTION_DOWN for 3-button-nav buttons
Bug: 393959400
Test: Manual, i.e. verified that haptic happens on ACTION_DOWN and on
      long press (except for back button which doesn't have a haptic on
      long press). Also verified that Talkback works.
Flag: EXEMPT bugfix
Change-Id: Ieb1892d69268d0bfba0ead9ec38c8ee9843addef
2025-03-26 16:44:45 +01:00
Sunny Goyal 55dc2d1c31 Moving DisplayController to dagger
Separating various overrides to individual modules so that they can be reused in tests

Removing ContextualEduStatsManager and directly using SysUiProxy as all the usescases
are only in quickstep/
This avoids additional Module definition and delegation

Bug: 361850561
Test: Presubmit
Flag: EXEMPT dagger
Change-Id: I096459d638553991ed01766002b874589c6b976e
2025-01-14 11:40:35 -08:00
Sunny Goyal ddded547bb Removing TisHelper dependency in taskbar
Taskbar should be able to access TouchInteractionService directly

Bug: 384896306
Test: Presubmit
Flag: EXEMPT bugfix
Change-Id: I2a32d3a7a2b2071645abff72c62635c6575a48a1
2024-12-18 15:02:44 -08:00
Johannes Gallmann a4b56465ee Disable 3-button-nav buttons during back button hold
Bug: 373544911
Test: TaskbarNavButtonControllerTest
Test: Manual, i.e. verify that pressing buttons in 3-button-nav while the back button is pressed does not have any effect
Flag: com.android.window.flags.predictive_back_three_button_nav
Change-Id: I5abad5f2f74d09c790380a2eeb27aff3b780b925
2024-11-19 22:11:59 +00:00
Jagrut Desai 48793e1fcd Fix 3-button Navigation Switch Access Long press
This cl includes
 - Make long press of back navigation button of 3 button navigation mode behave just like short press.

Test: Manual
Bug: 315723734
Flag: EXEMPT bugfix
Change-Id: Id897c84dcb33f73174ea907c5ab5655d2ac5ba10
2024-11-14 11:27:14 -08:00
Johannes Gallmann bc4936fb6b Add predictive back animation for 3-button-nav
Bug: 373544911
Flag: com.android.window.flags.predictive_back_three_button_nav
Test: OverviewProxyServiceTest
Test: TaskbarNavButtonControllerTest
Test: TaskbarScrimViewControllerTest
Change-Id: I04cadc660f38e2d4541b06fcda950098a0768492
2024-11-06 11:02:13 +01:00
Andy Wickham 0b936727d6 Migrate Contextual Search code to AOSP
- Adds ContextualSearchInvoker
 - Adds ContextualSearchStateManager
 - Adds ContextualSearchHapticManager

Example output from ContextualSearchStateManager
in TouchInteractionService dump:
https://paste.googleplex.com/5536017815961600

Bug: 353715553
Test: go/contextual-search-entrypoints-test-plan
Flag: EXEMPT moving code from vendor to aosp

Change-Id: I8253294d6be427e0fc29d6052994de0c03f05a3e
2024-10-10 21:03:42 +00:00
helencheuk 5012640ab2 [Contextual Edu] Update Edu stats when going to overview and all apps from home
Update education stats when
- go overview and all apps by swiping up at homepage (AbstractStateChangeTouchController)
- go home from all apps by swiping down the all apps panel (AbstractStateChangeTouchController)
- go home from all apps or overview by swiping up from the bottom nav bar (NavBarToHomeTouchController)
- in 3 button navgiation mode (TaskbarNavButtonController)

NavBarToHomeTouchController does not inherit from AbstractStateChangeTouchController so logic are added separately.

Bug: 363480554
Test: TaskbarNavButtonControllerTest
Flag: com.android.systemui.keyboard_touchpad_contextual_education
Change-Id: I0662704a9093b9f5a4d2f086a8297429fbc49881
2024-09-17 16:00:24 +01:00
Cosmin Băieș 33f8bfbadf Add IME switch button long click support
This adds support for handling long clicking on the IME switch button.
Initially it will behave exactly like short clicking, i.e. show the IME
switcher menu.

Flag: android.view.inputmethod.ime_switcher_revamp
Test: atest
  TaskbarNavButtonControllerTest#testPressImeSwitcher
  TaskbarNavButtonControllerTest#testLongPressImeSwitcher
Bug: 311791923
Change-Id: Ibd0d6bce2bab11511bc082f46731ec86038c8cf8
2024-07-11 11:42:16 +02:00
Tracy Zhou d289ca471b Get rid of multiple haptic feedbacks when long pressing on nav buttons
When returning false in a onLongClickListener, the touch event gets dispatched to onClickListener at release.

Fixes: 351457303
Test: long press and short press both result in one haptic feedback
Flag: EXEMPT bugfix
Change-Id: Id173a2d1fcf2f61c3289c653809207425b468a82
2024-07-05 23:26:45 -07:00
Pragya Bajoria 571c9b288d Merge "Remove obsolete desktop stashing logic from platform/packages/apps/Launcher3 [5/n]" into main 2024-05-16 09:50:17 +00:00
Pragya Bajoria d9900e0d17 Remove obsolete desktop stashing logic from platform/packages/apps/Launcher3 [5/n]
Bug: 309481654
Change-Id: Id7b5db662d578eb625171055d30c37cd59e7d73c
Flag: EXEMPT refactor since it is removing obsolete code with no changes to current behavior.
2024-05-15 09:16:13 +00: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
Anushree Ganjam c9eda41c31 Hardcode the className instead of class.getSimpleName().
class.getSimpleName() causes issues with obfuscation.

Bug: 332171918
Test: Manual
Flag: NA
Change-Id: I5119a7ba0e4e27d8745c94df67881934fed282a4
2024-05-08 12:31:24 -07:00
Brian Isganitis 79d0569d49 Remove nav button controller dependency on TIS.
This refactor will make it easier to initialize TaskbarManager in a test
environment. Se go/taskbar-controller-tests for context.

Test: TaskbarNavButtonControllerTest
Bug: 230027385
Flag: N/A
Change-Id: I157649ff93b5e1751e6774e2cba2f76750792292
2024-04-24 18:17:00 -04:00
Alex Chau 13b7ceeff0 Clean-up unnecessary desktop windowing flag usage
- mDesktopVisibilityController will now be null if desktop windowing flag is disabled
- As a result, all code that uses mDesktopVisibilityController no longer need to check desktop windowing flag
- DesktopTaskView/DesktopTask only populates when flag is enabled, so we don't need to check flag if we already check DesktopTaskView/DesktopTask
- Removed the flag check in SplitToWorkspaceController, as we shouldn't enable split from workspace base on desktop windowing, contextual split already have its own flag
- Also avoid creating GroupTask or DesktopTask for freeform tasks when flag is off, to avoid a crash in RecentsView

Bug: 332655617
Test: manual with desktop windowing flag on/off
Flag: ACONFIG com.android.window.flags.enable_desktop_windowing_mode DEVELOPMENT
Change-Id: I0e45f73ad2b0d99dfb4ec3215f973679ca93957c
2024-04-04 12:21:43 +01:00
Alex Chau 59781a7d79 Remove DesktopTaskView.isDesktopModeSupported
- Use Flags.eanbleDesktopWindowingMode directly
- Also clean up unnecessary and improper flag usage

Bug: 309008406
Flag: ACONFIG com.android.window.flags.enable_desktop_windowing_mode DEVELOPMENT
Test: presubmit
Change-Id: I86ce317ce577f279d2ce819d6dc1738204c2631e
2024-03-21 14:05:27 +00: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
Ats Jenk 5c25c3a19d Use aconfig flag for desktop mode
Refactors all flag access in Launcher to be from DesktopTaskView and using a method instead of a static field.
Also using static import for the method so if we need to move it, only imports needs to be updated.

Bug: 304778354
Flag: ACONFIG com.android.wm.shell.enable_desktop_windowing TEAMFOOD
Test: enable the aconfig flag, check that desktop windowing is available

Change-Id: Ia2bdfd865802a635878d72cfb5a90c21dad6ed08
2023-10-27 10:58:07 -07:00
Andy Wickham 43da2dc409 Merge "Add tests for LPH override for 3 button mode Taskbar." into udc-qpr-dev am: 3289e4fa35 am: 294a40b1be
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24607784

Change-Id: Id8ba2e642aad256612f21e6026adbf5c2e756123
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-09-08 23:49:12 +00: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
Sukesh Ram 3f2338a8e8 Remove Windowing Prototype 1 from Codebase
Refactor codebase to remove Proto1 as it is no longer supported.

Test: aTest WMShellUnitTests
Bug: 297217817
Change-Id: Ifaf67754c048d913fe203f4b34efc3c9c611039c
2023-08-30 17:40:13 +00:00
Andy Wickham b2ac210120 Rename AssistUtilsBase -> AssistUtils
Bug: n/a
Test: n/a
Flag: n/a
Change-Id: Ia227b180732d0acfdc4b648885d5ce208d86ee49
2023-08-25 12:12:17 -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
Ats Jenk 7cd5a681f7 Stash desktop apps on home gesture or taskbar home button press
When we detect the home gesture or tap on home button in taskbar,
check if desktop apps are visible. If they are, signal WMShell
to stash the desktop apps.

Flag: persist.wm.debug.desktop_mode_2
Bug: 261234402
Test: have gesture nav enabled, put an app on desktop and swipe up to
  home, verify toast is shown, and next app launches to desktop
Test: have 3-button nav enabled, put an app on desktop and press home,
  verify toast is shown, and next app launches to desktop
Change-Id: I824e640bfafa20cb3451cbd8f035fe9dca18094f
2023-05-16 11:57:50 -07:00
Vinit Nayak 5bda089e2b Close system dialogs on Taskbar home button tap
Fixes: 255879258
Test: Able to go home w/ shade down in app and
in overview

Change-Id: Ia706148b4437e18b16b711bda572c4ba28958718
2023-04-06 12:09:35 -07:00
Vinit Nayak 0d784ee7fb Toggle taskbar button nav assistant availability
* New signals coming in from Sysui reflect the toggle
in Settings for long pressing on home button to
invoke assistant.

Fixes: 255909545
Test: Manual + added unit test for TaskbarNavButtonController
Change-Id: Ic65a80b0b9697990931b7e89756773fb086cc3bd
2023-01-03 20:07:27 -08:00
vadimt f6ef879cf4 Moving all sources that are shared between Launcher and TAPL in one directory
This will help SysUI test team (who uses TAPL) to set up Gradle build for their tests.

Bug: 202567877, 234414088
Test: presubmit
Change-Id: I3d923ea4b54d1a4c3d2b345be09692727d30433e
2022-07-27 20:18:46 +00:00
Schneider Victor-tulias 3f6c473164 Fade out the taskbar icons when animating to overview in 3 button nav.
Bug: 231213105
Test: from home, opened recents, then went back home, then went back to recents, resumed an app, then went back to recents and resumed the same app (both in 3-button and gesture nav)

Change-Id: I83b1b33cafb95353f36a126b93fcaf3b536d3bf4
2022-07-19 11:35:37 -07:00
Tracy Zhou 0a0fcb809c Perform haptic feedback on nav button key press
Fixes: 203614307
Test: manual
Change-Id: Icaea3f5e436522f23202c20fcc7f7c5dbe309372
2022-06-23 14:29:34 -07:00
Vinit Nayak 26b6b577b9 Add metrics for taskbar 3 button nav
Fixes: 221075063
Test: wwlogcat shows right events,
new events show up on aster dashboard

Change-Id: I3864ac02ea00f281d33ccb26b95a4916bd8b6be9
Merged-In: I3864ac02ea00f281d33ccb26b95a4916bd8b6be9
2022-03-31 19:36:47 +00:00
Vinit Nayak 6be66c96ef Close system windows when toggling overview
Fix: 203835798
Test: Tap on overview with notification shade,
it closes

Change-Id: I01a5cab4fabf7950f48290418df3ae6cb270305c
2022-03-28 14:54:07 -07:00
TreeHugger Robot 3e25f29128 Merge "Add log dumps for taskbar state" 2022-01-21 15:05:32 +00:00
Schneider Victor-tulias fa0bfee97a Add log dumps for taskbar state
Test: created bugreport and checked logs
Bug: -
Change-Id: Ic0c2330b18c8daf181ae5b236e0c4b212d630fa3
2022-01-20 14:41:25 -08:00
Merissa Tan d41ce4980d Create new DesktopNavbarButtonsViewController class.
This CL creates a new DesktopNavbarButtonsViewController class to allow
for taskbar buttons and status icons customization on desktop
environment.

Recall: http://recall/clips/e008d2de-36d3-47f6-954a-5ce18bac69a5

Bug: 213964564
Bug: 196757951
Test: Switch between different system navigation modes and verify the
desktop taskbar buttons stay on screen.

Change-Id: Ie7a9a044fad3b60cd37d910b8eb78c8734aadfd5
2022-01-18 17:10:15 -08:00
Shuming Hao 33e97f1ca4 Merge changes from topic "kingyo-new-buttons-master"
* changes:
  Toggle notification panel when new buttons are clicked in taskbar
  Add new buttons to taskbar
2021-12-15 16:49:19 +00:00
Shuming Hao 22fbc854ea Toggle notification panel when new buttons are clicked in taskbar
This CL adds toggle notification panel function for new buttons in Kingyo taskbar.

Bug: 199333223
Test: m, verify that clicking the new buttons will expand/collapse quick settings and notification panel

Recall: http://recall/clips/993bc14b-98a7-4d7d-98c4-17ba271d4da9
Change-Id: I8c7383d2efa6f15de10a50173cfff86ab20ebb4c
2021-12-10 16:52:47 -08:00
Daichi Hirono db5960de5e Add new buttons to taskbar
Cherry picked from commit 53db50dd0b2bd6ed1842b25396c9c52b7abe1157
after resolving conflicts

The CL adds two new buttons for desktop usage.
No listeners are registered yet.

Recall: http://recall/clips/f52b70ed-c437-4374-a492-e4b7c802520a

Bug: 198355239
Test: m, verify that new buttons are added

Change-Id: I1d4a12da3041e113a978c37c9e36ec085d15e8b3
2021-12-10 16:24:24 -08:00
Tracy Zhou 74fd7af92d Add content descriptions to task bar nav buttons
Fixes: 209608812
Test: manual
Change-Id: Iba50abfb2a3d33104b6d88574df0bc7b5daf1d3a
2021-12-08 10:44:31 +00:00
Vinit Nayak 570653346f Add task unpinning support for 3 button taskbar
Bug: 199544447
Test: Tested on small and large screen
Change-Id: Ib7785992ef11825cd07a929e2cb623d02ef246f1
2021-11-30 17:18:09 -08:00
Vinit Nayak bca13abc82 Invoke Assistant on 3 button long click on Taskbar
Bug: 204273914
Change-Id: I757fa40ad9ac0ace44b57c7dd08ec30b4c0ae6d0
2021-11-22 17:32:16 -08:00
Vinit Nayak 0ca3f98ec6 Invoke IME switcher for taskbar through SysUI
Bug: 191814219
Test: IME switcher works small and large screen
Change-Id: Ic2db60357a13846bb34dddd64b27ecbbf8ff656f
2021-10-29 11:46:18 -07:00
Vinit Nayak 8d51468426 Invoke home via recents for fallback recents
Fixes: 194286702
Test: Go home from app and overview for
3P and normal launcher (test via separate recents activity
in debug menu)

Change-Id: Ifac4afbfa549265a80448ee460a780bf0984f9e1
2021-08-05 11:52:25 -07:00
Vinit Nayak b974a86c8f Add IDs to buttons in 3 button nav for Taskbar
Bug: 191449914
Test: testSwitchToOverview passes
See bug for more details

Change-Id: I108bbe7607181680bca7cb5fad5e7289191edde6
2021-06-18 18:20:44 -07:00
Vinit Nayak e91e4f0328 Default to requesting command type TOGGLE for OverviewCommandHelper
Parity with how sysui switches between apps for double
tapping recents button.

Fixes: 190660016
Test: Double tap to switch works, tapping fast also works
Change-Id: If6dda377d8accf564f3385e78c6721c677310361
2021-06-17 12:37:02 -07:00
Vinit Nayak 113377d8b8 Tap on recents button twice to go to last app
Fixes: 190660016
Test: Tapped on recents twice and saw last app.
Tapped on recents and tried to tap on other app
icons and none of them launched.

Change-Id: Ie89f1ec0464f194087dc07ab99deb8223ab6ddb8
2021-06-15 15:12:17 -07:00
Vinit Nayak e568781206 Support A11y contextual button
Also migrate to only using sysui state flags
for ime/switcher visibility instead of 2 separate
methods.

Bug: 180046394
Test: Tested w/ 1 a11y service, then 2 services for
long click. Tested with IME switcher enabled and then
also suggested rotation button.
A11y takes precedence over IME switcher, but rotation button
takes precedence over a11y as is in phone mode today.

Change-Id: I9289165c8ca98d7ee432bd7145122d6a519600f6
2021-06-08 11:25:44 -07:00
Sunny Goyal d5500548dc Revert^2 "Moving taskbar lifecycle to TouchInteractionService"
430465a3d5
Bug: 187353581
Change-Id: I7b2280d16adfafd3e85ffc1d22e32d0c00d12b67
2021-05-21 07:05:02 +00:00