Commit Graph

4056 Commits

Author SHA1 Message Date
Pablo Gamito
f9d9e81f75 Merge "Promote and demote flicker tests" into tm-dev am: e1dbfe84d4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17567805

Change-Id: I427f704cd9e6e15de2507f41d8c5b562ac39cf3b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 11:05:30 +00:00
Pablo Gamito
e1dbfe84d4 Merge "Promote and demote flicker tests" into tm-dev 2022-04-05 10:00:29 +00:00
Galia Peycheva
2063873041 Merge "Add edu text to TV PiP" into tm-dev am: 49f5f057b6
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378167

Change-Id: Icefc4bed35df71973fbebc9e17537b8d4397ca1a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 06:17:57 +00:00
Galia Peycheva
2f77d84220 Merge "Add Tv Pip rounded corners tray" into tm-dev am: b26603d090
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17378166

Change-Id: I691802739ab852481a3543094c006716f00695df
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-05 06:17:05 +00:00
Galia Peycheva
49f5f057b6 Merge "Add edu text to TV PiP" into tm-dev 2022-04-05 06:01:26 +00:00
Galia Peycheva
b26603d090 Merge "Add Tv Pip rounded corners tray" into tm-dev 2022-04-05 05:59:14 +00:00
Pablo Gamito
ac56c3acc2 Promote and demote flicker tests
Test: atest FlickerTests WMShellFlickerTests -- --module-arg FlickerTests:include-annotation:android.platform.test.annotations.Presubmit --module-arg FlickerTests:exclude-annotation:android.platform.test.annotations.Postsubmit --module-arg FlickerTests:exclude-annotation:androidx.test.filters.FlakyTest
Change-Id: I10699aed8cd4cfb7e053b32b5a526aa5ce78c584
2022-04-04 21:12:43 +00:00
Tiger Huang
9fff2eed19 Merge "Let TaskSnapshotWindow compute its window frame" into tm-dev am: da5263ebd2
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17525803

Change-Id: I6085359f2347a823dcddb4502cffdffa6706d16a
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-04 19:39:11 +00:00
Tiger Huang
da5263ebd2 Merge "Let TaskSnapshotWindow compute its window frame" into tm-dev 2022-04-04 18:51:59 +00:00
Galia Peycheva
c24734e830 Add edu text to TV PiP
The edu text is added to the bottom of the TvPipMenuView, below the
pip content. This also makes the front and back pip menu surfaces
change size while the edu text is showing. It is shown for 10 seconds
and after that it is hidden by sliding upwards. This repositions the
PiP window so that it is placed properly (centered in case of expanded
pip).

This change introduces temporary decor insets - this is for the edu
text. Temporary decor insets don't interfere with the keep-clear area
algorithm - they will not cause the pip to move if they intersect with
a keep-clear area. They are only taken into account when calculating
the anchor bounds. Permanent decor insets are also taken into account
when calculating intersecting keep-clear areas

Bug: 219884907
Test: manual - start pip and check that the edu text is displayed and
      goes away after 10 seconds
Change-Id: Ie27c633c517903a4bf0b1544626bd00b621c19d4
2022-04-04 14:33:07 +02:00
Galia Peycheva
d2d5e68312 Add Tv Pip rounded corners tray
This CL adds a permanent grey border around the pip surface, which
has rounded corners, and a backing surface, with the same color as the
border. This way the pip surface is sandwiched between the two pip menu
surfaces

Bug: 219883374
Test: m && open app in expanded pip && move pip to opposite edge
    && start dream && wake up dream && toggle expanded pip
Change-Id: Idf22ca22044e7e5e3ca6b39326e3afb76e3ee43c
2022-04-04 14:32:32 +02:00
Gaurav Bhola
4d3571a236 Merge "Add the insets visibilities requested by the focussed window in topFocussedWindowChanged() api." into tm-dev am: be5abebe9f
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17387203

Change-Id: Idf42c41d2680a03e40421561f464ba75466f5d6d
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 20:02:33 +00:00
Gaurav Bhola
be5abebe9f Merge "Add the insets visibilities requested by the focussed window in topFocussedWindowChanged() api." into tm-dev 2022-04-01 19:57:58 +00:00
TreeHugger Robot
8a85582e80 Merge "Re-deprecate animation backgroundColor API" into tm-dev am: c5866bede0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17351243

Change-Id: I083c814c2a3e536f5b52754aca85ccc3bac47348
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 11:55:25 +00:00
TreeHugger Robot
c5866bede0 Merge "Re-deprecate animation backgroundColor API" into tm-dev 2022-04-01 11:48:52 +00:00
Tony Huang
ef7eb132e1 Merge "Reduce flicker when resize animation" into tm-dev am: 86aff45356
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17518063

Change-Id: I99c239d38e5ac1e3446354632c8f859dbf2ee399
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 10:26:01 +00:00
Tony Huang
86aff45356 Merge "Reduce flicker when resize animation" into tm-dev 2022-04-01 10:10:06 +00:00
Vadim Caen
2710097370 Merge "Ensure no animation is run except for HOME" into tm-dev am: 87a1c2dd46
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17157493

Change-Id: Ic5b7a3a1c2c223befa8ae201508675f0c5523711
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:28:32 +00:00
Nick Chameyev
6731471c59 Merge "Migrate unfold animation to Shell transitions [Part 1]" into tm-dev am: a830367d97
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17071467

Change-Id: I457b4692e45d73b756669b490642902b5d5a65ef
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-04-01 09:27:25 +00:00
Vadim Caen
87a1c2dd46 Merge "Ensure no animation is run except for HOME" into tm-dev 2022-04-01 09:23:26 +00:00
Nick Chameyev
a830367d97 Merge "Migrate unfold animation to Shell transitions [Part 1]" into tm-dev 2022-04-01 09:13:09 +00:00
Hongwei Wang
c844386194 Merge "Do not set shadow when leaving PiP mode" into tm-dev am: 901e20fdf0
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17527240

Change-Id: Ibe52fb3fc600fa1979f6d96801e531bd8dee9656
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 23:36:23 +00:00
Pablo Gamito
2b770a7e86 Re-deprecate animation backgroundColor API
It's prefered to keep the API deprecated since the API was previously
deprecated and made a noop. Undeprecating it would lead to inconsistent
behavior across android versions. With the API not working on some
versions which can easily look like a bug from a developer's
perspective.

Instead we create a new API for the animation background effect refering
to an animation backdrop instead of a background. This also required
updating other API references of background in this context to backdrop.

Bug: 226122431
Test: atest CtsWindowManagerDeviceTestCases:ActivityTransitionTests

Merged-In: I4493d22a33606d639d498b6dc0f6f1bfa3d7f135
Change-Id: I4493d22a33606d639d498b6dc0f6f1bfa3d7f135
2022-03-31 23:27:01 +00:00
Hongwei Wang
901e20fdf0 Merge "Do not set shadow when leaving PiP mode" into tm-dev 2022-03-31 23:19:32 +00:00
Hongwei Wang
b1ffb7953c Do not set shadow when leaving PiP mode
Regression from ag/17456722 that setting the shadow radius when leaving
away from PiP would result in screen dimming.

Change to apply shadow radius when entering / moving / resizing PiP only

Bug: 227607130
Test: follow the reproduce steps in bug
Change-Id: Ie4d4dba94a1c66da52825798df60ebf3f971aa32
2022-03-31 18:47:52 +00:00
Tiger Huang
d8aa7f7882 Let TaskSnapshotWindow compute its window frame
When LOCAL_LAYOUT is enabled, TaskSnapshotWindow computes its window
frame on its own.

Bug: 161810301
Test: presubmit
Change-Id: I9e5bf9d5c93055017d303515ea1d1b0048776ebd
2022-03-31 23:28:30 +08:00
Vadim Caen
ff898c6407 Ensure no animation is run except for HOME
... and directly reset the animation state for other cases.

Fixes: 222769294
Test: BackAnimationControllerTest#verifyAnimationFinishes
Change-Id: If04885065076ef7e3c15f5cce2c1d040bd92b494
2022-03-31 15:27:23 +02:00
Nick Chameyev
3f12009a16 Migrate unfold animation to Shell transitions [Part 1]
Adds a trigger to DisplayContent that creates
unfold transition before applying the display size
and marks it as ready when the sizes are applied.

Adds a placeholder animation for fullscreen tasks.

Bug: 204925795
Test: enable shell transitions, open an app, unfold =>
 check that app surface is animated
Change-Id: Ia88178a7c7849a99c17b4d18117a05b2a0fb8b7f
2022-03-31 10:38:56 +00:00
Tony Huang
cfeb154a1b Reduce flicker when resize animation
When resize split, split decor use fade in animation but bottom
larger than bounds area is black, it will make color change from
black to decor background color and it just like flicker.

To avoid this, we should add back using of am#setSplitScreenResizing
which could make black backgound to color similar to app content
background. And it should also reduce flicker while snap divider to
dismiss split.

Bug: 220985951
Bug: 221178408
Test: manual
Test: pass existing tests
Change-Id: I961a4d3ab4f3552fd5ace4b3a6742afa980f073c
2022-03-31 14:47:44 +08:00
Jerry Chang
a58f16499d Merge "Make sure to release split layout when returning to home" into tm-dev am: c3cd94f727
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17399124

Change-Id: Ife7b8557be5e7709cb5b82699413ec84937d5bbc
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 00:42:09 +00:00
Jerry Chang
c3cd94f727 Merge "Make sure to release split layout when returning to home" into tm-dev 2022-03-31 00:37:38 +00:00
Hongwei Wang
d5968a9a68 Merge "Deprecate getSfInstance usage in PiP component" into tm-dev am: b68626be54
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17326024

Change-Id: I2d8b8f34a0fa376d8ceba9374be00b6aea0471c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 00:21:53 +00:00
Wei Sheng Shih
33f8098fba Merge "Use WeakReference for the TaskSnapshotWindow in inner Window." into tm-dev am: 91da83b715
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17291306

Change-Id: I7cb122f194f0e5a73e24ff5a2b94e9ab05af5145
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-31 00:20:44 +00:00
Hongwei Wang
b68626be54 Merge "Deprecate getSfInstance usage in PiP component" into tm-dev 2022-03-31 00:12:04 +00:00
Wei Sheng Shih
91da83b715 Merge "Use WeakReference for the TaskSnapshotWindow in inner Window." into tm-dev 2022-03-30 23:59:22 +00:00
Mady Mellor
79a8d80921 Merge "Use KeyguardStateController to listen for unlocked shade state" into tm-dev am: 8649b5088a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17390549

Change-Id: I69b458c1a04450225d0dd47c6f91524d0ee62e29
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 23:13:40 +00:00
Mady Mellor
8649b5088a Merge "Use KeyguardStateController to listen for unlocked shade state" into tm-dev 2022-03-30 23:03:18 +00:00
Hongwei Wang
7fefa591d3 Merge "Handle PiP shadow radius in WMShell" into tm-dev am: b2a5b198cd
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17456722

Change-Id: I2a503e280734138e2dcf3ec77f5fb526e4120644
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 22:25:39 +00:00
Hongwei Wang
b2a5b198cd Merge "Handle PiP shadow radius in WMShell" into tm-dev 2022-03-30 22:23:51 +00:00
Hongwei Wang
74092d1e49 Deprecate getSfInstance usage in PiP component
- Deprecated also the custom animation handler in PhysicsAnimator
- Ensures the transactions within PiP have VsyncId being set

Bug: 222697646
Test: verify PiP functionalities still work
Change-Id: Ib9a9bab2ffdc11b887271f4a05ee9953865db8b1
2022-03-30 12:50:54 -07:00
Gaurav Bhola
3b42bacd29 Add the insets visibilities requested by the focussed window in
topFocussedWindowChanged() api.

- This is helpful when DisplaySystemBarsController needs to show/hide
  the bars depending on what the window has requested.

Bug: 224883596
Test: atest DisplayInsetsControllerTest
Change-Id: If00231b96153c9c7830fd948003e00a93c8294cd
2022-03-30 17:14:47 +00:00
Nataniel Borges
a99fa738e5 Merge "Wait for correct surface to disappear on transition" into tm-dev am: a8acc4954d
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17472004

Change-Id: I0e2171b9c7ef235b5d0da66165516dc18596a864
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 16:05:29 +00:00
Nataniel Borges
a8acc4954d Merge "Wait for correct surface to disappear on transition" into tm-dev 2022-03-30 15:57:43 +00:00
Shan Huang
47f27b2a13 Merge "Fix back taking multiple swipes." into tm-dev am: 342dccd988
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17452931

Change-Id: I1cb4c666a47e1e7f8b20bf331060599073b1f6db
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 15:06:23 +00:00
Shan Huang
342dccd988 Merge "Fix back taking multiple swipes." into tm-dev 2022-03-30 15:00:45 +00:00
TreeHugger Robot
9d7ca5a880 Merge "Enable passing shell transition tests" into tm-dev am: 8599104286
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/17401040

Change-Id: Ia44dacb765c0738e5b102447921c635240afce5b
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
2022-03-30 09:49:46 +00:00
Jerry Chang
b3d0379faa Make sure to release split layout when returning to home
When returning to home from recent apps, the splitting tasks were
already hidden while performing the recent transition, so dismiss split
screen directly without requesting dismiss transition. Also reorder to
make sure it collects all clean-up operations before finishing the
transition.

Fix: 226682648
Bug: 206487881
Test: verify with the repro steps of the bug
Change-Id: I05e7ae6fa26631203d652ccb532fb57f532794d7
2022-03-30 06:52:18 +00:00
Mady Mellor
bd04e7d58f Use KeyguardStateController to listen for unlocked shade state
Using keyguard state controller allows us to check the occlusion
state and hide / show based on that as well.

Test: manual - have screensaver turn on and ensure bubbles are hidden
Test: atest BubblesTest NewNotifPipelineBubblesTest
Bug: 223913857
Change-Id: I29992ed76c7cdd4e99b4920849c143f6520f9c42
2022-03-30 00:24:40 +00:00
Shan Huang
83e901d8d7 Fix back taking multiple swipes.
Bug: 226417634
Bug: 226723586
Test: Try swiping back on multiple devices. It seems it's easier to
repro on bluechip devices. A good test case for me was to bring up and
dismiss all apps folder repeatedly on a p22 device.

Change-Id: I4dc5f5ee1f67822206a5e0442f26a52114cf63f0
2022-03-29 17:28:41 +00:00
Nataniel Borges
786e62ef54 Enable passing shell transition tests
- App close: with home / with back
- Launch app: cold / warm / from overview
- Bubbles: expand / launch / dismiss

Bug: 214452854
Bug: 213852103
Bug: 219690120
Bug: 217777115
Bug: 205288792
Fixes: 219693385
Fixes: 219688533
Fixes: 218604389
Test: atest FlickerTests:com.android.server.wm.flicker.close
Change-Id: Ib9b290baac911d42fdc8ac87755fd8df98fdb272
2022-03-29 16:46:15 +00:00