diff options
| author | 2023-06-01 11:22:35 +0000 | |
|---|---|---|
| committer | 2023-06-01 11:22:35 +0000 | |
| commit | de000fe8ae212a0ec6617c97bf0f019189e41249 (patch) | |
| tree | 8b72e37183178aa5dd9c1d928433c4ef7fc722fc | |
| parent | 38d7f4e431a9fcde616318c999920f64fe8d08ef (diff) | |
| parent | ed8c1162884a29a8b83037781ef81fc34ffa4676 (diff) | |
Merge "[Unfold animation] Merge change transitions into unfold transition" into udc-dev am: 7db57f1db8 am: ed8c116288
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/23485369
Change-Id: I3e9e27f73b4c915e5020e1f9a87a72c2ee44104e
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/unfold/UnfoldTransitionHandler.java | 11 |
1 files changed, 11 insertions, 0 deletions
diff --git a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java index bb0eba6a0fc7..c504f57216f3 100644 --- a/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java +++ b/libs/WindowManager/Shell/src/com/android/wm/shell/unfold/UnfoldTransitionHandler.java @@ -173,6 +173,17 @@ public class UnfoldTransitionHandler implements TransitionHandler, UnfoldListene mTransition = null; } + @Override + public void mergeAnimation(@NonNull IBinder transition, @NonNull TransitionInfo info, + @NonNull SurfaceControl.Transaction t, @NonNull IBinder mergeTarget, + @NonNull TransitionFinishCallback finishCallback) { + if (info.getType() == TRANSIT_CHANGE) { + // Apply changes happening during the unfold animation immediately + t.apply(); + finishCallback.onTransitionFinished(null, null); + } + } + @Nullable @Override public WindowContainerTransaction handleRequest(@NonNull IBinder transition, |