diff options
| -rw-r--r-- | core/java/android/app/ExitTransitionCoordinator.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/core/java/android/app/ExitTransitionCoordinator.java b/core/java/android/app/ExitTransitionCoordinator.java index ad104a4..7fbb99a 100644 --- a/core/java/android/app/ExitTransitionCoordinator.java +++ b/core/java/android/app/ExitTransitionCoordinator.java @@ -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) { |