Commit Graph
1773 Commits
Author SHA1 Message Date
Jagrut Desai 282f093533 Refactoring instance variable for ArrowPopup.java
refactoring naming for instance variables to be more in sync with java codestyle

Test: presubmit
Bug: 278291850
Flag: not needed
Change-Id: I24eb1433941b44404871b305acf0d2d145662080
2023-04-14 16:08:52 -07:00
Jeremy Sim 0c5262b9e1 Fix bug with split screen not recognizing user differences
This patch fixes a bug where split screen did not fully support launching intents with different users.

The bug arose because SplitSelectStateController only had one place to store user information about the staged intent, mUser, but this disregarded the fact that the secondary app could also be passed in as an intent, and could belong to a different user from that of the initial app and the existing context. We need to support this case now since we now allow second-app selection from Taskbar.

Fixed by splitting the field into mInitialUser and mSecondUser, which will be tightly bound with mInitialTaskIntent and mSecondTaskIntent to make sure that Intents are always launched with the correct UserHandle.

Change-Id: I1ec49c75d562e4309a41d98010f0eff113c81e9d
Fixes: 275410160
Test: Manual
Merged-In: Ic904672769be8fd116180d457b36eb567c5ee304
2023-04-06 03:42:55 +00:00
Ikram Gabiyev 3334730a61 Create an animation for instance filtering
Create an animation for multi instance filtering
demo in recents view.

Bug: 253520408
Bug: 276488398
Test: manually reproduce the steps in the bug

Change-Id: I9f5b4a29f18101b8e33d4e43514dcd8a6c49a7a9
2023-03-31 20:30:19 +00:00
Randy Pfohl 5c588c95b4 Merge "checking if outline provider is null to handle rare NPE" into tm-qpr-dev am: 40f065d1fd am: a402713eb2
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21995352

Change-Id: I7f20393c364b09d13e2c7027ddf85ac6552e62f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-28 22:58:47 +00:00
Randy Pfohl f96827b331 checking if outline provider is null to handle rare NPE
test: verified that a null value wouldn't cause a crash, and would still show the well being toasts correctly. defaulting a value could cause abnormal behavior so I have created a task to follow up with to figure out why this value is being set to null.

bug: 236918951
Change-Id: I9d4282273cb0bc5b6b095dbd082dd1ef79add0dc
2023-03-27 20:18:46 +00: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
Riddle Hsu 01a41a2bef Remove workaround of delaying remove task
The timing doesn't work on the latest code base. The onStop
of activity still almost has no chance to be called after
swiping the task to kill process.

And the friendly activity lifecycle will be controlled by
removeTask since Id69a8ba77da16a13f7a3413bb004fc2206f4b4e8.

Bug: 184899234
Bug: 213583589
Test: No behavior change after swiping task out from recents
Change-Id: If4110069834964571df7128b119fc6c782a03b34
2023-03-22 22:26:16 +08:00
Ats Jenk e861a047b8 Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev am: b219e31477 am: aacd5d330b
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/22121446

Change-Id: I20d2edfb566aeef128c3e05e030bb49dfe189d3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-16 23:10:55 +00:00
Ats Jenk b219e31477 Merge "Make sure desktop task view is only used in proto 2" into tm-qpr-dev 2023-03-16 22:00:00 +00:00
Ats Jenk 6adae751e7 Make sure desktop task view is only used in proto 2
When swiping up to recents and creating the current tasks TaskView, we
were checking for proto 1 or proto 2 to be enabled. And if they were, we
were creating the DesktopTaskView object. The DesktopTaskView should
only be enabled in proto 2.
Updated the feature flag check.

Bug: 273950066
Test: enable proto 1 and gesture nav, have a desktop app open, swipe up
  to recents, no desktop tile
Test: enable proto 2 and gesture nav, have a desktop app open, swipe up
  to recents, see the desktop tile
Change-Id: I73a47347d60e0f57ad6cf6e363a6fe83ac8cc509
2023-03-16 09:26:10 -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
Jeremy Sim 0529dbe41f Merge "Fix two issues with splitting from Taskbar" into tm-qpr-dev am: b439c837d8 am: 0389929e5f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21966877

Change-Id: I89e1057e9d11c22e06e3dd1bd42851d83fee06f5
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-14 18:23:40 +00:00
Jeremy Sim 6152c902ed Fix two issues with splitting from Taskbar
This patch fixes two issues that would arise when the user initiated split from Taskbar:
1) The Overview Actions View would animate out, then erroneously pop back in.
2) When initiating split from home repeatedly, the task thumbnail grid would not animate downward properly, instead staying in the wrong y-position.

Both issues were caused by the fact that we now have a new way to enter OverviewSplitSelect (directly from Taskbar/Home), which rendered some of our old assumptions incorrect. Namely:
1) When we finish transitioning to OverviewSplitSelect, we need to update OverviewActionsView visibility so that it stays hidden.
2) mSplitHiddenTaskView is no longer a good way to tell if we are in split select state or not.

Fixed by adding a new call to updateCurrentTaskActionsVisibility() to the end of the split staging animation, and by making sure translations get reset every time resetFromSplitSelect() is called.

Fixes: 271624078
Fixes: 261544937
Test: Manual, verified on large and small tablet screens with various types of split invocations and rotation combinations.

Change-Id: Ied0f4818ce6da599845ccd07e9dc96ef4ba030c3
2023-03-14 17:53:11 +00: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 6ca92a383c Merge "Fix TaskView cropping for transient taskbar" into udc-dev 2023-03-10 15:52:16 +00:00
Vinit Nayak 392b20c0ad Merge "Add initial split from GroupedTaskView animation" into tm-qpr-dev am: 4b0a5ed8fa am: 4eb50abbc3
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21613692

Change-Id: I1794100f231254037be49f4204fc142270543b94
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 22:03:03 +00:00
Vinit Nayak 4b0a5ed8fa Merge "Add initial split from GroupedTaskView animation" into tm-qpr-dev 2023-03-09 21:17:07 +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
Ats Jenk 1889431ba9 Merge "Remove empty desktop tile" into tm-qpr-dev am: bac6d4946a am: cff883d96f
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21893975

Change-Id: If2b6ec7a41a31d4c7ddc2da43482ad5d6af4fc46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-09 01:38:50 +00:00
Ats Jenk bac6d4946a Merge "Remove empty desktop tile" into tm-qpr-dev 2023-03-09 00:31:50 +00:00
Vinit Nayak aa7bf8b394 Add initial split from GroupedTaskView animation
* Created SplitAnimationController to prevent more
RecentsView bloat
* Extract SplitSelectSource attributes into separate class
* http://recall/-/cMb5xTTxhmZtFt04eYnmQj/eACJq1un8Ef91LgmQblpAw

Bug: 267370106
Change-Id: I5d430c091ac84bbbc30319e7b78711b610a21252
2023-03-08 15:17:57 -08: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
Ats Jenk 4d01acf44e Remove empty desktop tile
Do not show the desktop tile in overview when there are no apps on the
desktop.

Bug: 270399069
Test: have desktop mode proto 2 enabled, launch an app in fullscreen,
  open overview, observe no desktop tile
Test: move an app to desktop, be on desktop, open overview, observe
  overview is opened with desktop tile focused
Test: have an app on desktop, go home and launch an app in fullscreen,
  open overview, observe fullscreen app is focused, desktop is peeking
  in from right
Test: have an app on desktop and a fullscreen app in overview, open
  desktop from overview, close the desktop app, open overview, observe
  desktop tile is not shown
Change-Id: Ia8657d5b260043a630f32b35f2560ea93273d421
2023-03-08 11:49:48 -08:00
Sihua Ma 27ce0f4212 Merge "Set the original drawable for floating widget view" into tm-qpr-dev am: 792dda2344 am: fc9d3a50ad
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20899726

Change-Id: I91904f267dbca7fc30b8ed5d17c8bcb1fd2a889b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-08 19:44:37 +00:00
Sihua Ma 914549b482 Set the original drawable for floating widget view
This ensures that the background of the widget will not disappear after cancelling opening the widget activity.

Normally, when opening and closing the widget activity, the following procedures are executed:

tap on widget
-> opening animation initialized -> opening animation finished
-> close the activity
-> closing animation initialized -> closing animation finished

The steps above would work fine. However, a different set of procedures is followed if we try to cancel opening the widget activity:

tap on widget
-> opening animation initialized
-> opening animation started
-> swipe back before opening animation is completed
-> closing animation initialized
-> opening animation finished
-> closing animation started
-> closing animation finished

During the animation initialization process, FloatingWidgetBackgroundView would be initialized. It will then cache the original background and replace with a temporary drawable with alpha set to 0. The background is only restored at the end of the animation.

If two FloatingWidgetBackgroundView is initialized on the same app widget view before one of them is finished, the second floating view will treat the temporary drawable as the original background. At the end of the closing animation, the temporary drawable with an alpha value of 0 will be set for the app widget view, causing the background of the widget view to disappear.

This CL stores the original drawables into the background view so they could be retrieved during the initialization process of the floating background view.

Test: Manual
Fix: 259526083
Change-Id: Iefa29b22b690076a4fc3fc77fe6eea4b6316f852
2023-03-07 15:20:22 -08: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
Brian Isganitis 8ecb5eeb62 Merge changes from topic "running-in-test-camel" into tm-qpr-dev am: d2d2913812 am: 0c15dabc48
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21725479

Change-Id: I3d02a42c2d0bdebc2487def8696d9a489aca7311
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:08:07 +00:00
Vinit Nayak 9f70b5b74d Merge "Fix quick switch in between two split pairs crash" into tm-qpr-dev am: 750009face am: fc155dd5b0
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21460191

Change-Id: I5fcafaf72bd12d1001f9c61b58f96aa9a351fd66
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:07:13 +00:00
Ats Jenk 955b214904 Merge "Hide desktop tile when choosing apps for split" into tm-qpr-dev am: 37d6a2be10 am: 7e7f2ff07e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21656508

Change-Id: I5c9058a8af9eab6a78c20a37d5a0ab578d4e556a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-07 00:07:04 +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
Brian Isganitis d2d2913812 Merge changes from topic "running-in-test-camel" into tm-qpr-dev
* changes:
  Expose IS_RUNNING_IN_TEST_HARNESS as static method.
  Make isTooltipEnabled a getter due to its mutable dependencies.
2023-03-03 23:15:38 +00:00
Vinit Nayak 750009face Merge "Fix quick switch in between two split pairs crash" into tm-qpr-dev 2023-03-03 19:37:04 +00:00
Ats Jenk ebd14d02a7 Merge "Support large desktop tile in grid only overview" into tm-qpr-dev am: 8e20d62034 am: e086649965
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21611657

Change-Id: I1aa8dfd348c9fc27597d3dbdb7884c4ed358dd57
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-03 16:54:26 +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
Brian Isganitis fdd044e16e Expose IS_RUNNING_IN_TEST_HARNESS as static method.
This variable is now mutable, making the uppercase format misleading.
For instance, users might assume they can use this value in other
immutable properties, when they really should be accessing the latest
value every time they need it.

Context: https://source.android.com/docs/setup/contribute/code-style#follow-field-naming-conventions

Test: Manual
Bug: 271160958
Change-Id: Iaaa51d9153cb8a7d686c72e1210b1948029dcfd5
2023-03-03 00:17:33 +00:00
Ats Jenk 55cb5fca91 Hide desktop tile when choosing apps for split
Bug: 269660657
Test: open overview, click on split screen action, observe desktop tile
  is hidden
Test: on home screen, long press on app icon and choose split screen,
  observe overview opens with desktop tile hidden

Change-Id: I60c06a8e2ef8fc13e741f8845254d22e9e430bb6
2023-03-02 15:14:34 -08:00
Ats Jenk 8e20d62034 Merge "Support large desktop tile in grid only overview" into tm-qpr-dev 2023-03-02 22:45:38 +00:00
Ats Jenk 45e0a90013 Support large desktop tile in grid only overview
Based on UX specs, desktop tile should be using the large size and be
pinned ot the right in overview.
Updates to ensure the desktop tile is using the focused tile size when
grid only overview is enabled.

Test: enable grid only overview, have some fullscreen tasks in overview
  and some desktop tasks, open overview from home, observe desktop tile
  peeks from right
Test: same setup as before, open a fullscreen app, open overview,
  observe desktop tile peeks in from right
Test: same setup as before, go to desktop, open overview, observe
  desktop tile is focused
Test: turn off grid only overview, repeat the same test case

Bug: 271131878

Change-Id: Ic804428dca415f08a26c47e1d6b9b3a94fcfbfdf
2023-03-02 09:04:37 -08:00
Jeremy Sim a768b4547a Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev am: a49569a90e am: baa93c42cb
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21551330

Change-Id: Ie29b70f4b5bcc3ad6d045be0a6cdd08866aaef5e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 20:42:25 +00:00
Jeremy Sim a49569a90e Merge "Fix bug with rotating in the middle of split select staging animation" into tm-qpr-dev 2023-03-01 18:53:00 +00:00
Alex Chau cbab01c721 Merge "Land ENABLE_TASKBAR_IN_OVERVIEW" into tm-qpr-dev am: 6a10a003d6 am: a1907c710e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/21538759

Change-Id: Ibf2a35e5d54d2938a00cb251ddb71656f6308207
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-03-01 18:19:32 +00:00
Jeremy Sim 8477226a3d Fix bug with rotating in the middle of split select staging animation
This patch fixes a bug where a user could cause a crash by rotating the device in the middle of the split staging animation.

The bug arose because:
1) Normally, when you rotate the device, reapplyState() is called to refresh the UI. This reloads the state, cancels any animations that happen to be running at the time, and generally works fine in most cases.
2) When animations are canceled within Overview, we also call RecentsView#reset() to clean up loose ends and prevent bugs.
3) Unlike other states, the split select state is unique because it is a transient state that holds the user's choices temporarily. If that information was cleared -- by reset() -- before it loads, it will crash.

Fixed by creating a new function in SplitScreenSelectState, onStateReapplied(), that is called when a reload is occurring. It makes sure that animations do not get canceled by calling end() to accelerate them to completion before the reloading occurs.

Fixes: 249819567
Test: Manual
Change-Id: I70c4651bcb5df81edd25f6e58e21520ebb391d01
2023-02-28 17:13:36 -08:00
Alex Chau 8aa3f00238 Land ENABLE_TASKBAR_IN_OVERVIEW
Fix: 270393449
Test: manual
Change-Id: I731bfa8ee86154fd034781e27272abc81a6fe6c6
2023-02-28 20:18:32 +00:00
Alex Chau 4d95ac8c7e Merge "Remove focus task" into tm-qpr-dev am: 019f8a640a am: 110007f68e
Original change: https://googleplex-android-review.googlesource.com/c/platform/packages/apps/Launcher3/+/20980936

Change-Id: I8132ad04086f5704bb54ec4bc6c8e1b60c163fd0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2023-02-25 12:30:30 +00:00
Alex Chau 019f8a640a Merge "Remove focus task" into tm-qpr-dev 2023-02-25 11:25:34 +00:00