Commit Graph

11086 Commits

Author SHA1 Message Date
Pat Manning 6784e09204 Merge "Check taskbar stash state for hover only on hover events." into udc-qpr-dev am: bd4e77ccf7 am: 9180b92d8e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24420598

Change-Id: I528c980856b8dcb6c02593893da7bb7846eb503c
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 19:25:31 +00:00
Tony Wickham 0c91338815 Merge "Remove Change Navigation Mode option for Taskbar Divider Popup Menu" into udc-qpr-dev-plus-aosp 2023-08-21 19:01:15 +00:00
Pat Manning 9180b92d8e Merge "Check taskbar stash state for hover only on hover events." into udc-qpr-dev am: bd4e77ccf7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24420598

Change-Id: I42f9e17bd7123e116457b5758372f67d5f852316
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-21 18:47:22 +00:00
Tony Wickham 5841b168fb Add null check for mRecentsView when recents animation is canceled
Flag: none
Test: TaplTestsPersistentTaskbar#testHideTaskbarPersistsOnRecreate
Fixes: 295796661
Change-Id: Idb454105cc86f1b9dbe720ba0ee28ad03436ec14
2023-08-21 18:46:44 +00:00
Pat Manning bd4e77ccf7 Merge "Check taskbar stash state for hover only on hover events." into udc-qpr-dev 2023-08-21 18:18:10 +00:00
Andreas Agvard a8a71f36f5 Merge "Prevent long press nav handle invocation when quick switching between apps." into udc-qpr-dev am: 31689cad69 am: 37ba5dd025
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24483110

Change-Id: Ibc3e75990f5a68d74572b8044ee4a5163396ddfe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-19 10:25:52 +00:00
Andreas Agvard 37ba5dd025 Merge "Prevent long press nav handle invocation when quick switching between apps." into udc-qpr-dev am: 31689cad69
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24483110

Change-Id: I0996c639d301f253fad780a6396e71d3c5bf1e73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-19 09:50:07 +00:00
Andreas Agvard 31689cad69 Merge "Prevent long press nav handle invocation when quick switching between apps." into udc-qpr-dev 2023-08-19 09:16:13 +00:00
Mateusz Cicheński 44abf2e7a7 Merge "Remove fling gesture related flags for PiP and Bubbles" into udc-qpr-dev am: cdb5f1036b am: 3744f3713c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448712

Change-Id: I68ca5003f650855e1959bc44e2aa73ff6623a9f1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-19 02:58:30 +00:00
Mateusz Cicheński 3744f3713c Merge "Remove fling gesture related flags for PiP and Bubbles" into udc-qpr-dev am: cdb5f1036b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448712

Change-Id: Ic9b709185d5b63fdf252f4f5edcb5d44a8327fdb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-19 02:25:05 +00:00
Mateusz Cicheński cdb5f1036b Merge "Remove fling gesture related flags for PiP and Bubbles" into udc-qpr-dev 2023-08-19 01:52:27 +00:00
Treehugger Robot 2c206acb8b Merge "Fix crash if Launcher destroyed before AbsSwipeUpHandler invalidated" into udc-qpr-dev am: fae0011590 am: cd5b6ee62e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24486312

Change-Id: I1c94a2bc322854ec78e9dfea3a243199a08ea2ca
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-19 00:22:50 +00:00
Treehugger Robot cd5b6ee62e Merge "Fix crash if Launcher destroyed before AbsSwipeUpHandler invalidated" into udc-qpr-dev am: fae0011590
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24486312

Change-Id: Id2091827cfa29e7f051609cc571fcb9c17a4d0d8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 23:48:12 +00:00
Treehugger Robot fae0011590 Merge "Fix crash if Launcher destroyed before AbsSwipeUpHandler invalidated" into udc-qpr-dev 2023-08-18 23:10:55 +00:00
Tony Wickham 7e9cfdf254 Fix crash if Launcher destroyed before AbsSwipeUpHandler invalidated
Test: manually call finish() in onActivityInit(), no crash when
handler is subsequently invalidated (did crash before this change)
Flag: None
Fixes: 295796661

Change-Id: I2dac7ca87bcdb700da2387309d5ad1d2f4ef43d7
2023-08-18 21:44:52 +00:00
Andreas Agvard 96beb83bee Prevent long press nav handle invocation when quick switching between apps.
Bug: 296616400
Test: Manual
Change-Id: Ic393014e0eb834e60414d6ce9fcdf3d91cb1667a
2023-08-18 22:06:20 +02:00
Jagrut Desai a26500b145 Remove Change Navigation Mode option for Taskbar Divider Popup Menu
- Breakout CL part 3
- This is a breakout cl from ag/24272821 to make it more readable and atomic.
- This cl consist removal of an option from taskbar divider popup meu which is no longer required and other changes regarding the removal like ripple.

Test: Manual, Visual
Bug: 265170176
Flag: ENABLE_TASKBAR_PINNING
Merged-In: I3664df7a134cc0eb5b4ed856c7e0730ef1b75dea
Change-Id: I3664df7a134cc0eb5b4ed856c7e0730ef1b75dea
2023-08-18 16:57:08 +00:00
Pat Manning 3447016c66 Check taskbar stash state for hover only on hover events.
Fix: 293419351
Test: TaplTestsTransientTaskbar.
Flag: ENABLE_CURSOR_HOVER_STATES
Change-Id: I86d166d71dc5d41a7c4e450584e8948db96bf199
2023-08-18 14:45:48 +00:00
Jagrut Desai 15ab7a24e8 Merge "Correcting Taskbar Icon Layout bounds when Taskbar Divider is present" into udc-qpr-dev am: d34fe6d60c am: 14b1fdfba3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24449989

Change-Id: I18e197ed288d1e5835bb5aeb32c29fda433e0ca7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 05:05:49 +00:00
Jagrut Desai e198d44e15 Merge "Refactor taskbar divider view to IconButtonView" into udc-qpr-dev am: 6341a7e31c am: 5150489fc0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448722

Change-Id: I9f2651ebb0df4053c421f34cc49053a9fe5a8726
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 05:05:12 +00:00
Jagrut Desai 8d326473a6 Remove Change Navigation Mode option for Taskbar Divider Popup Menu
- Breakout CL part 3
- This is a breakout cl from ag/24272821 to make it more readable and atomic.
- This cl consist removal of an option from taskbar divider popup meu which is no longer required and other changes regarding the removal like ripple.

Test: Manual, Visual
Bug: 265170176
Flag: ENABLE_TASKBAR_PINNING
Merged-In: I3664df7a134cc0eb5b4ed856c7e0730ef1b75dea
Change-Id: I3664df7a134cc0eb5b4ed856c7e0730ef1b75dea
2023-08-17 21:35:09 -07:00
Jagrut Desai 14b1fdfba3 Merge "Correcting Taskbar Icon Layout bounds when Taskbar Divider is present" into udc-qpr-dev am: d34fe6d60c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24449989

Change-Id: Id33faabee0866eb3c79e31924db47142480d8ebe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 04:33:39 +00:00
Jagrut Desai 5150489fc0 Merge "Refactor taskbar divider view to IconButtonView" into udc-qpr-dev am: 6341a7e31c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448722

Change-Id: Iad6d36b0be4db056958f4c38327b68faa7f78df3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-18 04:33:26 +00:00
Jagrut Desai f74f341b9b Merge "Remove Change Navigation Mode option for Taskbar Divider Popup Menu" into main 2023-08-18 04:17:21 +00:00
Jagrut Desai d34fe6d60c Merge "Correcting Taskbar Icon Layout bounds when Taskbar Divider is present" into udc-qpr-dev 2023-08-18 04:16:36 +00:00
Jagrut Desai 6341a7e31c Merge "Refactor taskbar divider view to IconButtonView" into udc-qpr-dev 2023-08-18 04:16:13 +00:00
Matt Sziklay 175c6eb14f Merge "Create IconView for generated TaskIdAttributeContainers." into udc-qpr-dev am: 370db6f198
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24249226

Change-Id: I2bbc2984208a3b7081343ef76928130d4cbf48fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 23:42:25 +00:00
Matt Sziklay 370db6f198 Merge "Create IconView for generated TaskIdAttributeContainers." into udc-qpr-dev 2023-08-17 23:32:15 +00:00
Jagrut Desai 8923830f74 Remove Change Navigation Mode option for Taskbar Divider Popup Menu
- Breakout CL part 3
- This is a breakout cl from ag/24272821 to make it more readable and atomic.
- This cl consist removal of an option from taskbar divider popup meu which is no longer required and other changes regarding the removal like ripple.

Test: Manual, Visual
Bug: 265170176
Flag: ENABLE_TASKBAR_PINNING
Change-Id: I3664df7a134cc0eb5b4ed856c7e0730ef1b75dea
2023-08-17 22:13:49 +00:00
Mateusz Cicheński 437d3fbe15 Remove fling gesture related flags for PiP and Bubbles
Bug: 296239686
Bug: 296239159
Test: verify that fling to dismiss bubble still works
Change-Id: Ib9ad3df26dc4295493510dd8dbbcfbc939924a72
2023-08-17 21:38:23 +00:00
mattsziklay 14d49a368e Specify stage and bounds for desktop split.
Introduces fields in onRequestSplitSelect to specify split stage and
freeform bounds for a split select event.

Bug: 279586624
Flag: ENABLE_SPLIT_FROM_DESKTOP_TO_WORKSPACE
Test: Manual
Change-Id: I6066a0a1f9d9d76b1380e1afe9e22bb78549920e
2023-08-17 21:04:21 +00:00
Xin Li 41dd5f48d6 Merge Android U (ab/10368041)
Bug: 291102124
Merged-In: Ia7c5c2101a30d0eaae0fc92801186e66baec449d
Change-Id: Ic9654f2c43bbfb878e3f46eb39698b570fb8dd44
2023-08-17 12:13:35 -07:00
Mateusz Cicheński 79b7a17444 Merge "Remove enable_pip_keep_clear_algorithm flag" into udc-qpr-dev am: 4573658e7b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447708

Change-Id: I2ea5dd40e06ba72ae556984320bef4e940d3f56b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 19:10:45 +00:00
Mateusz Cicheński 4573658e7b Merge "Remove enable_pip_keep_clear_algorithm flag" into udc-qpr-dev 2023-08-17 18:27:21 +00:00
Wei Sheng Shih e457c6d5bb Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev am: e6866f3f32
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24458447

Change-Id: I3eeafd70e622d6696ac82a7d4ae16a1e748d8dd9
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 06:46:24 +00:00
Wei Sheng Shih e6866f3f32 Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev 2023-08-17 06:34:03 +00:00
wilsonshih 6df52eb6f9 Fix NPE crash when using MockProperties
Override the setShow method in MockProperties as it is used for invalid
surface.

Bug: 295775097
Test: build
Change-Id: Id601fa3ce7408f236c77e41ccd60b7d8359c2e8c
2023-08-17 12:09:33 +08:00
Sunny Goyal 746613f591 Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing" into udc-qpr-dev am: c480860744
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448719

Change-Id: Ifc40189607fa0c02c6ff7ad14b853af460cac6d4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 00:26:46 +00:00
Sunny Goyal c480860744 Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing" into udc-qpr-dev 2023-08-16 23:36:10 +00:00
Jagrut Desai e6a895ed6c Correcting Taskbar Icon Layout bounds when Taskbar Divider is present
- Breakout CL part 2
- This is a breakout cl from ag/24272821 to make it more readable and atomic.
- This cl consist of change to correct the icon layout bound calculation when taksbar divider line is present in taskbar view.

Test: Manual, Visual
Bug: 265170176
Flag: ENABLE_TASKBAR_PINNING
Change-Id: I259faf2cc0aa302b83337d104c4820885b925a6a
2023-08-16 13:50:08 -07:00
Treehugger Robot f4bbe54f97 Merge "Revert "Prevent setting mIsStashed in TaskbarStashController"" into udc-qpr-dev am: 12cd6076d3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447385

Change-Id: I9719eb5349bc4a0cbbfde7383c11d3b56d5f4077
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 20:43:49 +00:00
Jagrut Desai 579188aee0 Refactor taskbar divider view to IconButtonView
- Breakout CL part 1
- This is a breakout cl from ag/24272821 to make it more readable and atomic.
- This cl consist refactoring of Taskbar Divider Line to be using IconButtonView.

Test: Manual, Visual
Bug: 265170176
Flag: ENABLE_TASKBAR_PINNING
Change-Id: I6719dd568986dce7cf9cdf0f287c3f079fd35ba6
2023-08-16 13:11:14 -07:00
Treehugger Robot 12cd6076d3 Merge "Revert "Prevent setting mIsStashed in TaskbarStashController"" into udc-qpr-dev 2023-08-16 20:03:00 +00:00
Sunny Goyal 57a83b5732 Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing
Bug: 281873427
Test: N/A
Flag: N/A
Change-Id: I7745b8b7d7b48fa5a4f58e8db7e99865226e81d5
2023-08-16 12:30:27 -07:00
Vinit Nayak a725e48879 Revert "Prevent setting mIsStashed in TaskbarStashController"
This reverts commit 51a210d787.

Reason for revert: test may have been fixed before this got merged, will merge revert to confirm

Change-Id: Ib26b94af971eceb02e6bf58f39a578ee04eb72e8
2023-08-16 18:45:51 +00:00
Mateusz Cicheński 23ed054a6d Remove enable_pip_keep_clear_algorithm flag
Bug: 296239520
Test: presubmit, removing flag
Change-Id: I135d4b5fedaf094dd136924655d55c70616fa838
2023-08-16 17:55:14 +00:00
Hongwei Wang 247a2cfe03 Merge "Cleanup ENABLE_PIP_APP_ICON_OVERLAY" into udc-qpr-dev am: 3ca497b646
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24435526

Change-Id: I59f4e0f1051b5f96c7a5e4d3834ccb497cb31711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-16 17:22:07 +00:00
Hongwei Wang 7aded94e94 Cleanup ENABLE_PIP_APP_ICON_OVERLAY
Bug: 296125301
Test: manual, enter PiP from Google Maps
Change-Id: I571fd5450ccf00232c450d82d32783beb99cfecf
2023-08-15 15:44:39 -07:00
mattsziklay 56329b03cf Create IconView for generated TaskIdAttributeContainers.
When creating a TaskIdAttributeContainer for a desktop task, creates an
IconView to avoid an NPE when picking a desktop app as the second split
target (see TaskBarUIController#triggerSecondAppForSplit).

Test: Select an app open in Desktop Mode as the second split target.
Bug: 279586624
Change-Id: I1949d923523b6e9e6112b3e909edf1e8d632b3e2
2023-08-15 10:06:05 -07:00
Sunny Goyal 0ae8f5c91d Merge "Removing some unused overrides in Launcher" into udc-qpr-dev am: 12bf58feb9
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24407042

Change-Id: I113cc9bb779a3d09d1e2914c85d249695ffba931
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 21:02:39 +00:00