Commit Graph

5270 Commits

Author SHA1 Message Date
Vinit Nayak
fdd71f93f4 Merge "Pass in enter reasons into SplitscreenEventLogger" into tm-qpr-dev am: fa3a8fafda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19980249

Change-Id: I00374b3f8852a69bb5a45662cc84e93174f15206
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:39:46 +00:00
HQ Liu
83fe86c44b Merge "Use RootTaskDisplayAreaOrganizer to change windowing mode" into tm-qpr-dev am: 51afb38bda
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19931405

Change-Id: If0b6fb28829cca7fc2646ff2bf4e2090af8ce4f2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:34:28 +00:00
Vinit Nayak
fa3a8fafda Merge "Pass in enter reasons into SplitscreenEventLogger" into tm-qpr-dev 2022-09-20 21:55:30 +00:00
HQ Liu
51afb38bda Merge "Use RootTaskDisplayAreaOrganizer to change windowing mode" into tm-qpr-dev 2022-09-20 19:43:33 +00:00
Vinit Nayak
1ab928f8ad Pass in enter reasons into SplitscreenEventLogger
* Multi-instance reason is kind of a default reason
if the enterSessionId hasn't been set.
* Explicitly set Launcher enter reasons so we don't
rely on Launcher being a default enter reason

Bug: 231369744
Test: Enter split screen from launcher, chrome new
window multi instance, and notification drag.
Logged enter reason when logging to verify.

Change-Id: I7af3b2c2b8c067ca4e6eadff037582d340cad0f5
2022-09-20 10:28:44 -07:00
Evan Rosky
0ac4d2e85d Merge "Adjust caption observer for desktop transition" into tm-qpr-dev am: 556ecc8da9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19973036

Change-Id: I49fb24c8180af93066bd78523fa007ff8c48d5a6
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 16:44:54 +00:00
Evan Rosky
556ecc8da9 Merge "Adjust caption observer for desktop transition" into tm-qpr-dev 2022-09-20 16:39:57 +00:00
Mateusz Cicheński
d0609b03c7 Merge "Move PiP swiftly in response to IME with keep clear areas flag enabled." into tm-qpr-dev am: 56cf35b281
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19954058

Change-Id: I58513b1a730bcb9d1f547f1028c593d3852d67aa
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 13:59:22 +00:00
Mateusz Cicheński
56cf35b281 Merge "Move PiP swiftly in response to IME with keep clear areas flag enabled." into tm-qpr-dev 2022-09-20 13:48:33 +00:00
Tony Huang
46ddfb3987 Merge "Reduce flicker when split pair switching" into tm-qpr-dev am: 1c2c0b5258
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19964446

Change-Id: Ic8a4772aa251f9e4e6e2e2d01a32e4c542bc0196
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 03:25:53 +00:00
Tony Huang
1c2c0b5258 Merge "Reduce flicker when split pair switching" into tm-qpr-dev 2022-09-20 03:12:05 +00:00
TreeHugger Robot
6d119e6c64 Merge "Allow background activity launch by drag notification" into tm-qpr-dev am: d7e17f97c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967613

Change-Id: I50aa8b936a3208bd38dc248b1e00c155e5ec4f46
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 00:25:02 +00:00
TreeHugger Robot
d7e17f97c7 Merge "Allow background activity launch by drag notification" into tm-qpr-dev 2022-09-20 00:09:19 +00:00
Mateusz Cicheński
62f6fe2294 Move PiP swiftly in response to IME with keep clear areas flag enabled.
If the keep clear algorithm is enabled, PiP window will avoid the
keep clear areas and move away from occluding keyboard.

When IME is shown, we trigger the movement right away, for a smoother
experience.
If there is another animation ongoing, we delay moving PiP again, so
that it's more smooth overall.
Finally, we always apply gravity bottom with keep clear areas flag on,
so that it goes back down after IME dismiss.

Test: manually, http://recall/-/blXo3gy66k4fDYh7gFkrpe
Bug: 183746978

Change-Id: I32c52e4b6dd3c083b2168fda6a8b3b13facdac69
2022-09-19 21:03:44 +00:00
Evan Rosky
3b2eff1cc4 Adjust caption observer for desktop transition
Instead of specific transition types, just try to get captions
and if it doesn't exist, make one. As we add more "source"
windowing modes, we'll have to just check more listeners. This
should hold-over until there's a centralized task-state manager.

Also, try to create captions on "warm-starts" (TO_FRONT) so that
apps that are in history before desktop-mode will get a caption.

Bug: 246851689
Bug: 246637353
Test: enable shell-transitions and switch into/out-of desktop
      mode with varying sets of warm/cold-start apps
Change-Id: If9e1ad35692b63bf8abd6185b037715b285645c9
2022-09-19 13:21:34 -07:00
Jeff Chang
09c0d6ef9e Allow background activity launch by drag notification
Drag notification to launch activity is aborted since the app is not
visible.

This CL adds the background activity allowed flag to make activity
launches successful.

Bug: 237985674
Test: Drag the notification to home. Check the activity is launched.
Change-Id: I6513e7d5d7b17c4a41c32316fd7504fe1bf2e793
2022-09-18 23:06:12 +08:00
Ats Jenk
d9d37cf01d Merge "Move active task tracking to a repository" into tm-qpr-dev am: 0a0969af1c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969528

Change-Id: Ia1f7209c9f7ecc315cffccabdf4d60b4660b467f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 01:13:34 +00:00
Ats Jenk
0a0969af1c Merge "Move active task tracking to a repository" into tm-qpr-dev 2022-09-17 00:16:33 +00:00
HQ Liu
e4ef661839 Use RootTaskDisplayAreaOrganizer to change windowing mode
In core, windowing mode is being set in TDA with ag/19902621. Thus, set
windowing mode with RooTaskDisplayAreaOrganizer instead of
RootDisplayAreaOrganizer.

Bug: b/241168290
Test: services/tests/wmtests
Change-Id: Ib7e6701839f83ab4125a9630d20203f8c5e415ba
2022-09-16 16:09:54 -07:00
Matt Sziklay
8e8b5225f9 Merge "Show captions on tablets even when display windowing mode is fullscreen." into tm-qpr-dev am: 488a69bfc4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19817715

Change-Id: Ib000a4eb7a4d1fdf0f154aa8ae4c2d3518cb8784
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 23:07:12 +00:00
Matt Sziklay
488a69bfc4 Merge "Show captions on tablets even when display windowing mode is fullscreen." into tm-qpr-dev 2022-09-16 22:39:07 +00:00
Ats Jenk
8a3cf44c9a Move active task tracking to a repository
We were tracking active freeform tasks in the RecentTasksController.
This causes some issues when we want to share that information to other
controllers like DesktopModeController.
Move tracking of active tasks to a separate repository that controllers
can query and listen for updates.

Bug: 244348395
Test: atest DesktopModeTaskRepositoryTest RecentTasksControllerTest
Change-Id: I7a460020f6b2133225e292a04f29ae1dd27e964b
2022-09-16 13:51:42 -07:00
Maryam Dehaini
45f5234998 Merge "Fixing UI Crash" into tm-qpr-dev am: b25a29ed88
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19972432

Change-Id: I4463bdb62bb0721f422f858dc5765239a78e6016
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 20:34:31 +00:00
Maryam Dehaini
b25a29ed88 Merge "Fixing UI Crash" into tm-qpr-dev 2022-09-16 19:58:36 +00:00
Evan Rosky
ddf207959e Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev am: d6c6f5865f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19973186

Change-Id: I8e5b1c58353dcb546b3d4ed64696f26c957f3e02
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 16:43:04 +00:00
Mady Mellor
b0b360041c Merge "Expose getTaskInfo on TaskView" into tm-qpr-dev am: 63caeaf9fa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19661165

Change-Id: I7320fe57c318558cc223faa2b40057276ba06f9f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 16:42:19 +00:00
Evan Rosky
d6c6f5865f Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev 2022-09-16 16:38:27 +00:00
mattsziklay
e4a9f82606 Show captions on tablets even when display windowing mode is fullscreen.
Changes the criteria for showing caption on fullscreen tasks to check
if the device is a tablet based on screen size rather than using display
windowing mode.

Bug: 243671025
Test: Manual testing; launched fullscreen tasks on multiple devices with
and without desktop mode flag enabled.

Change-Id: I4550f040daef9c55edaaf42bcfc2004a23e6924f
2022-09-16 09:26:48 -07:00
Mady Mellor
63caeaf9fa Merge "Expose getTaskInfo on TaskView" into tm-qpr-dev 2022-09-16 16:19:45 +00:00
Tony Huang
15bbf37379 Reduce flicker when split pair switching
Checked this issue by winscope and found home task leash under
RecentsAnimationSplitTasks will become off screen bewteen the
transition, it lead to task thumbnail invisible and wallpaper show
then cause flicker.

Home suface going to off screen is caused by we will remove previous
RecentsAnimationSplitTasks when re-create it whether going to recents
or starting split.

Fix this by seperate mSplitTasksContainerLayer to two differents
surface for going to recents and starting split cases.

Fix: 246664520
Test: manual
Test: pass existing tests
Change-Id: I492cc8b82a15cc5abec06118b54232b355e880a0
2022-09-16 13:18:35 +08:00
Jerry Chang
0f30697436 Merge "Fix timeout when dismissing split screen to two pane mode" into tm-qpr-dev am: b48c123b67
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947800

Change-Id: I324f29fef58090aa7c456d4de794bfb83d3584a0
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 01:16:55 +00:00
Chris Li
e4d6e029d0 Merge "Only play ActivityEmbedding animation if there is AE split" into tm-qpr-dev am: 7eb3933a3e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19949790

Change-Id: Ia0b679ec1f6211ef00bb4248f5442a6324e30582
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 01:06:27 +00:00
Chris Li
a5c9cd1525 Merge "Play ActivityEmbedding animation if all changes in Task with embedded" into tm-qpr-dev am: 941a2e72f6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19851630

Change-Id: Ia5525af1861c3dd1da90ca62fdec4c31e2be11d7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 00:55:40 +00:00
Jerry Chang
b48c123b67 Merge "Fix timeout when dismissing split screen to two pane mode" into tm-qpr-dev 2022-09-16 00:51:43 +00:00
Evan Rosky
6a1363adc8 Use transition for desktop-mode switch when enabled
WHen using shell-transitions, use a transition instead of
regular applyTransaction

Bug: 236047261
Test: use desktop-mode switch w/ shell-transit. observe an actual
      transition.
Change-Id: I81f37d278420383f8b2b0f37cca8a398313705cb
2022-09-16 00:26:59 +00:00
Chris Li
7eb3933a3e Merge "Only play ActivityEmbedding animation if there is AE split" into tm-qpr-dev 2022-09-15 23:31:24 +00:00
Chris Li
941a2e72f6 Merge "Play ActivityEmbedding animation if all changes in Task with embedded" into tm-qpr-dev 2022-09-15 23:31:09 +00:00
Maryam
1e45037d90 Fixing UI Crash
UI crashing due to null windowDecor object being passed into
FullscreenTaskListener#giveWindowDecoration
Test: Manual Testing
Bug: 246637353

Change-Id: Iaefee1993e1477cb88ed34d8e94b5f24120152f1
2022-09-15 16:19:48 -07:00
Mady Mellor
0f3543c8f6 Merge "Allow the dismiss target size to be overridden" into tm-qpr-dev am: db23075abb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19661163

Change-Id: I8d262ec27795587de6ab43989766d9ada9bc2a9a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:44:13 +00:00
Evan Rosky
aede5a75e1 Merge "Support display-rotation during a split-to-recents transition" into tm-qpr-dev am: ccb00cdb19
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19906021

Change-Id: Ie3cd2f8d326cc2110fed38e854be9079e734ebd3
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:39:22 +00:00
Mady Mellor
7ac75eb362 Merge "Fix NPE where BubbleExpandedView is null when we want to show manage education view" into tm-qpr-dev am: 2573d93fa5
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19970278

Change-Id: I46aefd9d33e4bf89be6d806657233793c476d81a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 22:35:18 +00:00
Mady Mellor
db23075abb Merge "Allow the dismiss target size to be overridden" into tm-qpr-dev 2022-09-15 22:32:54 +00:00
Evan Rosky
ccb00cdb19 Merge "Support display-rotation during a split-to-recents transition" into tm-qpr-dev 2022-09-15 22:15:26 +00:00
Mady Mellor
ca7e3d3001 Allow the dismiss target size to be overridden
For floating tasks the normal target size is too small to really
fit the task window, this allows the dismiss target to have a
different size set via a resource id.

Test: manual - override the size (in different CL), observe that
               the target is at that size.
Bug: 237678727
Change-Id: I85edae739992662852d4cf40c250714a100a67bb
2022-09-15 19:17:51 +00:00
Mady Mellor
0cde4a9202 Expose getTaskInfo on TaskView
There's a bunch of useful stuff on TaskInfo (e.g. taskDescription and
background color). This exposes the existing method on TaskView so
users of TaskView can get this info.

Bug: 237678727
Test: none
Change-Id: I95e4bc37562a9f51b2cf6cec6d03889f57222e30
2022-09-15 19:17:36 +00:00
Mady Mellor
d0382078ba Fix NPE where BubbleExpandedView is null when we want to show manage education view
mManageEduView.show() requires a non-null BubbleExpandedView but getExpandedView() is declared as nullable.

Bug: 246824356
Bug: 246902054
Test: manual
Change-Id: I19d733ced80d121c7dab40936721c9cc8be1a12e
2022-09-15 18:54:49 +00:00
Evan Rosky
e992df1822 Support display-rotation during a split-to-recents transition
Some test automation will dismiss split-screen to launcher and then
immediately rotate the display. Currently, we can't properly
transactionalize the display-rotation, so it just gets squashed into
the existing collecting transition. The result is that the split-
screen handler expected just a split-screen transition but also got
a display-rotation.

This CL adds a mixed-handler case for rotation+split-screen that
stage-coordinator can then use to divide the transition into two
animations.

Bug: 244486556
Test: atest NexusLauncherTests:TaplTestsTaskbar#testLaunchAppInSplitscreen_FromTaskbarAllApps
Change-Id: I82b6a20155dc84e58ab95964da64c9c741f761d9
2022-09-15 11:26:17 -07:00
TreeHugger Robot
b35193cd49 Merge "Use InstanceId in SplitscreenEventLogger for non-drag events" into tm-qpr-dev am: 8e55f94e74
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19875775

Change-Id: Ief3ddcda6eed8af3b68d0765adcf2aa3dda8c1c7
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 09:44:00 +00:00
TreeHugger Robot
8e55f94e74 Merge "Use InstanceId in SplitscreenEventLogger for non-drag events" into tm-qpr-dev 2022-09-15 09:35:12 +00:00
Chris Li
232ceb19da Merge "Fix ActivityEmbedding Shell transition animation with reparent" into tm-qpr-dev am: 3f67b88826
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19847347

Change-Id: I72dee85ea31b8d76145f0479ec62b5d1afd7adb2
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-15 06:59:42 +00:00