Commit Graph

687 Commits

Author SHA1 Message Date
Wale Ogunwale
635fad1ebc Merge "Fixed issue with not sending stage position change" into sc-dev am: b4080f637b
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13522406

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I6667facbb82a23912d1bddf806a6c917d45967bb
2021-02-09 22:15:31 +00:00
Wale Ogunwale
b4080f637b Merge "Fixed issue with not sending stage position change" into sc-dev 2021-02-09 21:04:38 +00:00
TreeHugger Robot
6c150b29ae Merge "Migrate Pip tests to new DSL format" into sc-dev am: 573555ffa8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13462265

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I40e49ea84f068c6a0ed4b635c497d4805e2612f8
2021-02-09 18:24:34 +00:00
Wale Ogunwale
31e48a2df8 Fixed issue with not sending stage position change
Also, added API to specify if split-screen should exit on hide.

Bug: 179176511
Test: presubmits
Change-Id: Iad2884554d16d922906386cb2887bcf35d6327e8
2021-02-09 07:23:31 -08:00
Nataniel Borges
068156db02 Migrate Pip tests to new DSL format
Make sure the test can run multiple times and is stable on flame

Introduce methods to allow waitForPipWindowShow/Gone using the WindowManagerState to determine if a PIP window is active (windowingMode = PINNED), since the UiDevice method is unstable and doesn't work on TVs.

Bug: 171049720
Bug: 172321238
Bug: 171049762
Test: atest WMShellFlickerTests
Change-Id: Iade19fadeb0ba07e047eb5f64479e592920ca11e
2021-02-09 15:13:54 +01:00
TreeHugger Robot
31fe5eecd1 Merge changes I08071058,I9a64a7ab into sc-dev am: 2390b55c90
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13453945

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9a70b19bda3f259df7f4918e65143c55575d59b0
2021-02-09 09:36:53 +00:00
TreeHugger Robot
2390b55c90 Merge changes I08071058,I9a64a7ab into sc-dev
* changes:
  Update app pairs tests to new DSL format
  Create common assertions for new tests
2021-02-09 08:41:44 +00:00
TreeHugger Robot
ac05f2d970 Merge "Apply fixed rotation animation for pip to fullscreen" into sc-dev am: ca7f10993f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13425308

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I64eee759eff3ea5147d45dc431a45cfbb7470df7
2021-02-09 07:17:29 +00:00
TreeHugger Robot
ca7f10993f Merge "Apply fixed rotation animation for pip to fullscreen" into sc-dev 2021-02-09 07:08:02 +00:00
Winson Chung
67bfa268c8 Merge changes I06d26609,I0afbacd0 into sc-dev am: 5bb86857d6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13502601

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9d243fcdf1e2c01ac2da0512fab0f606b2d4b6fe
2021-02-09 07:05:32 +00:00
Winson Chung
5bb86857d6 Merge changes I06d26609,I0afbacd0 into sc-dev
* changes:
  10/ Update split for shell thread
  9/ Update transitions/starting window for shell thread
2021-02-09 06:40:57 +00:00
Rob Carr
301ff0985c Merge "Port SurfaceControlViewHost to BLAST" into sc-dev am: c534edd535
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13463021

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I57fc7f63d18740ef3a3683da58bfcfd3ddddb7a2
2021-02-09 01:23:38 +00:00
Rob Carr
c534edd535 Merge "Port SurfaceControlViewHost to BLAST" into sc-dev 2021-02-09 01:10:51 +00:00
Hongwei Wang
a18f3f1781 Merge "Revert "Add an invisible layer to trap focus"" into sc-dev am: f3e5e9cdee
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13520019

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ic77d7d9ab4a1e576a44c16bd0030d150a50d2e79
2021-02-08 22:58:31 +00:00
TreeHugger Robot
820faa7ab5 Merge "Remove flaky from default excluded tests" into sc-dev am: cfce53fc55
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13494165

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Id10e5e0f3e79118d3d63ab546dd1e40c38d93c83
2021-02-08 22:58:06 +00:00
Hongwei Wang
f3e5e9cdee Merge "Revert "Add an invisible layer to trap focus"" into sc-dev 2021-02-08 22:36:14 +00:00
TreeHugger Robot
cfce53fc55 Merge "Remove flaky from default excluded tests" into sc-dev 2021-02-08 22:33:02 +00:00
Robert Carr
fb59b6880f Port SurfaceControlViewHost to BLAST
This is mostly a matter of flipping the flag, except for the case of
SystemWindows. While external SurfaceControlViewHost clients use the
leash provided by the SurfaceControlViewHost rather than the internal
ViewRootImpl surface, SystemWindows clients will use the actual
ViewRootImpl surface. This can conflict with the BLAST adapter setting
crop/frame/etc on this Surface. We modify SystemWindows to put
each layer inside a leash, and hand this out to other parts of SysUI
instead of the ViewRootImpl surface.

Test: Existing tests pass
Bug: 168505645
Change-Id: Ie621f89166f00ce385d450f1f1cea4d4abd1b805
2021-02-08 13:33:00 -08:00
Ben Lin
7d8dbc05ef Merge "PiP: Better rotation angle calculation." into sc-dev am: 5f5968a225
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13496872

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I0ba78c514ff7d813ac458d23556d48ad39a93818
2021-02-08 20:27:15 +00:00
Ben Lin
5f5968a225 Merge "PiP: Better rotation angle calculation." into sc-dev 2021-02-08 20:20:39 +00:00
Jorge Gil
9c7c48e4fb Merge "Run alignment logic of menu icons when the menu is created" into sc-dev am: bec99582ef
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13472373

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I242a210e5bfebbc653cc8675acd2f9eaf33169ca
2021-02-08 19:51:58 +00:00
Jorge Gil
bec99582ef Merge "Run alignment logic of menu icons when the menu is created" into sc-dev 2021-02-08 19:51:18 +00:00
Hongwei Wang
f2fd0294a9 Revert "Add an invisible layer to trap focus"
This reverts commit cb98114abd.

Reason for revert: Not needed once ag/13507782 is merged

Bug: 169372603
Change-Id: I52d4344f6f2f3fb973f3f20e7d6f1ec2844d7567
Test: manually enter PiP
2021-02-08 18:43:30 +00:00
Nataniel Borges
3ff83743e2 Remove flaky from default excluded tests
Atest cannot override include-annotation and exclude-annotation from the Android.xml, only append new ones.

Ideally we should have a single test configuration for all flicker tests (presubmit/postsubmit/flaky) and adjust the arguments according to the type of test we intend to run.

Presubmit:
    atest FlickerTests -- --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

Postsubmit:
    atest FlickerTests -- --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Postsubmit --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest

Flaky:
    atest FlickerTests -- --module-arg FlickerTests:include-annotation:androidx.test.filters.FlakyTest

To run WMShellFlickerTests, just replace FlickerTests for WMShellFlickerTests in the commands above.

Bug: 170490377
Test: atest FlickerTests WMShellFlickerTests
Change-Id: Ic252f27065714e9039e3c0f33659b98eb288aa6f
2021-02-08 14:19:09 +01:00
Winson Chung
0054d7fc8c 10/ Update split for shell thread
- Also remove usages of external interface within the shell code
  and remove methods only used in the controller from the interface
  (will update for other components separately)

Bug: 161979899
Test: atest WMShellUnitTests
Test: atest SystemUITests
Change-Id: I06d266095d8e287ba131e41dc6bebefa15c9e477
2021-02-07 21:14:07 -08:00
Winson Chung
6c75e58fc6 9/ Update transitions/starting window for shell thread
Bug: 161979899
Test: atest WMShellUnitTests
Test: atest SystemUITests
Change-Id: I0afbacd0db32ef02f1e178f7a53b16df5b64449b
2021-02-07 21:07:43 -08:00
Riddle Hsu
c0e5b3d92f Apply fixed rotation animation for pip to fullscreen
The activity surface is rotated by WM core when changing
the windowing mode of PiP activity to fullscreen. And then
PipTaskOrganizer#onFixedRotationStarted will be called before
WindowContainerTransactionCallback#onTransactionReady. So
PipTaskOrganizer can use the given new rotation to run the
animation in current rotation. After the animation is done,
PipTaskOrganizer will set the task to fullscreen, that makes
previous top activity pause and then resume the next top
activity (the original PiP). Finally, the fixed rotation is
finished by transition done event, and then continue to
rotate the display seamlessly.

Also remove mInitialState from PipTaskOrganizer because it
is no longer needed for predicting the fullscreen bounds.

Bug: 165794724
Test: DisplayContentTests#testFixedRotationWithPip
      PipAnimationControllerTest#pipTransitionAnimator_rotatedEndValue
Test: Expand PiP in portrait which was in landscape

Change-Id: I5c1400ece9d80226bc35b497d308215010ead027
2021-02-08 12:25:27 +08:00
Nataniel Borges
628b65f91e Update app pairs tests to new DSL format
Move the existing assertions into presubmit and flaky blocks

Bug: 162923992
Test: atest FlickerTests
Change-Id: I08071058fdaec33f65e03bd97d41c4bc91125040
2021-02-07 11:18:58 +01:00
Nataniel Borges
0d56c0f528 Create common assertions for new tests
Maintain the same assertions for new assertion blocks and legacy. This CL is used while migrating the existing tests from the old to the new DSL format.

Once the tests are migrated the legacy support will be removed.

Bug: 162923992
Test: atest FlickerTests
Change-Id: I9a64a7ab43bf60c67a26f37562ab6c4d7bb0c487
2021-02-07 11:18:43 +01:00
Ben Lin
852a04c2da PiP: Better rotation angle calculation.
Bug: 178881304
Test: Manual
Change-Id: Ib63ef96a7b8771b2a920a25e44d8583dc584cf05
2021-02-05 16:29:06 -08:00
TreeHugger Robot
242670cc8c Merge "Update badge visibility on expand and collapse" into sc-dev am: 028348d871
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13441643

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iadae615f3b8fe4dc11ae46601cebc843683d8c60
2021-02-05 20:37:52 +00:00
TreeHugger Robot
028348d871 Merge "Update badge visibility on expand and collapse" into sc-dev 2021-02-05 20:30:51 +00:00
TreeHugger Robot
068116eb5e Merge "Enable kotlin tests in shell & fix some bubbles ones" into sc-dev am: e2215fc083
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13482710

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I08d6919cf8a39b05d70219c7ebbca4ad9941a709
2021-02-05 18:13:43 +00:00
TreeHugger Robot
e2215fc083 Merge "Enable kotlin tests in shell & fix some bubbles ones" into sc-dev 2021-02-05 17:53:09 +00:00
Lyn Han
c26a783646 Merge "Skip reorder animation while collapsing" into sc-dev am: fddf14356a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13442648

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifea129c655f81beb93c4ef58d195dd133b23c68a
2021-02-05 15:05:38 +00:00
Lyn Han
fddf14356a Merge "Skip reorder animation while collapsing" into sc-dev 2021-02-05 15:01:03 +00:00
Ben Lin
a7b862c537 Merge "PiP: Pinch-resize auto to max size if it's pretty close to it." into sc-dev am: 563727df26
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13442885

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I9c1cc573cb8209fb012fc5fc196003870f9ebdba
2021-02-05 03:00:36 +00:00
Ben Lin
563727df26 Merge "PiP: Pinch-resize auto to max size if it's pretty close to it." into sc-dev 2021-02-05 02:19:38 +00:00
TreeHugger Robot
6363030864 Merge "Disable split screen tests at 90 degrees" into sc-dev am: 7ff13b5213
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473554

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I88a807b71363eded8620c43a7da01ff9ea1867f0
2021-02-05 01:28:16 +00:00
TreeHugger Robot
7ff13b5213 Merge "Disable split screen tests at 90 degrees" into sc-dev 2021-02-05 00:53:37 +00:00
TreeHugger Robot
943a8fd945 Merge "Log bubble package when available" into sc-dev am: 80f96120be
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13441716

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I385bf524f2cc554c182662418d483431fcabcbe6
2021-02-05 00:13:07 +00:00
TreeHugger Robot
80f96120be Merge "Log bubble package when available" into sc-dev 2021-02-05 00:08:45 +00:00
Evan Rosky
d277022c2a Merge "Add some more Protologs to Shell-side Transitions" into sc-dev am: 8277f84911
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13473347

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ifb9109359d82f6fd5e54260701883e4e41030f2f
2021-02-04 23:43:30 +00:00
Evan Rosky
8277f84911 Merge "Add some more Protologs to Shell-side Transitions" into sc-dev 2021-02-04 23:33:08 +00:00
TreeHugger Robot
f69986fa4d Merge "Save the notification group key on the bubble" into sc-dev am: 70b6c098ab
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13484220

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ibb8779b1d7b01f8a552ed05e105d3de468274897
2021-02-04 23:21:42 +00:00
Ben Lin
eb03e58426 Merge "Add basic PiP Transition foundation." into sc-dev am: f3e2661602
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13420528

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Ia4c7809301d7ee12b3c18467a774742c8e118404
2021-02-04 23:19:33 +00:00
TreeHugger Robot
70b6c098ab Merge "Save the notification group key on the bubble" into sc-dev 2021-02-04 23:08:50 +00:00
Ben Lin
f3e2661602 Merge "Add basic PiP Transition foundation." into sc-dev 2021-02-04 22:40:43 +00:00
Lyn Han
5b68054c24 Merge "Log overflow bubble restoration after phone reboot" into sc-dev am: 5c87a1940c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13447707

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I1de91dfe6307e84fef687741bca1768d405b9be6
2021-02-04 20:28:05 +00:00
Lyn Han
5c87a1940c Merge "Log overflow bubble restoration after phone reboot" into sc-dev 2021-02-04 20:17:40 +00:00