diff options
| author | 2023-06-12 07:56:09 +0000 | |
|---|---|---|
| committer | 2023-06-12 07:56:09 +0000 | |
| commit | 12868e4c4af0cff971d3549541bc24e49171187c (patch) | |
| tree | 5cd9e71fa099f60899f268766e80a67efd98d62e | |
| parent | ae13a3b9224edda3ae4fd2f2fc69dabf73fa9368 (diff) | |
| parent | f2c45d55e8b6ecbbb0aee553274a0ca420c9a1d8 (diff) | |
Merge "Fix surface didn't fade out when dismiss" into udc-dev am: 7e387fc706 am: f2c45d55e8
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23597525
Change-Id: I9133c030751465f4bcf3a38781d618961950ccbd
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
| -rw-r--r-- | libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java | 14 |
1 files changed, 1 insertions, 13 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java index 986309948ada..d21f8a48e62a 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/splitscreen/SplitScreenTransitions.java @@ -199,19 +199,7 @@ class SplitScreenTransitions { boolean isOpening = TransitionUtil.isOpeningType(info.getType()); if (!isOpening && (mode == TRANSIT_CLOSE || mode == TRANSIT_TO_BACK)) { // fade out - if (change.getSnapshot() != null) { - // This case is happened if task is going to reparent to TDA, the origin leash - // doesn't rendor so we use snapshot to replace it animating. - t.reparent(change.getSnapshot(), info.getRoot(rootIdx).getLeash()); - // Use origin leash layer. - t.setLayer(change.getSnapshot(), info.getChanges().size() - i); - t.setPosition(change.getSnapshot(), change.getStartAbsBounds().left, - change.getStartAbsBounds().top); - t.show(change.getSnapshot()); - startFadeAnimation(change.getSnapshot(), false /* show */); - } else { - startFadeAnimation(leash, false /* show */); - } + startFadeAnimation(leash, false /* show */); } else if (mode == TRANSIT_CHANGE && change.getSnapshot() != null) { t.reparent(change.getSnapshot(), info.getRoot(rootIdx).getLeash()); // Ensure snapshot it on the top of all transition surfaces |