Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d5492006 authored by Matt Sziklay's avatar Matt Sziklay Committed by Automerger Merge Worker
Browse files

Merge "Properly finish transition in ExitDesktopTaskTransitionHandler" into udc-dev am: 8d844008 

Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/22454122



Change-Id: Ica9c2d68a63f5c8c10173e7c445f517e60ad22c8
Signed-off-by: default avatarAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>
parents 7fb13428 8d844008

libs/WindowManager/Shell/src/com/android/wm/shell/desktopmode/ExitDesktopTaskTransitionHandler.java

+9 −0
Original line number Diff line number Diff line
@@ -18,6 +18,8 @@ package com.android.wm.shell.desktopmode; 


import static android.app.WindowConfiguration.WINDOWING_MODE_FULLSCREEN;



import android.animation.Animator;

import android.animation.AnimatorListenerAdapter;

import android.animation.ValueAnimator;

import android.app.ActivityManager;

import android.content.Context;
@@ -146,6 +148,13 @@ public class ExitDesktopTaskTransitionHandler implements Transitions.TransitionH 
                t.setScale(sc, currentScaleX, currentScaleY);

                t.apply();

            });

            animator.addListener(new AnimatorListenerAdapter() {

                @Override

                public void onAnimationEnd(Animator animation) {

                    mTransitions.getMainExecutor().execute(

                            () -> finishCallback.onTransitionFinished(null, null));

                }

            });

            animator.start();

            return true;

        }