Fix "blink" when going "back" quickly after entering Activity.

Bug 14445508

Activity Transitions would occasionally blink to black when
going "back." This was caused because the convertToTranslucent
callback was slow to come and could occur during the exit
transition while going back.

Change-Id: I17db25197926399dc22b50c595416dfa7b32b026

diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index 0798529..6fe21b9 100644 (file)
--- a/core/java/android/app/EnterTransitionCoordinator.java
+++ b/core/java/android/app/EnterTransitionCoordinator.java
@@ -23,8 +23,6 @@ import android.graphics.drawable.Drawable;
 import android.os.Bundle;
 import android.os.ResultReceiver;
 import android.transition.Transition;
-import android.util.ArrayMap;
-import android.util.Pair;
 import android.view.View;
 import android.view.ViewTreeObserver;
 import android.view.Window;
@@ -223,6 +221,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator
 
     @Override
     protected void startExitTransition(ArrayList<String> sharedElements) {
+        mMakeOpaque = false;
         notifyPrepareRestore();
 
         if (getDecor().getBackground() == null) {