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

Commit dccc068f authored by George Mount's avatar George Mount
Browse files

Add test API to change the exit transition timeout. 

Bug: 139458376

Allows tests to increace the exit transition timeout so that
cloud devices don't finish before the exit transition completes.

Test: ActivityTransitionTest
Change-Id: Ib94086f5ab06ff8172b80b26260e41158d428b0c
parent 0e2113b5

api/test-current.txt

+1 −0
Original line number Diff line number Diff line
@@ -82,6 +82,7 @@ package android.app { 
  }



  public class ActivityOptions {

    method public static void setExitTransitionTimeout(long);

    method public void setLaunchActivityType(int);

    method public void setLaunchTaskId(int);

    method public void setLaunchWindowingMode(int);

core/java/android/app/ActivityOptions.java

+11 −0
Original line number Diff line number Diff line
@@ -829,6 +829,17 @@ public class ActivityOptions { 
        return exit;

    }



    /**

     * Needed for virtual devices because they can be slow enough that the 1 second timeout

     * triggers when it doesn't on normal devices.

     *

     * @hide

     */

    @TestApi

    public static void setExitTransitionTimeout(long timeoutMillis) {

        ExitTransitionCoordinator.sMaxWaitMillis = timeoutMillis;

    }



    /** @hide */

    static ActivityOptions makeSceneTransitionAnimation(Activity activity,

            ExitTransitionCoordinator exitCoordinator, ArrayList<String> sharedElementNames,

core/java/android/app/ExitTransitionCoordinator.java

+2 −2
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ import java.util.ArrayList; 
 */

class ExitTransitionCoordinator extends ActivityTransitionCoordinator {

    private static final String TAG = "ExitTransitionCoordinator";

    private static final long MAX_WAIT_MS = 1000;

    static long sMaxWaitMillis = 1000;



    private Bundle mSharedElementBundle;

    private boolean mExitNotified;
@@ -120,7 +120,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 


    private void delayCancel() {

        if (mHandler != null) {

            mHandler.sendEmptyMessageDelayed(MSG_CANCEL, MAX_WAIT_MS);

            mHandler.sendEmptyMessageDelayed(MSG_CANCEL, sMaxWaitMillis);

        }

    }