From 6eafa902cbc15fa35f8f0dfb5e559673fa67f637 Mon Sep 17 00:00:00 2001
From: Filip Gruszczynski <gruszczy@google.com>
Date: Fri, 14 Nov 2014 14:24:37 -0800
Subject: SwipeDismissLayout makes activity opaque only after entry animation
 ends.

Bug: 18340863
Change-Id: Ic60fa2463618f86b1ae23fc4a0c06cd348f28334
---
 core/java/android/app/Activity.java       | 10 ++++++++++
 core/java/android/app/ActivityThread.java |  2 +-
 2 files changed, 11 insertions(+), 1 deletion(-)

(limited to 'core/java/android/app')

diff --git a/core/java/android/app/Activity.java b/core/java/android/app/Activity.java
index 4b705dd..fdb992a 100644
--- a/core/java/android/app/Activity.java
+++ b/core/java/android/app/Activity.java
@@ -5586,6 +5586,16 @@ public class Activity extends ContextThemeWrapper
     }
 
     /**
+     * @hide
+     */
+    public void dispatchEnterAnimationComplete() {
+        onEnterAnimationComplete();
+        if (getWindow() != null && getWindow().getDecorView() != null) {
+            getWindow().getDecorView().getViewTreeObserver().dispatchOnEnterAnimationComplete();
+        }
+    }
+
+    /**
      * Adjust the current immersive mode setting.
      *
      * Note that changing this value will have no effect on the activity's
diff --git a/core/java/android/app/ActivityThread.java b/core/java/android/app/ActivityThread.java
index dd49009..fe7b727 100644
--- a/core/java/android/app/ActivityThread.java
+++ b/core/java/android/app/ActivityThread.java
@@ -2519,7 +2519,7 @@ public final class ActivityThread {
     private void handleEnterAnimationComplete(IBinder token) {
         ActivityClientRecord r = mActivities.get(token);
         if (r != null) {
-            r.activity.onEnterAnimationComplete();
+            r.activity.dispatchEnterAnimationComplete();
         }
     }
 
-- 
cgit v1.1