Commit Graph

564 Commits

Author SHA1 Message Date
Brian Isganitis
3ef917a4e3 Cleanup ENABLE_TASKBAR_EDU_TOOLTIP: remove EDU sheet.
Test: Manual
Fix: 270396268
Change-Id: I3cebdb6646060cf6793e5ffc638213dde41338c0
2023-04-10 12:55:18 -04:00
Vinit Nayak
02f20dddb0 Merge "Default to using SplitSelectSource drawable if TaskView icon drawable is null" into tm-qpr-dev am: 8e307ba50a am: 3e5b212204
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22347415

Change-Id: I2f3da1c74ed5ae04ff9cbc4bc06e280da5390b4d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-04-03 15:54:11 +00:00
Jeremy Sim
9f0a6b8e82 App Pairs (behind flag): Add Overview menu item, icon, tests
This is the first of several patches implementing the App Pairs feature behind a flag.

This patch includes:
- The icon asset for the "Save app pair" menu option
- The menu option, which will appear in the Overview drop-down menu for split pairs
- Some tests ensuring that the menu item appears when appropriate

Flag: ENABLE_APP_PAIRS (set to false)
Bug: 274189428
Test: 2 tests in TaplTestsSplitscreen.java
Change-Id: I174f2c66e7eb6d83ff7fe501eb82cc48e727022c
2023-03-31 17:16:56 -07:00
Vinit Nayak
ecca8eacbc Default to using SplitSelectSource drawable if TaskView icon drawable is null
* Alternative solution could be to set
onTaskViewVisibilityChanged(true) for the taskView that is about
to be dismissed so it loads it's taskIcon/thumbnail back from the cache
* However, that does still leave us open to race conditions (even though
we can be reasonably confident the icon is probably in the cache)
* Also made other changes to allow already public fields on some classes
to be mockable for unit testing

Fixes: 275267738
Test: Tested with fullscreen task at end of overview,
GroupedTaskView at end of overview,
Initiating split from home,
Initiating split from overview actions,
Initiating split from overview app icon

Change-Id: Ic9059c93c07b90f61c9f418d5d36d6ba201ff96a
2023-03-30 15:26:57 -07:00
Jon Miranda
a97dc04478 Merge "Add taskbarIconSize to GridOption/DisplayOptions" into tm-qpr-dev am: 085c53869f am: 3cd39729dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22228076

Change-Id: I3cb2d462cef1df514c87418ed70ac624899c21fd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-24 23:02:51 +00:00
Jon Miranda
9c478b6c29 Add taskbarIconSize to GridOption/DisplayOptions
- Renamed variables to make it more clear what they represent
- DeviceProfile will be source of truth for taskbar
  sizes

Bug: 265144213
Test: phone, multi-display, tablet
Change-Id: Id9c19d15a65894fd7645e0f876a4b6527b713c34
Flag: ENABLE_TRANSIENT_TASKBAR=true
2023-03-24 12:29:11 -07:00
Jon Miranda
7953f25c3c Merge "Add spring animation when stashing transient taskbar." into tm-qpr-dev am: ba85154590 am: 9c0ad5f746
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22178236

Change-Id: Ibec649f0c7d6181ac52e2067898fe4b0b82f01a2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-22 03:46:12 +00:00
Jon Miranda
3344ec7004 Add spring animation when stashing transient taskbar.
Bug: 273961611
Change-Id: I35a658a5e30a155094a48effdefc3895f45e0483
Flag: ENABLE_TRANSIENT_TASKBAR
Test: stash transient taskbar
2023-03-21 10:25:48 -07:00
Jeremy Sim
c0d8b2dc0b Merge "Revert "Revert "Create TAPL test suite for splitscreen""" into tm-qpr-dev am: 7b286a4f68 am: 7f61f22560
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22079982

Change-Id: Id25492e0212812d5489923fab9777c8d41f1bfe0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-15 22:19:59 +00:00
Jeremy Sim
da75737d63 Revert "Revert "Create TAPL test suite for splitscreen""
This reverts commit 313a44039f.

Merging will reenable the TAPL suite TaplTestsSplitscreen.java, which was failing on phones due to a function call that only works on tablets.

Fixed by conditionally running the function only on tablet devices.

Fixes: 271852893
Test: Ran tests locally on phone and tablet.
Change-Id: If3e692924ed9c5ee113872e4f8ff0652890d1280
2023-03-14 15:36:32 -07:00
Thales Lima
887c0ae68b Merge "Fix TaskView cropping for transient taskbar" into tm-qpr-dev 2023-03-13 13:27:37 +00:00
Thales Lima
3a6193517d Fix TaskView cropping for transient taskbar
TaskView clipping is not necessary anymore because task in Overview will always be the same aspect ratio as the app when in fullscreen.

Fix: 268211636
Test: manual trigger of Overview (landscape, portrait, split screen)
Change-Id: Ib4faeda6f0cccef3b23fcbacb89c6d2832c0df59
Merged-In: Ib4faeda6f0cccef3b23fcbacb89c6d2832c0df59
2023-03-09 20:24:53 +00:00
Thales Lima
9fde4781ea Fix TaskView cropping for transient taskbar
TaskView clipping is not necessary anymore because task in Overview will always be the same aspect ratio as the app when in fullscreen.

Fix: 268211636
Test: manual trigger of Overview (landscape, portrait, split screen)
Change-Id: Ib4faeda6f0cccef3b23fcbacb89c6d2832c0df59
Merged-In: Ib4faeda6f0cccef3b23fcbacb89c6d2832c0df59
2023-03-09 18:43:05 +00:00
TreeHugger Robot
d8478f7019 Merge "Revert "Create TAPL test suite for splitscreen"" into tm-qpr-dev am: 19c0877745 am: 9fbd4b9c4e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21806280

Change-Id: I91f799236b02142e2a9c94ef56105bbd20e669f3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 20:57:24 +00:00
TreeHugger Robot
19c0877745 Merge "Revert "Create TAPL test suite for splitscreen"" into tm-qpr-dev 2023-03-08 20:04:50 +00:00
Jeremy Sim
6d506a8622 Merge "Create TAPL test suite for splitscreen" into tm-qpr-dev am: ad9bdcfd2d am: 2a81b79a3c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21221178

Change-Id: I5dc5ccacaddfbe437ff44dd067ba8127b2fb7e40
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 03:19:44 +00:00
Vinit Nayak
313a44039f Revert "Create TAPL test suite for splitscreen"
This reverts commit 03815e6c79.

Reason for revert: b/271852893

Change-Id: I165a15b29e41ce1114f6b7d92d22cdd8e0dfb5b0
2023-03-06 23:47:20 +00:00
Jeremy Sim
ad9bdcfd2d Merge "Create TAPL test suite for splitscreen" into tm-qpr-dev 2023-03-04 01:10:47 +00:00
Jeremy Sim
03815e6c79 Create TAPL test suite for splitscreen
This patch creates a new file, TaplTestsSplitscreen.java, containing one TAPL test sequence.

testSplitAppFromHomeWithItself() tests the user flow of splitting from home using an app that is already running, and then selecting the app itself again as a split target from the Taskbar. The expected result is that Launcher shows an error message gracefully and does not crash.

Fixes: 267554450
Test: Ran test file locally and verified that it passes.
Change-Id: I98a1e3a4143d10a6572175711059b3a77aa5dcd0
2023-03-02 16:35:54 -08:00
Jeremy Sim
86e4f02035 Merge "Fix bug with Taskbar not differentiating between user profiles" into tm-qpr-dev am: 24b1890c4b am: 0027186ea2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21566360

Change-Id: Ic90db4ff687565109c3644cede0f7c50f9f66f4a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-02 04:10:00 +00:00
Fengjiang Li
0785970ae6 Merge "[Predictive Back] Turn on feature for udc" into udc-dev 2023-03-01 20:56:53 +00:00
Jeremy Sim
e35d112693 Fix bug with Taskbar not differentiating between user profiles
This patch fixes a bug where Taskbar would not differentiate between user profiles when selecting an app to launch from Overview.

The bug occurred because findLastActiveTaskAndRunCallback(), which checks for already-running tasks when launching an app from the Taskbar, only checks for a ComponentName match and not a userId match.

Fixed by making the findLastActiveTaskAndRunCallback() also check for a userId match.

Fixes: 270456926
Test: Manual
Change-Id: I43ff06083a5dce775fdbd0b0ed951beaae34c0ab
2023-03-01 10:57:41 -08:00
Fengjiang Li
f533ff350c [Predictive Back] Turn on feature for udc
Add feature flag and turn it on for U

Test: manual
Bug: b/264920023
Change-Id: I43d9c04b13b91ce0b0e53402a5c3b2f0e81272ff
2023-03-01 18:41:32 +00:00
Jordan Demeulenaere
51132f7f86 Format files with the upcoming version of ktfmt am: be82bc661c am: 652ec4997a
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21565649

Change-Id: I06342a9bb4b91dd00196b76dec1dd2daaf4ee2e4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 15:55:10 +00:00
Jordan Demeulenaere
be82bc661c Format files with the upcoming version of ktfmt
This CL was generated automatically from the following command:

$ external/ktfmt/prepare_upgrade.py --repo=packages/apps/Launcher3/ --build_id=9645412 --bug_id=266197805

This CL formats all files already correctly formatted with the upcoming
version of ktfmt.

Bug: 266197805
Test: Presubmits
Change-Id: Ide7d63a75fed98aabe348821355356c77f00a9ec
Merged-In: Ide7d63a75fed98aabe348821355356c77f00a9ec
2023-03-01 09:11:48 +00:00
Alibek Manabayev
e2f33d2f38 Merge "Extend tests to check Transient Taskbar Autohide" into tm-qpr-dev am: 4424f6636e am: b60e6b0e60
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21445185

Change-Id: I882804ff6a06c7e64c872bf4c2fdc91180664bd2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-24 15:54:27 +00:00
Alibek Manabayev
3b61863ba8 Extend tests to check Transient Taskbar Autohide
Bug: 260589084
Test: ab/I67000010134246487 on local device

Change-Id: Iad141fcbac54770810009e41082ab583cc3d260e
2023-02-23 14:26:44 +00:00
Vinit Nayak
26016622c1 Merge "Refactor SplitSelectStateController to add testing" into tm-qpr-dev am: c9120521ff am: 2fea4c6f1b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21487925

Change-Id: I418fa47df9af8c94a31d3c30124c96cc78e6d758
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-23 00:53:05 +00:00
Vinit Nayak
4e3636e8d0 Refactor SplitSelectStateController to add testing
Bug: 266482558
Change-Id: I2d62a3a310043710d66a26bc533df2309084b81e
2023-02-22 10:51:49 -08:00
Vinit Nayak
ec5759b509 Merge "Add overview taskbar split support for 3P launcher" into tm-qpr-dev am: 0a9056502b am: 5c64c1dcb7
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21311163

Change-Id: I1a3433b8b327abf466f0149a8747a67a01c799f8
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-16 02:25:03 +00:00
Vinit Nayak
0a9056502b Merge "Add overview taskbar split support for 3P launcher" into tm-qpr-dev 2023-02-16 00:33:46 +00:00
Vinit Nayak
f4e7e5aaf4 Add overview taskbar split support for 3P launcher
* Created b/268120202 to track other states of split
selection that are unhandled on 3P launchers

Test: Able to initiate split in overview with 3P launcher
Fixes: 264576761
Change-Id: I0311fe83380bf914fa79956b2565b61cc5eab916
2023-02-15 11:26:06 -08:00
Schneider Victor-tulias
79855e7cb8 Merge "Add the KeyboardQuickSwitchView (2/2)" into tm-qpr-dev am: 25656568e3 am: 74ffb0ba89
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21087436

Change-Id: Ie6f0b30af20e5905fc10105bbf2fcf8a0db028b0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-15 06:15:48 +00:00
Schneider Victor-tulias
de7ceba80b Add the KeyboardQuickSwitchView (2/2)
Adding KeyboardQuickSwitchView and associated flows.

Test: Manually tested alt-tab and alt-shift-tab in and out of overview on a tablet and phone
Bug: 258854035
Change-Id: Ifb48b005067b3a9c66acfd5ecdbae144b359d3be
2023-02-14 13:34:37 -08:00
Thales Lima
bb056c6001 Merge "Create an XML parser for WorkspaceSpecs" into tm-qpr-dev am: 5d5aad3024 am: 0ebaf3a46c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20643018

Change-Id: I471bb3ccd04a0598a309e53038976fbccb638ce1
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 13:01:28 +00:00
Thales Lima
5d5aad3024 Merge "Create an XML parser for WorkspaceSpecs" into tm-qpr-dev 2023-02-09 11:19:59 +00:00
Jeremy Sim
c1237eb5e8 Merge "Improve resilience of testSplitFromOverview()" into tm-qpr-dev am: 5c5797d9bb am: b340f1401f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21314098

Change-Id: Ib1c5502717e5b956f65bdd6385655a211db51863
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-09 05:09:34 +00:00
Thales Lima
1a2d4bd6f4 Create an XML parser for WorkspaceSpecs
Extract DeviceProfileTest to Launcher3 so it can be used in other tests as well, and change name of previous base test to be more descriptive.

Bug: 241386436
Test: WorkspaceSpecsTest
Change-Id: I64613bb5a23c374ed15fb6d936192236a541ab9b
2023-02-08 11:20:14 +00:00
Jeremy Sim
5edd864c8d Improve resilience of testSplitFromOverview()
This patch makes it so that TaplTestsQuickstep#testSplitFromOverview() is less flaky.

Previously, this test worked by tapping the center of a Overview tile to confirm split select. However, sometimes the tile would be halfway offscreen, so it would accidentally tap an overlapping UI element (the staged first app) instead, causing the test to fail.

Fixed by using getCurrentTask() to always select an Overview tile that is fully onscreen.

Fixes: 267794149
Test: Manual on phone, confirmed test passing
Change-Id: I8b89509bb53a16e45aea4545562989e2e964de2d
2023-02-07 13:47:47 +08:00
Pat Manning
39ed8eecfd Merge "Make showing back for bouncer only rely on back disable status, not home and recents as well." into tm-qpr-dev am: f667823a8e am: 23aa4f8022
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21136526

Change-Id: Iec722d8821b90e3cb7021ba7d0a8d4076782f88a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-31 22:13:26 +00:00
Pat Manning
f667823a8e Merge "Make showing back for bouncer only rely on back disable status, not home and recents as well." into tm-qpr-dev 2023-01-31 21:13:46 +00:00
Pat Manning
7462c2ab62 Make showing back for bouncer only rely on back disable status, not home and recents as well.
Fix: 260655218
Test: manual. Create second user, switch to three button nav, set lockscreen password, lock and show IME on lockscreen.
Change-Id: I1d874196afc24d5bae86d525a81ae199152fc750
2023-01-31 14:57:26 +00:00
Schneider Victor-tulias
360f6d0130 Merge "Revert "Revert^2 "Cancel gestures on launcher destroy""" into tm-qpr-dev am: 7d346bf90b am: 030ba11d8c
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21100567

Change-Id: Ib3d7981a93d9647a3599df12e8093d31941550fa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-30 22:45:51 +00:00
Schneider Victor-tulias
7d346bf90b Merge "Revert "Revert^2 "Cancel gestures on launcher destroy""" into tm-qpr-dev 2023-01-30 21:39:50 +00:00
Schneider Victor-tulias
ece659d11a Revert "Revert^2 "Cancel gestures on launcher destroy""
This reverts commit 377eb40985.

Reason for revert: failing tests
Fixes: 266606727
Fixes: 266621449

Change-Id: I61094be02fb73c5ad65ee65be5ed93a3364f37ef
2023-01-27 14:38:19 -08:00
Jon Miranda
55dd83a3d6 Merge "Split taskbar test methods by persistent/transient" into tm-qpr-dev am: 6f53364c14 am: bcf6b13ac5
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21120291

Change-Id: I6be4f5deb9511e03a9e7dac1bb3de0147d6e3b5f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-27 22:21:36 +00:00
Jon Miranda
6f53364c14 Merge "Split taskbar test methods by persistent/transient" into tm-qpr-dev 2023-01-27 21:27:01 +00:00
Jon Miranda
7acd32cf16 Split taskbar test methods by persistent/transient
Test: TaplTestsTaskbar
Bug: 266861780
Change-Id: I0fc0ef58aa4bc087248ab223c4716992bc0cd692
2023-01-26 16:08:23 -08:00
Evan Rosky
1d2abb366d Merge "Revert^8 "Enable Shell Transitions"" 2023-01-25 00:08:16 +00:00
Schneider Victor-tulias
cd09b276c5 Merge "Revert^2 "Cancel gestures on launcher destroy"" into tm-qpr-dev am: 74484f4a99 am: 86fbe3c7ea
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20680308

Change-Id: I8c6e5b7431631ce5577dc6ba8435d607fc3bc883
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-01-24 19:32:52 +00:00