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

Commit 2456f77c authored by George Mount's avatar George Mount Committed by Android Git Automerger
Browse files

am bd87b6b5: Merge "Make additional shared elements a version-checked feature." into mnc-dev 

* commit 'bd87b6b5':
  Make additional shared elements a version-checked feature.
parents 3d520403 bd87b6b5

core/java/android/app/ExitTransitionCoordinator.java

+6 −1
Original line number Diff line number Diff line
@@ -25,6 +25,7 @@ import android.graphics.Matrix; 
import android.graphics.RectF;

import android.graphics.drawable.ColorDrawable;

import android.graphics.drawable.Drawable;

import android.os.Build.VERSION_CODES;

import android.os.Bundle;

import android.os.Handler;

import android.os.Message;
@@ -238,8 +239,12 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator { 
            if (decorView != null && decorView.getBackground() == null) {

                getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));

            }

            final boolean targetsM = decorView == null || decorView.getContext()

                    .getApplicationInfo().targetSdkVersion >= VERSION_CODES.MNC;

            ArrayList<String> sharedElementNames = targetsM ? mSharedElementNames :

                    mAllSharedElementNames;

            ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, this,

                    mSharedElementNames, resultCode, data);

                    sharedElementNames, resultCode, data);

            mActivity.convertToTranslucent(new Activity.TranslucentConversionListener() {

                @Override

                public void onTranslucentConversionComplete(boolean drawComplete) {