Commit Graph

15633 Commits

Author SHA1 Message Date
Ivan Tkachenko e4e39296ec Merge "Bubble bar drag to dismiss" into udc-qpr-dev am: e3d4a69749
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23879277

Change-Id: I82bd9a7499ddd73b9df80106a943a534690c3164
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 17:43:23 +00:00
Ivan Tkachenko e3d4a69749 Merge "Bubble bar drag to dismiss" into udc-qpr-dev 2023-07-12 17:13:50 +00:00
Liran Binyamin d93bb84d9d Merge "Don't show the bubble bar when it is empty" into udc-qpr-dev am: 7dd280eef3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24024252

Change-Id: I7c6a545a1fc71ccbb74d97f702a6a9bc04852ac0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 15:34:12 +00:00
Liran Binyamin 7dd280eef3 Merge "Don't show the bubble bar when it is empty" into udc-qpr-dev 2023-07-12 15:09:21 +00:00
Liran Binyamin f8fcd3c9a6 Merge "Pass bubble bar offsets instead of position to WMShell" into udc-qpr-dev am: 2c1e84b3a1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24012984

Change-Id: Id2ca1b1de161e71bea2978e3231f4f1bba2cc22a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 14:55:22 +00:00
Liran Binyamin 2c1e84b3a1 Merge "Pass bubble bar offsets instead of position to WMShell" into udc-qpr-dev 2023-07-12 14:41:32 +00:00
Ivan Tkachenko eceb797d2f Bubble bar drag to dismiss
* Added dismiss view to the taskbar
* Bubble drag to dismiss of:
  * A single bubble when the bubble bar stack is expanded
  * All bubbles when the bubble bar stack is colapsed
* Added dismiss related calls to WMShell in SystemUI through SystemUIProxy

Bug: 271466616
Test: manual, TBD
Flag: WM_BUBBLE_BAR
Change-Id: Ibb62a0b1ab9fafa8a3acf07450ce2132ed605adc
2023-07-12 07:13:12 +01:00
Mady Mellor 1bbcc8a90d Merge changes from topic "mm_bubbleInfoFlags" into udc-qpr-dev am: db3cdd4e97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24010039

Change-Id: Ic0e5a9ce061e1bc892a021c09153572e0c7b164d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 01:17:28 +00:00
Mady Mellor 36eb8b089d Handle any image / label changes for bubble updates in bubble bar am: 1812924a53
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24010038

Change-Id: Ib7d204f2bd06f8474613b134d25e9ff08e32c74d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-12 01:17:25 +00:00
Mady Mellor db3cdd4e97 Merge changes from topic "mm_bubbleInfoFlags" into udc-qpr-dev
* changes:
  Show / hide the "update" dot on bubbles in bubble bar
  Handle any image / label changes for bubble updates in bubble bar
2023-07-12 01:00:10 +00:00
Vinit Nayak d9fd3f2e58 Merge "Dismiss split select when tapping on home button" into udc-qpr-dev am: 64f3766ba7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23986000

Change-Id: I6728ffc217017fad591b0ada439b4587197d6352
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 23:28:35 +00:00
Vinit Nayak 64f3766ba7 Merge "Dismiss split select when tapping on home button" into udc-qpr-dev 2023-07-11 23:06:47 +00:00
Mady Mellor c299ad645a Show / hide the "update" dot on bubbles in bubble bar
Updates BubbleView to include logic to render the update dot on a
bubble. This only shows for BubbleBarBubbles, not the overflow.

We only show the dot (and the badge) when:
- the bubble has new content / appropriate flags set
- AND the bubbles are expanded
  OR on the first bubble when bubbles are collapsed
- AND when the flyout is not animating (this bit doesn't exist yet)

If a bubble has a dot and is opened, the dot will animate away.
To do this, we update the flags set on a bubble.

The flag needs to be set on WMShell side as well as Launcher side.
When a bubble is shown by WMShell, it automatically updates the flag.
This CL adds code to update the flag on Launcher side when we call
into WMShell to show the bubble.

Test: manual
Bug: 269670235
Change-Id: I32f652effa9a73c567981aa5a2a5864e9c3c0c66
2023-07-11 15:09:29 -07:00
Liran Binyamin 05ef774e6e Don't show the bubble bar when it is empty
Sometimes the bubble bar shows when the launcher process starts up
even when there are no bubbles.

bubblesShowingOnHome is set to true when the launcher transitions into
Home, but that state also triggers a call to showBubbleBar() which will
eventually set the visibility on the bar.
During initialization we also call setHiddenForNoBubbles to hide the bubble
bar if it's empty, but these events happen separately so the bar may or
may not be hidden.

This change avoids calling showBubbleBar when setBubblesShowingOnHome is
called and the bar is invisible. Instead the bubble bar will become visible
once bubbles are added.

Fixes: 290608658
Test: manual
       - Toggle bubbles off and back on in settings
       - Restart launcher
       - Observe the bubble bar is not displayed
Change-Id: I30640764d7b6eae64e1c5b5c687760465bf9a7b1
2023-07-11 17:12:00 -04:00
Liran Binyamin 1c03ed001d Pass bubble bar offsets instead of position to WMShell
This allows WMShell to calculate the position of the expanded view
correctly when the bubble bar is being expanded from stashed.

Test: See ag/24012908
Change-Id: I7b917e761c827135942d918917c920b06650f496
2023-07-11 17:08:09 -04:00
Mady Mellor 1812924a53 Handle any image / label changes for bubble updates in bubble bar
When we get an update to a bubble it could mean that there's a new
message OR that something about the visual representation changed.

This CL modifies BubbleBarController to handle any visual changes
that might have occurred to an updated bubble (e.g. bubble image
changed).

It does this by updating the bubbleInfo on the existing bubble.

Test: manual
Bug: 269670235
Change-Id: I03d2510aef335dafccb32d6adcd4c6adf8b3297d
2023-07-11 13:34:46 -07:00
Mady Mellor ecf080eb5c Merge "Unify calls to sysuiProxy#showBubble into one method" into udc-qpr-dev am: 3e952e034c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24010037

Change-Id: Id9470422fa6e14e59432ef859cde823b3f588aa7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 20:28:39 +00:00
Brian Isganitis 8d3ea8eeb5 Merge "Revert "Revert "Provide AllApps item OnLongClickListener through ActivityContext.""" into udc-qpr-dev am: 1a50287c08
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24024243

Change-Id: I3a0e4e72548414078c673742ff1d3768cffc94ea
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 20:28:15 +00:00
Mady Mellor 3e952e034c Merge "Unify calls to sysuiProxy#showBubble into one method" into udc-qpr-dev 2023-07-11 20:24:14 +00:00
Brian Isganitis f54c6fa4b4 Revert "Revert "Provide AllApps item OnLongClickListener through ActivityContext.""
This reverts commit 853a5b9e0c.

Fixes SecondaryDisplayLauncher class by using lambda instead of method
reference for #getAllAppsItemLongClickListener. This change is necessary
because mDragLayer is late-init.

Test: Home Settings > Developer Options > Launch Secondary Display
Bug: 289261756
Flag: No
Change-Id: I7b83f81651dde360edea6ee7bea6cc82441e6bef
2023-07-11 13:21:47 -04:00
David Saff 20d1f741b9 Merge "Revert "Provide AllApps item OnLongClickListener through ActivityContext."" into udc-qpr-dev am: aaf3094540
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24017969

Change-Id: I1048ccfe13a8b888d5c3dd6384cb801623e1c7e3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-11 13:12:21 +00:00
David Saff aaf3094540 Merge "Revert "Provide AllApps item OnLongClickListener through ActivityContext."" into udc-qpr-dev 2023-07-11 12:32:36 +00:00
David Saff 853a5b9e0c Revert "Provide AllApps item OnLongClickListener through ActivityContext."
This reverts commit 0acab2532d.

Reason for revert: b/290403189

Change-Id: Ie3f67f78a8ffce8c2d5a92f65a7e74d788c82a81
2023-07-11 10:45:33 +00:00
Mady Mellor 4e0ec1e458 Unify calls to sysuiProxy#showBubble into one method
This will make it easier to note that a bubble has been "visited"
so that we can hide the update dot (coming in future CL).

Test: manual
Bug: 269670235
Change-Id: Ie2dbbc478198ece65c05927295d3c3031a7be82e
2023-07-10 13:38:15 -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
Tracy Zhou 35fd1517bc Merge "Fix icon not showing in staged split from keyboard shortcut" into udc-qpr-dev am: 10b5a3903a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23996760

Change-Id: Iceb6e903bd2c83a87b8ebe5289ed4fbfcb324fc6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 17:48:09 +00:00
Tracy Zhou 10b5a3903a Merge "Fix icon not showing in staged split from keyboard shortcut" into udc-qpr-dev 2023-07-10 17:31:55 +00:00
Liran Binyamin 6964b6633b Merge "Pass the bubble bar screen coordinates to WMShell" into udc-qpr-dev am: 57d68b4834
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23984264

Change-Id: I34a294754edc7c9b8c90a7efb1193b6f29117146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-10 16:23:53 +00:00
Liran Binyamin 57d68b4834 Merge "Pass the bubble bar screen coordinates to WMShell" into udc-qpr-dev 2023-07-10 15:44:35 +00:00
Tracy Zhou da6a625f46 Fix icon not showing in staged split from keyboard shortcut
Bug: 246661484
Test: https://screenshot.googleplex.com/8X6ggCoYPD8rzSp
Change-Id: I0fa592b1a027769fd09a6de803ea44f5ae915f43
2023-07-08 13:59:12 -07:00
Bill Yi 0e7e197e96 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-07-08 17:48:48 +00:00
Winson Chung cb98339501 Merge "Fix an issue with nav bar translations not being updated" into udc-dev am: a53261b9cd am: a8e08175ad am: 55eedd4e5c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923806

Change-Id: If404ec948a6fff8ac68098054bfe0fe0a3ebd763
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:28:58 +00:00
Winson Chung 1913610652 Ignore recents transition if there are no closing tasks am: 6f7e15ff64 am: b06c5f7a2b am: 216d00531d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23909000

Change-Id: I0e42233fa908a30c2d25e8811578ecc6866c81a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:28:00 +00:00
Brian Isganitis 0ea37669bd Merge "Provide AllApps item OnLongClickListener through ActivityContext." into udc-qpr-dev am: ea206bbad5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23836392

Change-Id: I4ccee814359e38aae2b552bec4cfbe21b988327a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:27:19 +00:00
Winson Chung 55eedd4e5c Merge "Fix an issue with nav bar translations not being updated" into udc-dev am: a53261b9cd am: a8e08175ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23923806

Change-Id: Id330daa9c44cad3ef1733ba2319a8b69260ef99b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:01:36 +00:00
Winson Chung 216d00531d Ignore recents transition if there are no closing tasks am: 6f7e15ff64 am: b06c5f7a2b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23909000

Change-Id: I69a9a85e57bc1282179f979b073e0e3dab8d59c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 20:01:25 +00:00
Brian Isganitis ea206bbad5 Merge "Provide AllApps item OnLongClickListener through ActivityContext." into udc-qpr-dev 2023-07-07 19:43:01 +00:00
Winson Chung a53261b9cd Merge "Fix an issue with nav bar translations not being updated" into udc-dev 2023-07-07 18:33:16 +00:00
Liran Binyamin 469fef61ab Pass the bubble bar screen coordinates to WMShell
This allows WMShell to store the bubble bar coordinates so that it
draw the expanded view above it.

Fixes: 290099589
Test: Manual
       - Add bubbles to the bubble bar
       - Expand the bubble bar
       - Observe that there is enough space between the bar and the
         expanded view
Change-Id: Iff40b2b71369f33f343eb069e119f65723a6984e
2023-07-07 16:52:04 +00:00
Bill Yi 439a169aec Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I3d931b84ef6418dea70056c6f7dcadb08e7ad75c
2023-07-07 04:32:27 -07:00
Sunny Goyal 2da6e6d572 Merge "Fixing crash when using multi-window" into udc-qpr-dev am: 229b2efbae
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23924146

Change-Id: Ia921e7f93117a091252936429a955704d0c6a754
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 03:19:31 +00:00
Sunny Goyal 229b2efbae Merge "Fixing crash when using multi-window" into udc-qpr-dev 2023-07-07 03:16:13 +00:00
Vinit Nayak fc85ff02fb Merge "Add support for taskbar phone 3 button seascape" into udc-qpr-dev am: ea12af617e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23623277

Change-Id: I884e7f794448ec2f74cceb9e45be7ca12a9e718c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-07 00:18:29 +00:00
Vinit Nayak ea12af617e Merge "Add support for taskbar phone 3 button seascape" into udc-qpr-dev 2023-07-06 23:18:07 +00:00
Vinit Nayak 3fbee6358c Merge "Reset split selection state when swiping to home" into udc-qpr-dev am: 781077ddff
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23848172

Change-Id: Id635fb83f23621542dbd0cb882e3c04870952792
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-07-06 22:59:50 +00:00
Sunny Goyal 90bf1f4298 Fixing crash when using multi-window
Bug: 290170868
Test: Verified on device
Flg: N/A
Change-Id: If9129a3a47d651755cc99dfcfc0e9be69c2ca63c
2023-07-06 15:23:06 -07:00
Vinit Nayak 781077ddff Merge "Reset split selection state when swiping to home" into udc-qpr-dev 2023-07-06 22:14:41 +00:00
Brian Isganitis 0acab2532d Provide AllApps item OnLongClickListener through ActivityContext.
This cleans up how alternative AllApps implementations such as Taskbar
and SecondaryDisplay override the default INSTANCE_ALL_APPS listener.
This change will also be helpful for Toast in Taskbar drag-n-drop.

Test: Manual
Bug: 289261756
Flag: n/a
Change-Id: I55eb881bcd1e210852d435a3ea2a6686ce0a9838
2023-07-06 22:12:20 +00: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
Winson Chung ccd359d76c Fix an issue with nav bar translations not being updated
- There are flows where the shared taskbar state is updated prior
  to being destroyed, and not updated to the latest values when
  the taskbar is recreated.

  ie.
    unfolded -> lock screen -> LauncherTaskbarUiController's
      mTaskbarInAppDisplayProgress[SYSUI_SURFACE_PROGRESS_INDEX]
      is set to 1 due to the notif shade (lockscreen) showing.
      This is written into TaskbarSharedState's sysuiStateFlags
      and inAppDisplayProgressMultiPropValues.
    fold -> TaskbarActivityContext is destroyed
    unlock -> TaskbarManager and TaskbarSharedState's
      sysuiStateFlags are updated while the device is folded
    unfold -> TaskbarActivityContext is recreated and initialized
      which restores from the shared state's
      inAppDisplayProgressMultiPropValues. It also tries to reapply
      the shared state's sysuiStateFlags, but this doesn't update
      inAppDisplayProgressMultiPropValues because the state's
      "enabled" state is not updated (default is no flag set, and
      lockscreen sysui state is not set anymore).
    -> The restored inAppDisplayProgressMultiPropValues value
       results in the wrong translation.

- Note that after the above, the NavbarButtonsViewController state
  is actually correct and reflects the SysUI state, but the
  LauncherTaskbarUiController state is wrong.  This CL tries to
  manually update the ui controller to the correct state when it
  is recreated.
- CL also fixes a separate issue where LauncherTaskbarUIController
  could potentially overwrite the saved state progresses while
  restoring them due to the state callback being called

Bug: 283346744
Test: Unfold -> Lockscreen -> Fold -> Unlock -> Unfold and ensure
      the buttons are translated correctly



Change-Id: I43e473faf4fa2a493b9705506e3755df8f6264e7
Signed-off-by: Winson Chung <winsonc@google.com>
2023-07-06 22:01:49 +00:00