Commit Graph

19593 Commits

Author SHA1 Message Date
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
Mateusz Cicheński 84ec5ada3d Merge "Remove enable_pip_keep_clear_algorithm flag" into udc-qpr-dev am: 4573658e7b am: 79b7a17444
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447708

Change-Id: I8b1cf1b096f7e2af066181067aa5306f720a7849
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 19:21:56 +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 cf08b8cbb7 Merge "Fix NPE crash when using MockProperties" into udc-qpr-dev am: e6866f3f32 am: e457c6d5bb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24458447

Change-Id: Idb897b9eabffe5467b600aae17a51747f806495d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 13:41:56 +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 7aae0c0dbc Merge "Using CUJ_APP_CLOSE_TO_HOME_FALLBACK when fallback animaiton is playing" into udc-qpr-dev am: c480860744 am: 746613f591
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24448719

Change-Id: I841d0643f3fe93f3987e7115cd2f471cf8236f8d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:58:54 +00:00
Treehugger Robot 3ce5780c8e Merge "Revert "Prevent setting mIsStashed in TaskbarStashController"" into udc-qpr-dev am: 12cd6076d3 am: f4bbe54f97
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24447385

Change-Id: I5fb63b2525906979f061ecbd838509da719a8768
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 02:32:07 +00:00
Hongwei Wang 99891e83f5 Merge "Cleanup ENABLE_PIP_APP_ICON_OVERLAY" into udc-qpr-dev am: 3ca497b646 am: 247a2cfe03
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24435526

Change-Id: I99d99c08024988be0872df88e9ccbbba33bfbded
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-17 01:54:30 +00: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
Treehugger Robot 08cd533f79 Merge "Import translations. DO NOT MERGE ANYWHERE" into udc-qpr-dev 2023-08-16 17:29:47 +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 3ca497b646 Merge "Cleanup ENABLE_PIP_APP_ICON_OVERLAY" into udc-qpr-dev 2023-08-16 16:45:33 +00:00
Bill Yi 04ba1ae0c4 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: Iacec47b52312748f25f5e416b821ece95cd308a1
2023-08-15 19:49:21 -07:00
Bill Yi bd19697496 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I9a9b95624cf10b44f599a8023da0089f1b0b0314
2023-08-15 19:48:48 -07: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
Treehugger Robot c916aa86fe Merge "Adding TaplTestsSplitscreen to OOP tests" into udc-qpr-dev am: 173cf33ac1 am: 3f87c59922
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24409976

Change-Id: I13d52afe6898447cad3171f0d387644bc558446d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 07:47:24 +00:00
Treehugger Robot 3f87c59922 Merge "Adding TaplTestsSplitscreen to OOP tests" into udc-qpr-dev am: 173cf33ac1
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24409976

Change-Id: Ifbc3e47e0ba04cf8d379b6446da52ab836985400
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-15 07:04:07 +00:00
Treehugger Robot 173cf33ac1 Merge "Adding TaplTestsSplitscreen to OOP tests" into udc-qpr-dev 2023-08-15 06:17:05 +00:00
Sunny Goyal f2c5ed257e Merge "Removing some unused overrides in Launcher" into udc-qpr-dev am: 12bf58feb9 am: 0ae8f5c91d
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24407042

Change-Id: I76f9266c25e31bf15112b559f05b2398cefb713a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 21:49:00 +00: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
Sunny Goyal 12bf58feb9 Merge "Removing some unused overrides in Launcher" into udc-qpr-dev 2023-08-14 20:40:28 +00:00
Colin Cross ec5a8a5e6e Merge "Fix kotlin nullable errors in Launcher3" into udc-qpr-dev-plus-aosp am: efada45adf
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24406717

Change-Id: Id7075119e7ad6610c7976d588da489bd51dd0a27
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 18:18:29 +00:00
Colin Cross efada45adf Merge "Fix kotlin nullable errors in Launcher3" into udc-qpr-dev-plus-aosp 2023-08-14 17:55:18 +00:00
Treehugger Robot d73a58a08c Merge "Add relayout debug support in Launcher" into udc-qpr-dev am: 1c4cb11662 am: 8da7427ba5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24403823

Change-Id: I4a5025ce17930fe899cd91358bc86d440ee39178
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 11:20:53 +00:00
Treehugger Robot 8da7427ba5 Merge "Add relayout debug support in Launcher" into udc-qpr-dev am: 1c4cb11662
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24403823

Change-Id: I8459cb1d828d1f27454f25cebc0c90f1a8165ce5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 10:40:59 +00:00
Treehugger Robot 1c4cb11662 Merge "Add relayout debug support in Launcher" into udc-qpr-dev 2023-08-14 09:43:51 +00:00
Nicolo' Mazzucato 93e7e4b1c0 Add relayout debug support in Launcher
This adds support for measure/layout tracing in Launcher (in sysui it has already been enabled in T)

When enabled, traces for each class measure and layout are output in
a perfetto trace. This adds some overhead, so it's disabled by default, but extremely useful for testing and debugging long doFrames.

To enable request layout tracing for a specific class X, the following helper can be used:

trace_class_layouts() {
        adb shell setprop persist.debug.trace_request_layout  1
        adb shell setprop persist.debug.trace_request_layout_class $1

        adb shell am force-stop com.google.android.apps.nexuslauncher
        adb shell am force-stop com.android.systemui
}

Then, use `trace_class_layouts X` and record a perfetto trace
e.g. `trace_class_layout BubbleTextView`

To just see class breakdown of measure/layout setting `persist.debug.trace_request_layout` is sufficient.

Test: record a trace after enabling options
Bug: 266090955
Change-Id: I4f621ebaaec6a07cd7c0693aa8876158cc60e208
2023-08-14 08:18:27 +00:00
Vadim Tryshev d08d2b1008 Moving stress tests to postsubmit am: 053f476376 am: 95c9e86b34
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24409978

Change-Id: Ib80d7978e743a264878620fc9dfa5cfa6832841a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 05:36:37 +00:00
Vadim Tryshev 95c9e86b34 Moving stress tests to postsubmit am: 053f476376
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24409978

Change-Id: I79790bd4e3f62794f6dca9bf583d6c4c100b4934
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-14 04:54:49 +00:00
Vadim Tryshev b2bb9802b8 Merge "Revert "Revert "Re-enabling a couple of tests""" into udc-qpr-dev am: 8c764a0870 am: e598bc71bc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23681107

Change-Id: Ib5eb7a82c0e95c5747c3f0b5f3ee663082a818fe
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-12 03:13:04 +00:00
Vadim Tryshev e598bc71bc Merge "Revert "Revert "Re-enabling a couple of tests""" into udc-qpr-dev am: 8c764a0870
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/23681107

Change-Id: I7636d8cd9bad4beed904f9d0f85125680d06b318
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-12 02:29:51 +00:00
Vadim Tryshev 053f476376 Moving stress tests to postsubmit
They don't consistently fail, but have flakes.

Bug: 187761685
Flag: N/A
Test: presubmit
Change-Id: I07db69259d86093d81ab65a52a8e839269a3dd80
2023-08-12 02:14:55 +00:00
Vadim Tryshev 8c764a0870 Merge "Revert "Revert "Re-enabling a couple of tests""" into udc-qpr-dev 2023-08-12 01:51:46 +00:00
Vadim Tryshev 401cde8d99 Adding TaplTestsSplitscreen to OOP tests
It's a nice addition to our OOP tests, which serve as a kind-of ssmoke check for the system, as well a a test for a proguarded Launcher.

Bug: 187761685
Flag: N/A
Test: presubmit

Change-Id: I196cf0047f0df6cf843615e48252035f216597a0
2023-08-11 18:34:01 -07:00
Vinit Nayak 9c159e3861 Merge "Animate Split invocation with shell transitions" into udc-qpr-dev am: 8488a7e757 am: 050cfbeb10
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392742

Change-Id: Ie7e14f26ed21ca5a0dafeca186126c622f004e19
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-12 00:14:26 +00:00
Vinit Nayak 050cfbeb10 Merge "Animate Split invocation with shell transitions" into udc-qpr-dev am: 8488a7e757
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/24392742

Change-Id: I2834012cb573bfc031d02be80c382916c583362b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-08-11 23:32:23 +00:00
Vinit Nayak 8488a7e757 Merge "Animate Split invocation with shell transitions" into udc-qpr-dev 2023-08-11 22:29:59 +00:00