am c1d945c6: am 9066d6d7: am c81af1ca: Merge "When returning, transition only existing shared elements." into mnc-dev

* commit 'c1d945c65851a39be3f2beae0474de589ee63faa':
  When returning, transition only existing shared elements.
This commit is contained in:
George Mount
2015-05-05 01:36:44 +00:00
committed by Android Git Automerger

View File

@@ -239,7 +239,7 @@ class ExitTransitionCoordinator extends ActivityTransitionCoordinator {
getWindow().setBackgroundDrawable(new ColorDrawable(Color.BLACK));
}
ActivityOptions options = ActivityOptions.makeSceneTransitionAnimation(mActivity, this,
mAllSharedElementNames, resultCode, data);
mSharedElementNames, resultCode, data);
mActivity.convertToTranslucent(new Activity.TranslucentConversionListener() {
@Override
public void onTranslucentConversionComplete(boolean drawComplete) {