Commit Graph
244 Commits
Author SHA1 Message Date
Sihua Ma 8fc266d063 Move tests to multivalent
Test: SysUI studio
Test: atest NexusLauncherRoboTests
Flag: EXEMPT test migration
Change-Id: Idd9e52f281d955e87f6db638ebfd8218a4dcb77f
2025-01-17 00:04:27 +00:00
Saumya Prakash 26bceb527e Merge "Avoid per task app icons in Taskbar for desktop mode" into main 2025-01-15 14:18:38 -08:00
Treehugger Robot bc3995222b Merge "Moving DisplayController to dagger" into main 2025-01-14 13:39:19 -08: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
Saumya Prakash aabcfa27ae Avoid per task app icons in Taskbar for desktop mode
Until Taskbar multi instance support was in place, Taskbar would show
multiple icons for different instances of the same app in desktop mode.
Now this is no longer needed as taskbar has multi instance support, so
now there is only one icon per instance of an app of the same user.

Fix: 382589460
Test: Started several Chrome windows -> Taskbar has 1 icon for chrome
Flag: com.android.launcher3.enable_multi_instance_menu_taskbar
Change-Id: I2df4327dcdc9d221164055ebc33ff508273e7ef9
2025-01-13 22:37:25 +00:00
Mykola Podolian 987de5534e Merge "Hide bubble bar stash handle when the notification shade is open." into main 2025-01-13 11:40:18 -08:00
mpodolian f1186f9d14 Hide bubble bar stash handle when the notification shade is open.
Introduced logic to control the bubble bar stash handle alpha based on
the notification shade state.

Test: TransientBubbleStashControllerTest
Test: Manual. Have bubbles and the bubble bar stashed. Open the
notification shade, observe that the stash handle fades away. Close the
notification shade, observe that the stash handle fades back in.
Have few bubbles, open bubbles test app, click on bubble icon. Observe
the bubble bar expands without blinking.
Test: Manual.
http://recall/-/gx8ASgewUeUS3QYohfrd1J/e1iUtwaFdezKOb0gBRff7Z
Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 376140839
Fixes: 376141264

Change-Id: Id9c473f9aead0e4c5830793d9f3b0b1ae86453e7
2025-01-10 14:33:30 -08:00
Mykola Podolian 11fcd29cdf Merge changes I8ec01d69,If2366ec1,I8321e2f5 into main
* changes:
  Take bubble selection from the shell update.
  Fix bubbles animation when the new bubble added and old bubble removed.
  Fix arrow animation when the new bubble added and old bubble removed.
2025-01-10 14:28:52 -08:00
mpodolian 631da72a2a Fix arrow animation when the new bubble added and old bubble removed.
The AddingAndRemoving animation now uses a newly selected bubble index
and added bubble index arguments.

Test: BubbleAnimatorTest
Test: Manual. Enable optional overflow bubble.
Create a bubble bar with overflow containing a single
bubble. Open the overflow menu and click an overflow bubble icon.
Observe that a new bubble is added and immediately expands while the
overflow bubble is collapsing. Observe that the arrow animates to the
new bubble's position.
Test: Manual. Have few bubbles in the bubble bar. Collapse any bubble.
Observe arrow animated correctly to the newly selected bubble position.
Flag: com.android.wm.shell.enable_bubble_bar
Bug: 359952121

Change-Id: I8321e2f532189e7599b029083199e034e38080e3
2025-01-08 17:26:06 -08:00
Treehugger Robot eb453571d9 Merge "Converting DesktopVisibilityController to a singleton" into main 2025-01-06 12:05:48 -08:00
Mykola Podolian 8b3f1e1c3f Merge "Fix bubble added from the overflow background arrow animation." into main 2025-01-04 10:24:15 -08:00
mpodolian 7f88d9fc83 Fix bubble added from the overflow background arrow animation.
The new bubble animation now uses a "selected location" argument to
position the pointing arrow.

Test: BubbleAnimatorTest
Test: Manual. Create a bubble bar with overflow. Open the overflow menu
and click an overflow bubble icon. Observe that a new bubble is added
and immediately expands. Observe that the arrow animates to the new
bubble's position.
Test: Manual. Create a bubble bar with overflow. Open any bubble.
Trigger a new bubble notification. Observe that a new bubble is added
but does not expand, so the arrow remains at the currently open bubble.
Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 359952121

Change-Id: I47f5b6c2aad775f2dd3e70f8c544a3711f192342
2025-01-03 16:22:27 -08:00
Sunny Goyal 6d6529cff9 Merge "Converting LauncherPrefs to dagger" into main 2025-01-03 14:18:19 -08:00
Sunny Goyal e79d453bc8 Converting LauncherPrefs to dagger
Fixing ENABLE_TWOLINE_ALLAPPS_TOGGLE not properly tied to IDP:
http://recall/-/ep7WJ8pKwCEklUN5J1mAkM

Bug: 361850561
Flag: EXEMPT dagger-migration
Test: atest LauncherPrefsTest FakeLauncherPrefsTest
Change-Id: Iba63d060f4a8c2e31033fca2a4638c559c161338
2025-01-03 13:49:53 -08:00
Liran Binyamin 65a045ca77 Fix flake in BubbleBarViewAnimatorTest
Flag: EXEMPT test only
Bug: 384807919
Test: atest BubbleBarViewAnimatorTest
Change-Id: I44b9d77f0b2803ef363f7931d07749961e416e27
2025-01-03 09:45:47 -05:00
Sunny Goyal ad61173ca2 Converting DesktopVisibilityController to a singleton
This avoids a persistant connection to TouchInteractionService from WMProxy,
which keeps the service alive all the time

Bug: 384896306
Test: Presubmit
Flag: EXEMPT bugfix
Change-Id: Id6fe59471c8c3f9874514f71126631f217ab610c
2024-12-30 12:54:19 -08:00
Liran Binyamin 0e767a2a87 Merge "Fix flake in BubbleBarViewAnimatorTest" into main 2024-12-26 08:37:31 -08:00
Treehugger Robot 64eb038059 Merge "Moving sysproxy to kotlin" into main 2024-12-20 11:44:23 -08:00
Brian Isganitis 1e6ffc8a08 Merge "Split up tests by actual hardware keyboard status." into main 2024-12-20 11:36:35 -08:00
Sunny Goyal 5df843476c Moving sysproxy to kotlin
Bug: 385171800
Test: Presubmit
Flag: EXEMPT refactor
Change-Id: I9db2d4a2f7ff6e739e389ce0e076d5ea88adad5c
2024-12-19 17:22:00 -08:00
Brian Isganitis 791944ff63 Merge "Disable model loading with Sandbox check instead of static boolean." into main 2024-12-19 15:32:56 -08:00
Liran Binyamin 11323f3b76 Fix flake in BubbleBarViewAnimatorTest
Tried scheduling ABTD multiple times but unfortunately ABTD failed
allocating resources.

Flag: EXEMPT test only
Bug: 384807919
Test: atest BubbleBarViewAnimatorTest

Change-Id: I4c48c034b1bd6c9e8f681fb72cc65a9e0aee2eb7
2024-12-19 12:52:30 -08:00
Liran Binyamin 8b102fe820 Merge "Fix handle color when interrupting the animation" into main 2024-12-19 10:04:52 -08:00
Sunny Goyal 60bad051c4 Fixing module inheritence when overriding Launcher component
Bug: 361850561
Flag: EXEMPT dagger migration
Test: Presubmit
Change-Id: I1f726e9895f6872d0294a11ab0c52c6c619c2a3f
2024-12-18 10:38:00 -08:00
Brian Isganitis a481af5779 Split up tests by actual hardware keyboard status.
Flag: TEST_ONLY
Bug: 230027385
Test: TaskbarStashControllerTest
Change-Id: I63fc433810af3993db5655571a11887eb2c68422
2024-12-10 19:08:36 -05:00
Brian Isganitis 002ef1f550 Disable model loading with Sandbox check instead of static boolean.
The static boolean also affects Taskbar within the Launcher process. We
only want this disabled for the Taskbar test Sandbox.

Flag: TEST_ONLY
Bug: 230027385
Test: NexusLauncherTests:com.android.launcher3.taskbar
Change-Id: Ife12e95ab34755d1aec42d79188c15232d8da092
2024-12-10 23:31:36 +00:00
Brian Isganitis 9c0552e09d Merge changes from topic "taskbar-view-recents-changes" into main
* changes:
  Move recents divider if hotseat is set after recents.
  Animate out/in the correct task view when recents change.
  Implement initial LayoutTransition for Taskbar recents.
2024-12-10 02:18:53 +00:00
Treehugger Robot 9bb546953c Merge "Adapt TaskbarOverflow tests to check items added overflow view" into main 2024-12-10 00:21:18 +00:00
Brian Isganitis c7f6cd6062 Move recents divider if hotseat is set after recents.
Fixes a bug where updateItems is first called with recents and then with hotseat. This causes the Taskbar to first be All Apps, Divider, and then Recents. The layout transition path assumes though that the Divider after All Apps is not for recents in this case, which is wrong. Due to this assumption, it skips over the divider and then adds the hotseat items after it (should be added before). Added a test for this case.

Flag: com.android.launcher3.taskbar_recents_layout_transition
Bug: 343521765
Test: go/testedequals
Change-Id: Ia690c71fe482709e35ab302a7b497bf547eb4478
2024-12-09 15:35:43 -05:00
Brian Isganitis 3c24c421f6 Animate out/in the correct task view when recents change.
Flag: com.android.launcher3.taskbar_recents_layout_transition
Bug: 343521765
Test: go/testedequals
Change-Id: I6c7708ed9f03eff8469b5f2e75ce00e545b03f54
2024-12-09 15:35:43 -05:00
Toni Barzic 7bea1821d4 Adapt TaskbarOverflow tests to check items added overflow view
Adds a step to verify that TaskbarOverflowView items get set to the list
of the least recent tasks. Adds test cases for an edge case where
taskbar hits max number of items event without recent tasks
(b/379774843).
Has a fix for a further edge case where taskbar overflow view could be
created with a single item (in which case we can just show that item
directly).

Bug: 379774843
Flag: com.android.launcher3.taskbar_overflow
Test: atest TaskbarOverflowTest

Change-Id: I004676da3e17f26b8110d14d39589c84a9f384d8
2024-12-06 19:39:47 +00:00
Liran Binyamin b94fce457e Fix handle color when interrupting the animation
Pass the correct stash value to the controller after interrupting
an ongoing animation due to stash state changing. We previously
incorrectly passed a value that depended on the alpha value of the
bubble bar. This allows sampling to happen and for the handle to
have the correct color.

Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 377604151
Test: atest BubbleBarViewAnimatorTest
Test: manual
       1. Create 1+ bubble
       2. Receive new message and see the flyout
       3. Open an app immediately (Don't wait until the flyout disappear)
Change-Id: I739bcbd8fe4f7e02285244d78d7159c571be1ec2
2024-12-06 16:22:30 +00:00
Liran Binyamin 0e14bb8ef9 Merge "Fix bubble bar flicker in initial animation" into main 2024-12-05 22:22:07 +00:00
Liran Binyamin 77827d3167 Fix bubble bar flicker in initial animation
When the first bubble animates in we make the bubble bar visible
before translating it below the screen to prepare for the spring
animation. This change defers updating the visibility letting the
animator notify when it's safe to update visibility.

Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 382296842
Test: atest BubbleBarViewAnimatorTest
Test: manual
       - dismiss bubble bar
       - send new bubble
       - observe bubble bar does not flicker
Change-Id: Ib611771dd9f315ab57ef00f8f6cb982b8b88ea73
2024-12-04 15:05:22 -05:00
Liran Binyamin 3931b671b4 Reset the bubble bar scale when the animation is interrupted
Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 381283214
Test: atest BubbleBarViewAnimatorTest
Test: manual
       - have a bubble in the bubble bar
       - launch an app
       - set animator scale to 5x to slow down animation
       - send a bubble
       - when the bubble bar animates interrupt the animation by
         touching the bubble bar
       - observe the bubble bar scale is reset correctly
Change-Id: I1abd81e3df987ba749a13eb1b7506d5c1d8fdddd
2024-12-02 11:23:35 -05:00
Liran Binyamin 495fe1d255 Merge "Animate the bubble bar on dismiss" into main 2024-12-02 14:28:30 +00:00
Alex Chau 9e52a665a6 Mock UserCache in TaskViewItemInfoTest to avoid NPE
- Also added test for runtimeStatusFlags on regular/private apps

Fix: 381295678
Test: TaskViewItemInfoTest
Flag: EXEMPT BUG_FIX
Change-Id: I928a8f128957885d33ac8001493eef0fd4b23ec7
2024-11-29 12:42:15 +00:00
Liran Binyamin 7e387fa505 Animate the bubble bar on dismiss
When the last remaining bubble is dismissed by drag or from the menu
we now fade out the bubble bar.

Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 347062801
Test: manual
       - create a single bubble in the bar
       - expand
       - dismiss by drag or from menu
       - observe animation
Change-Id: I86fcaf04c6f5949126744b81e0042b0e58318a13
2024-11-27 16:23:26 -05:00
Mykola Podolian 400fc4ad98 Merge changes I239f9357,I57a32ac5 into main
* changes:
  Update setting taskbar window height
  Set bubble bar aligned to QSB
2024-11-27 20:44:53 +00:00
Treehugger Robot d7b3369036 Merge "Ignore events that occur between app icons on the taskbar" into main 2024-11-27 20:22:17 +00:00
Liran Binyamin ed249f0451 Merge "Show the bubble bar edu view" into main 2024-11-27 20:09:07 +00:00
mpodolian 3111daf2f1 Update setting taskbar window height
Updated the logic to set the taskbar window height to accommodate the
bubble bar with its maximum flyout height before the bubble bar
animation begins. The height is reverted to the default value once the
animation is completed.

Fixes: 378400160
Flag: com.android.wm.shell.enable_bubble_bar
Test: Manual. Set 3-button navigation mode and have the QSB placed
above the hotseat. Send a notification that will display a bubble, and
observe the bubble bar animation and final placement aligned with the
QSB.
Next, set gesture navigation mode and repeat the flow above. Observe
that the bubble bar is aligned with the hotseat icons.
Felix video:
http://recall/-/gx8ASgewUeUS3QYohfrd1J/gYMVt0sH4si0KOpaBxIPem
Tangor video:
http://recall/-/gx8ASgewUeUS3QYohfrd1J/fz95MbjcjW3awStnuOl8BJ

Change-Id: I239f935743c3936fed44822c3c62652073ffefe2
2024-11-27 10:19:24 -08:00
mpodolian 28907bcbd6 Set bubble bar aligned to QSB
Change logic to updated bubble bar alignment with the QSB vertical
center for 3 buttons navigation mode.

Fixes: 378400160
Flag: com.android.wm.shell.enable_bubble_bar
Test: PersistentBubbleStashControllerTest
Test: TransientBubbleStashControllerTest
Test: Manual. Set the buttons navigation mode and observe that the
bubble bar is centered with the QSB when the QSB is not aligned with the
hotseat. Then, switch to gestures navigation mode and observe that the
bubble bar is centered with the hotseat when the QSB is not aligned with
the hotseat.

Change-Id: I57a32ac5bde7a7055b54a89727429424e5c0ca4f
2024-11-27 10:15:08 -08:00
Treehugger Robot 02038f4deb Merge "Log various TaskView properties in TaksContainer.itemInfo" into main 2024-11-27 12:59:31 +00:00
Alex Chau 09f2433253 Log various TaskView properties in TaksContainer.itemInfo
- Extracted itemInfo creation in to TaskViewItemInfo and added a test
- Created a standalone atom for TaskView, logging data we want (please refer to the bug)
- Convert TaskView atom to StatsLog data in StatsLogCompatManager
- Simplified DesktopSystemShortcutTest and ExternalDisplaySystemShortcutTest to avoid extra testing on DesktopModeStatus

Fix: 341320349
Test: TaskViewItemInfoTest, DesktopSystemShortcutTest, ExternalDisplaySystemShortcutTest
Flag: EXEMPT logging
Change-Id: Icf04ff2b1670c3f3d5f6a66f99c0d28314efaf21
2024-11-27 10:41:43 +00:00
Liran Binyamin c48b4ed025 Fix flake in BubbleBarViewAnimatorTest
100x run: http://ab/I70900010339337557

Flag: EXEMPT test only
Fixes: 381093181
Test: http://ab/I70900010339337557
Change-Id: Ifd126156d6e69f885b37487743e06d482c2e3921
2024-11-26 13:44:25 -05:00
Liran Binyamin 16a604fe0c Show the bubble bar edu view
We now show the bubble bar edu view after a request from shell
to show it was received, and as soon as the user performs a touch
gesture on the bubble bar or flyout that causes the bar to be
expanded.

The click listener on the bubble bar is removed with this change
because the input consumer already handles taps. Removing the
listener avoids processing the tap twice which causes the edu view
to not be displayed. Removing the click listener solves the issue
but ideally we should move the edu view to launcher since that
would allow us to manage its state easily.

Flag: com.android.wm.shell.enable_bubble_bar
Fixes: 374842575
Test: atest PersistentBubbleStashControllerTest
Test: atest BubbleBarSwipeControllerTest
Test: atest TransientBubbleStashControllerTest
Test: manual
       - force show the bar edu view
       - send a bubble
       - tap the bubble bar to expand
       - observe bubble bar edu is visible
       - repeat with swiping on the bar and tapping the flyout
       - launch an app
       - swipe up to show the taskbar
       - observe edu view not visible
       - send a bubble with auto expand
       - observe bubble bar expanded and edu view not visible
Change-Id: I98ec44e6edf6c69d6d47b5709140796c2ecab23e
2024-11-26 10:23:45 -05:00
Brian Isganitis f04ae6b09f Fix LayoutTransition All Apps divider logic for RTL.
We were checking the wrong index (off by one), leading to a crash if the divider is already in the Taskbar at the correct index. However, we do need to add it after the expected index if the divider isn't there, otherwise it will push the icon that is at that position to the right of the divider (it should be to the left).

Flag: com.android.launcher3.taskbar_recents_layout_transition
Bug: 343521765
Bug: 368522274
Test: go/testedequals
Change-Id: I0263f704728286b53da5b45828784b20aaae31ce
2024-11-21 23:38:00 +00:00
Artsiom Mitrokhin 7205b24938 Ignore events that occur between app icons on the taskbar
Bug: 297325541
Flag: com.android.launcher3.show_taskbar_pinning_popup_from_anywhere
Test: manual, flip the flag, long-click between taskbar items
Change-Id: If2ee00f31fcd1788bac2c2c0cd78ba1eada86115
2024-11-21 16:38:32 -05:00
Brian Isganitis c87f691e04 Prepare for LayoutTransition with RTL support.
Only remove divider when it needs to be removed or moved between All Apps and recents locations. Keep All Apps and QSB in Taskbar at all times. LayoutTransition does not work if views are being removed and then immediately readded (what current code branch does).
Overflow is not supported yet with the LayoutTransition flag.

Test: go/tested-equals
Flag: com.android.launcher3.taskbar_recents_layout_transition
Bug: 368522274, 343521765
Change-Id: I9ae1d7c52e853106cdf86329be6f221213e7cb86
2024-11-21 12:24:13 -05:00