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

Commit f0ebc5dc authored by George Mount's avatar George Mount Committed by Android (Google) Code Review
Browse files

Merge "fixed mIsReturning initialized too late. DO NOT MERGE." into lmp-preview-dev

parents 67e83d57 c9b6df8f

core/java/android/app/ActivityTransitionCoordinator.java

+3 −1
Original line number Diff line number Diff line
@@ -189,15 +189,17 @@ abstract class ActivityTransitionCoordinator extends ResultReceiver { 
    final protected SharedElementListener mListener;

    protected ResultReceiver mResultReceiver;

    final private FixedEpicenterCallback mEpicenterCallback = new FixedEpicenterCallback();

    final protected boolean mIsReturning;



    public ActivityTransitionCoordinator(Window window,

            ArrayList<String> allSharedElementNames,

            ArrayList<String> accepted, ArrayList<String> localNames,

            SharedElementListener listener) {

            SharedElementListener listener, boolean isReturning) {

        super(new Handler());

        mWindow = window;

        mListener = listener;

        mAllSharedElementNames = allSharedElementNames;

        mIsReturning = isReturning;

        setSharedElements(accepted, localNames);

        if (getViewsTransition() != null) {

            getDecor().captureTransitioningViews(mTransitioningViews);

core/java/android/app/EnterTransitionCoordinator.java

+1 −3
Original line number Diff line number Diff line
@@ -55,16 +55,14 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator { 
    private boolean mHasStopped;

    private Handler mHandler;

    private boolean mIsCanceled;

    private boolean mIsReturning;

    private ObjectAnimator mBackgroundAnimator;



    public EnterTransitionCoordinator(Activity activity, ResultReceiver resultReceiver,

            ArrayList<String> sharedElementNames,

            ArrayList<String> acceptedNames, ArrayList<String> mappedNames) {

        super(activity.getWindow(), sharedElementNames, acceptedNames, mappedNames,

                getListener(activity, acceptedNames));

                getListener(activity, acceptedNames), acceptedNames != null);

        mActivity = activity;

        mIsReturning = acceptedNames != null;

        setResultReceiver(resultReceiver);

        prepareEnter();

        Bundle resultReceiverBundle = new Bundle();

core/java/android/app/ExitTransitionCoordinator.java

+2 −4
Original line number Diff line number Diff line
@@ -58,16 +58,14 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 


    private Handler mHandler;



    private boolean mIsReturning;



    private ObjectAnimator mBackgroundAnimator;



    private boolean mIsHidden;



    public ExitTransitionCoordinator(Activity activity, ArrayList<String> names,

            ArrayList<String> accepted, ArrayList<String> mapped, boolean isReturning) {

        super(activity.getWindow(), names, accepted, mapped, getListener(activity, isReturning));

        mIsReturning = isReturning;

        super(activity.getWindow(), names, accepted, mapped, getListener(activity, isReturning),

                isReturning);

        mIsBackgroundReady = !isReturning;

        mActivity = activity;

    }