summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author George Mount <mount@google.com> 2014-05-01 14:13:00 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 2014-05-01 14:13:01 +0000
commit8df5a07d880691e420cb7c702e4d41260e85d1b8 (patch)
treef01ef8ffab882c9cb098e0d66a2a6a4138e453dc
parent9ad2380c9df1269a32f554aef7c6e28619898278 (diff)
parent1a5b294d399c95e656c9ad1aebbc09d6c384be41 (diff)
Merge "Fix "blink" when going "back" quickly after entering Activity."
-rw-r--r--core/java/android/app/EnterTransitionCoordinator.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/core/java/android/app/EnterTransitionCoordinator.java b/core/java/android/app/EnterTransitionCoordinator.java
index c26e68a4e6b9..cbb8359fd1ca 100644
--- 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;
@@ -219,6 +217,7 @@ class EnterTransitionCoordinator extends ActivityTransitionCoordinator
@Override
protected void startExitTransition(ArrayList<String> sharedElements) {
+ mMakeOpaque = false;
notifyPrepareRestore();
if (getDecor().getBackground() == null) {