Commit Graph

3282 Commits

Author SHA1 Message Date
Jerry Chang
e48600b2ce Merge "Fix not able to launch activity adjacently" into sc-v2-dev am: 0a7b7c3790 am: d0776f91fb
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16356983

Change-Id: Ibaeb71b1007fc7bc902d23c09dac2fa2330441fc
2021-11-30 03:43:58 +00:00
Wei Sheng Shih
1f20ba7969 Merge "Clear all starting window while unregister organizer." 2021-11-30 03:43:12 +00:00
Jerry Chang
d0776f91fb Merge "Fix not able to launch activity adjacently" into sc-v2-dev am: 0a7b7c3790
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16356983

Change-Id: I61291aaa66017dfeda96103bd111d144dbd7beeb
2021-11-30 03:32:54 +00:00
Jerry Chang
0a7b7c3790 Merge "Fix not able to launch activity adjacently" into sc-v2-dev 2021-11-30 03:23:58 +00:00
TreeHugger Robot
ff92c7eb69 Merge "Fix user education placement" into sc-v2-dev am: bd74e73b97 am: 4e0592da52
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16337776

Change-Id: Id00c648a72ece81da87db421a2e8b4f138247112
2021-11-29 19:41:46 +00:00
TreeHugger Robot
e1f82463e0 Merge "Don't show user education when integration tests are running" into sc-v2-dev am: 91ce475306 am: 337e5c40af
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16339146

Change-Id: Icd8a85660b5c090eee88b24ac9728db782663d21
2021-11-29 19:40:58 +00:00
TreeHugger Robot
4e0592da52 Merge "Fix user education placement" into sc-v2-dev am: bd74e73b97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16337776

Change-Id: If903cc7efd49034105f1d6946f4f987ad5b8c72a
2021-11-29 19:23:51 +00:00
TreeHugger Robot
337e5c40af Merge "Don't show user education when integration tests are running" into sc-v2-dev am: 91ce475306
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16339146

Change-Id: I4ca0b3bded860e42244b3480efd8e04fefae7a4f
2021-11-29 19:22:43 +00:00
TreeHugger Robot
bd74e73b97 Merge "Fix user education placement" into sc-v2-dev 2021-11-29 19:18:56 +00:00
TreeHugger Robot
91ce475306 Merge "Don't show user education when integration tests are running" into sc-v2-dev 2021-11-29 19:07:35 +00:00
Jerry Chang
565c0b23ec Fix not able to launch activity adjacently
Make it considers launch flags when finding launch root for existing
activity and add back set launch adjacent flag root task logic which was
accidently removed by Ie259abc1.

Fix: 204578587
Test: launch new/existing activity with launch-adjacent-flag will launch
      into split root and trigger split screen.
Test: passed existing tests
Change-Id: I0e637c198de9c7b08e27864771cebd951e4fdac2
2021-11-29 17:49:42 +08:00
Ioana Moraru
b8f3f9d239 Enable FASS assertions for Pip Exit
Add a new test rule to ExitPipTest for comparing the new FASS
assertions with the old flicker testing. If the flicker tests from one category
(presubmit/postsumbit/flaky) are passing or failing, the corresponding
FASS test should have the same behaviour.

Bug: 201523242
Test: see the results in the dashboard go/wm-tests-flicker
Change-Id: I606e57d8780c0d7cb6191890b052501b7974b034
2021-11-29 10:29:46 +01:00
Jerry Chang
5f5e11fc60 Merge "Support to start tasks into split screen with specific split ratio" into sc-v2-dev am: 488d986cae am: 6977b7fec6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16331279

Change-Id: Ic149b0830d33a16b632e2b28c53aa8b29a7d205f
2021-11-26 06:07:53 +00:00
Jerry Chang
6977b7fec6 Merge "Support to start tasks into split screen with specific split ratio" into sc-v2-dev am: 488d986cae
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16331279

Change-Id: I313027cfd1d1c0ab9bc76d080cd2d5275174a877
2021-11-26 05:56:03 +00:00
Jerry Chang
488d986cae Merge "Support to start tasks into split screen with specific split ratio" into sc-v2-dev 2021-11-26 05:43:34 +00:00
Nataniel Borges
899d9804d5 Merge "Promote/demote stable/flaky flicker tests" 2021-11-25 15:37:11 +00:00
Ben Lin
544739c611 Merge "PiP: Show/hide enter split button based on focused task." into sc-v2-dev am: a656a4e4e4 am: 1fb065c8dc
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16244368

Change-Id: I5700e97a26d5a4a79fb4a065479b3207c716cc69
2021-11-25 07:45:54 +00:00
Ben Lin
1fb065c8dc Merge "PiP: Show/hide enter split button based on focused task." into sc-v2-dev am: a656a4e4e4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16244368

Change-Id: If6b2c50bdb661910f2ad9522c3a4595bdc080587
2021-11-25 07:33:29 +00:00
Ben Lin
a656a4e4e4 Merge "PiP: Show/hide enter split button based on focused task." into sc-v2-dev 2021-11-25 07:18:59 +00:00
Jerry Chang
9e6c73784c Support to start tasks into split screen with specific split ratio
Split tasks can be shawn with different split ratio in overview panel.
Supports to specify split ratio when launching split tasks from
overview.

Fix: 207479945
Test: atest WMShellUnitTests
Test: Quickswitch back to app pair keep split ratio
Change-Id: Ifa6d57c0ec9b75fbcaeb80a11a95f65af8c09a0b
2021-11-25 11:36:02 +08:00
Mady Mellor
dbb136d2f5 Fix user education placement
We were only showing the user education on click, so
you could drag the bubble then click on it, then the
user education would appear. However, the bubble wouldn't
be in the spot we'd expect due to the initial drag so the
user education would be misplaced.

This change fixes the issue by showing the user education
in the touchlistener onDown(*). Subsequent actions in
that gesture won't do anything. A small issue is that the
clickListener could be triggered in this state and then
immediately hide the education, to work around this I
added a flag to indicate if the education showed from the
touchListener & skip hiding in that case.

(*) Ideally this would occur in a proper down/up action
rather than onDown but there's a lot going on in the
touch handling and I think this is simplest.


Test: manual - (reset device) check that tapping the
               bubble shows the education
             - (reset device) check that dragging the
                bubble shows the education and the bubble
                doesn't move on the drag
             - education shouldn't show more than once
             - bubble should be draggable after the edu
               goes away
Bug: 200151972
Change-Id: I0bdb8d165641b5cad234b3053eb73e0575916102
2021-11-24 17:10:34 -08:00
Mady Mellor
a11bcc2a2b Don't show user education when integration tests are running
Test: atest PlatformScenarioTests:android.platform.test.scenario.sysui.bubble.Overflow
Fixes: 150344903
Change-Id: I9167359811bb2d105fcd6b075b95aa283ff25e30
2021-11-24 17:08:07 -08:00
Ben Lin
b26f380809 PiP: Show/hide enter split button based on focused task.
Bug: 202740657
Test: Enter PiP, go to home, tap on PiP - menu does not have split
button
Test: Enter PiP, open Messages, tap on PiP - menu shows split button

Change-Id: Ide755008f9b6ad844d7453fb024f2d6c7db4f36b
2021-11-24 14:29:31 -08:00
Nataniel Borges
3968a53df5 Promote/demote stable/flaky flicker tests
Also downgrade all FASS assertions to flaky

Promote:
- stable postsubmit to presubmit
- stable flaky to postsubmit

Demote:
- unstable postsubmit to flaky

Test: atest FlickerTests WMShellFlickerTests

Change-Id: I9e43398b8b00286ce74d4c41505124512bed7eeb
2021-11-24 18:14:34 +01:00
Winson Chung
7d9da5c1d3 Merge "Add null check for mRootTaskInfo in AppPair dump" am: e39da5a9a7 am: 6b88dadc8b am: 6eb2fbbe3c am: bcaa34d13f
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890538

Change-Id: I98c68104042fd15f7ef023d7d49bebfa7365116e
2021-11-24 06:42:45 +00:00
Winson Chung
bcaa34d13f Merge "Add null check for mRootTaskInfo in AppPair dump" am: e39da5a9a7 am: 6b88dadc8b am: 6eb2fbbe3c
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890538

Change-Id: Ia911fe0f41a537f400b0c5de6713d5f4a6d4c9d7
2021-11-24 06:24:21 +00:00
Winson Chung
6eb2fbbe3c Merge "Add null check for mRootTaskInfo in AppPair dump" am: e39da5a9a7 am: 6b88dadc8b
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890538

Change-Id: I2269aa45b751171b9470dd1b2d61ab25537300cb
2021-11-24 06:07:18 +00:00
Winson Chung
6b88dadc8b Merge "Add null check for mRootTaskInfo in AppPair dump" am: e39da5a9a7
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1890538

Change-Id: Ifd160aed0f9e192507752d7bffb30195a0164d5f
2021-11-24 05:50:50 +00:00
Garfield Tan
922c436e12 Merge "Guard absent SplitScreen in PipTaskOrganizer" into sc-v2-dev am: c35cf07c60 am: febf2257b9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16332338

Change-Id: Id2629d6c90a8558635efa2e63574aa81dbbf80c5
2021-11-24 04:04:07 +00:00
Garfield Tan
febf2257b9 Merge "Guard absent SplitScreen in PipTaskOrganizer" into sc-v2-dev am: c35cf07c60
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16332338

Change-Id: I61387fd8f0e0e7fd9915101223df3681e37e15bb
2021-11-24 03:58:27 +00:00
Garfield Tan
c35cf07c60 Merge "Guard absent SplitScreen in PipTaskOrganizer" into sc-v2-dev 2021-11-24 03:43:02 +00:00
Jerry Chang
a6b8103316 Merge "Revert "Support to transfer freeform task into split screen"" into sc-v2-dev am: 21f00a141a am: 3973ceeadf
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16331281

Change-Id: I2da62d3b9bd2cd0b9fe383cbe10f78f8fbfbeff9
2021-11-24 02:49:23 +00:00
Jerry Chang
3973ceeadf Merge "Revert "Support to transfer freeform task into split screen"" into sc-v2-dev am: 21f00a141a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16331281

Change-Id: I4c8067fcefff66a77e123de191c1074f8dad3ef7
2021-11-24 02:44:34 +00:00
Jerry Chang
21f00a141a Merge "Revert "Support to transfer freeform task into split screen"" into sc-v2-dev 2021-11-24 02:26:23 +00:00
Wei Sheng Shih
e0081af252 Merge "Fade out branding image with icon while exit splash screen." into sc-v2-dev am: 26fffc68d9 am: 9e30939be1
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16309095

Change-Id: I6740f646b628b4c222d64912c45df3570ac19d44
2021-11-24 01:47:51 +00:00
Wei Sheng Shih
9e30939be1 Merge "Fade out branding image with icon while exit splash screen." into sc-v2-dev am: 26fffc68d9
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16309095

Change-Id: Ieb36dd5b93ce25d791926c4599a52e6271af5815
2021-11-24 01:30:12 +00:00
Garfield Tan
2daf28f449 Guard absent SplitScreen in PipTaskOrganizer
Current code assumes the presence of SplitScreen, so it crashes if
SplitScreen doesn't exist.

Bug: 207495281
Test: Transition in and out of PIP still works on phones.
Test: Transition from PIP to split screen on phones.
Change-Id: I6f2f05a1237c9e64f1df95b05347a1affa9b5a27
2021-11-23 13:25:48 -08:00
Jerry Chang
1b8e88840a Revert "Support to transfer freeform task into split screen"
This reverts commit bd8b345337.

Reason for revert: b/207034379

Change-Id: I48d9b5289dd52d72f925cb155f38c5a1ed493d49
2021-11-23 17:50:36 +00:00
wilsonshih
7695b74903 Clear all starting window while unregister organizer.
The starting window view might left in client's ShellTaskOrganizer,
clear all of the starting windows view while unregister task organizer
to preventing those views from left.
Consolidating the remove window methods together.

Bug: 207175662
Test: build/flash
Test: atest StartingSurfaceDrawerTests SplashscreenTests
Change-Id: I93e4862b7f866c7c73d9b3999a74e03784848058
2021-11-23 18:15:13 +08:00
wilsonshih
9af01bb336 Fade out branding image with icon while exit splash screen.
Fade out the branding image with icon if exists.

Test: atest SplashscreenTests
Test: manual launch test app to see branding image is fadeout.
Bug: 207298633
Change-Id: I629ee8548198fe33671586048a999049b958b0e2
2021-11-23 03:43:49 +00:00
Bill Lin
b100854552 Merge "Fix logic error in WMShellBaseModule.java break OHM function" into sc-v2-dev am: 17b9e72d9b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16309991

Change-Id: I27eac4ba5c270fa7357930399057734e8b5d3ee7
2021-11-23 00:19:58 +00:00
Bill Lin
ea628fc385 Merge "Fix logic error in WMShellBaseModule.java break OHM function" 2021-11-23 00:18:00 +00:00
Garfield Tan
531e9bbdc0 Merge "Make FullscreenTaskListener overridable" 2021-11-22 17:09:32 +00:00
Bill Lin
243337fcfe Fix logic error in WMShellBaseModule.java break OHM function
There was a logic error in WMShellBaseModule.java while implement
@DynamicOverride for WM-Shell features

Test: atest WMShellUnitTests
Test: manual enable OHM and trigger
Bug: 206901301
Change-Id: I52732b962a0e6265b22bf9979c3ef7f4f61046c6
2021-11-22 09:51:05 +00:00
Bill Lin
7abf9aac39 Fix logic error in WMShellBaseModule.java break OHM function
There was a logic error in WMShellBaseModule.java while implement
@DynamicOverride for WM-Shell features

Test: atest WMShellUnitTests
Test: manual enable OHM and trigger
Bug: 206901301
Change-Id: I52732b962a0e6265b22bf9979c3ef7f4f61046c6
2021-11-22 17:39:08 +08:00
Tom Natan
46f4555269 Merge "Change the restart button to use material colors" into sc-v2-dev am: 6e88bd05a8 am: 23a5024960
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306282

Change-Id: Ia7bea4d2e6655c2ae5c95a82014190ce90f8ab6b
2021-11-20 20:40:18 +00:00
Tom Natan
23a5024960 Merge "Change the restart button to use material colors" into sc-v2-dev am: 6e88bd05a8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16306282

Change-Id: I4f261f2b688d7f4702abd52df480f316a54f1852
2021-11-20 20:29:00 +00:00
Tom Natan
6e88bd05a8 Merge "Change the restart button to use material colors" into sc-v2-dev 2021-11-20 20:16:35 +00:00
Garfield Tan
8386f4365f Make FullscreenTaskListener overridable
Bug: 207005150
Test: Device boots and app launches.
Change-Id: Ic95bb10cb4f2265e0fa21cd867e05975a46373c2
2021-11-19 15:33:59 -08:00
Winson Chung
9ed5fc6958 Merge "Invalidate recent tasks when the splits (or split info) changes" into sc-v2-dev am: cc4a85c0a9 am: 9f667fb094
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/16289022

Change-Id: Ib7219ba27b3209d5b8eb62bcc83d6383b833c9d7
2021-11-19 21:52:34 +00:00