Commit Graph

6057 Commits

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

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

Change-Id: I3b68b318c2382f845b3e1974a6865b2a1c9977cb
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-21 21:39:51 +00:00
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
Bill Yi
e0ed42d5a2 Merge "Import translations. DO NOT MERGE ANYWHERE" 2022-09-21 02:26:29 +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
Evan Rosky
ce3586ec39 Merge "Adjust caption observer for desktop transition" into tm-qpr-dev am: 556ecc8da9 am: 0ac4d2e85d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19973036

Change-Id: Ibe20c26f760b42b0e4f50afe62775b3571b72b50
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 17:29:00 +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
5473b217d7 Merge "Move PiP swiftly in response to IME with keep clear areas flag enabled." into tm-qpr-dev am: 56cf35b281 am: d0609b03c7
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19954058

Change-Id: Ie5add78e0ed9486767ffedc2029a3cf789772383
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 14:31:50 +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
02493c976f Merge "Reduce flicker when split pair switching" into tm-qpr-dev am: 1c2c0b5258 am: 46ddfb3987
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19964446

Change-Id: Id5a36d33e95871763d6a0fce9b40569593201f73
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 03:53:13 +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
Bill Yi
c0a0a0b4c2 Import translations. DO NOT MERGE ANYWHERE
Auto-generated-cl: translation import
Change-Id: I2de86dc52f6c37daaa49d4386c5a5a5bb5d8cf46
2022-09-19 19:59:43 -07:00
TreeHugger Robot
70dbc9cd8a Merge "Allow background activity launch by drag notification" into tm-qpr-dev am: d7e17f97c7 am: 6d119e6c64
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19967613

Change-Id: Id8c6fc9c14a1860e9f0a4896f0382e26e7fb048e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-20 01:06:56 +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
Chilun Huang
8ad555c1dd Merge "Move unstable tests to postsubmit" 2022-09-19 23:54:47 +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
Pablo Gamito
5c04ae0b84 Merge "Update PiP region movement logic" 2022-09-19 16:50:46 +00:00
Chilun Huang
0a0f3d3b16 Move unstable tests to postsubmit
Move unstable tests to postsubmit.

Bug: 225582520
Bug: 245472831
Bug: 246490534
Test: atest com.android.wm.shell.flicker.splitscreen
Change-Id: Iec08a185c5e95f4810b962989ab22b67d71a2f82
2022-09-20 00:26:03 +08:00
Pablo Gamito
520f0183b6 Merge "Fix PiP Flicker test transitions" 2022-09-19 14:17:03 +00:00
Pablo Gamito
6ae3883e86 Update PiP region movement logic
We want the assertion to be stricter and ensure we actually assert that the region is moving and fail if it doesn't move.

Test: atest FlickerTests WmShellFlickerTests
Bug: 247464794
Change-Id: I81eba3a61f4e999fc46b3a567db39d1d9a4e469b
2022-09-19 12:20:44 +00:00
Pablo Gamito
c35d359131 Fix PiP Flicker test transitions
Ensures we don't have no-op transitions anymore. Another change makes it
so we assert and fail if we have transitions we no entries to make sure
we don't fail silenetly in these cases.

Test: atest FlickerTests WmShellFlickerTests
Bug: 247464790
Change-Id: Iaad739c4bb869c51c6deee582ae5ff9c81013ea2
2022-09-19 09:09:00 +00: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
6ebcc11a1a Merge "Move active task tracking to a repository" into tm-qpr-dev am: 0a0969af1c am: d9d37cf01d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19969528

Change-Id: Ie6c6f645a53068bea0f4678908d30a7518dd154d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 13:00:14 +00:00
Matt Sziklay
90fd29faac Merge "Show captions on tablets even when display windowing mode is fullscreen." into tm-qpr-dev am: 488a69bfc4 am: 8e8b5225f9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19817715

Change-Id: Ibec750e60f61d62b4938a80eb7a0218632fd0146
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:58:55 +00:00
Maryam Dehaini
5e402c601e Merge "Fixing UI Crash" into tm-qpr-dev am: b25a29ed88 am: 45f5234998
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19972432

Change-Id: Ib7b6683f444f817dcc15f0c1d06445862b75c37e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:57:41 +00:00
Evan Rosky
ef854fbdb9 Merge "Use transition for desktop-mode switch when enabled" into tm-qpr-dev am: d6c6f5865f am: ddf207959e
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19973186

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

Change-Id: Ibe6cda2b54cb2f75a5b12ac3c24e59a418c2057e
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-17 12:45:48 +00: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
54b3167fbb Merge "Fix timeout when dismissing split screen to two pane mode" into tm-qpr-dev am: b48c123b67 am: 0f30697436
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/19947800

Change-Id: Ia491efa508e29fa20f52ea3d88f744f1130ad02f
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-09-16 01:47:19 +00:00