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

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

Merge "Ensure feature flags are set prior to checking Activity Transition."

parents 85f7f790 52d77f24

core/java/android/app/ActivityTransitionState.java

+7 −1
Original line number Diff line number Diff line
@@ -150,7 +150,13 @@ class ActivityTransitionState { 
    }



    public void setEnterActivityOptions(Activity activity, ActivityOptions options) {

        if (activity.getWindow().hasFeature(Window.FEATURE_ACTIVITY_TRANSITIONS)

        final Window window = activity.getWindow();

        if (window == null) {

            return;

        }

        // ensure Decor View has been created so that the window features are activated

        window.getDecorView();

        if (window.hasFeature(Window.FEATURE_ACTIVITY_TRANSITIONS)

                && options != null && mEnterActivityOptions == null

                && mEnterTransitionCoordinator == null

                && options.getAnimationType() == ActivityOptions.ANIM_SCENE_TRANSITION) {