commit 8b328b6f16022efd9f10f3b0430fe9e593b5623a
author Chavi Weingarten <chaviw@google.com> Tue Apr 17 18:16:46 2018 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue Apr 17 18:16:46 2018 +0000
tree 3bb3ec113abbd49328ed7ab999dd6f3657ea96b3
parent 096e0587d2960ea37d73b424bf8f6f347c09bff4
parent e390cbd937fb7edbcba8abf8314f9c8074838684

Merge "Don't start Window enter animation as a result of AWT becoming visible." into pi-dev

services/core/java/com/android/server/wm/WindowState.java

diff --git a/services/core/java/com/android/server/wm/WindowState.java b/services/core/java/com/android/server/wm/WindowState.java
index dcaf935..61ce062 100644
--- a/services/core/java/com/android/server/wm/WindowState.java
+++ b/services/core/java/com/android/server/wm/WindowState.java
@@ -1702,12 +1702,17 @@
             return changed;
         }
 
-        if (visible != isVisibleNow()) {
-            if (!runningAppAnimation) {
+        final boolean isVisibleNow = isVisibleNow();
+        if (visible != isVisibleNow) {
+            // Run exit animation if:
+            // 1. App visibility and WS visibility are different
+            // 2. App is not running an animation
+            // 3. WS is currently visible
+            if (!runningAppAnimation && isVisibleNow) {
                 final AccessibilityController accessibilityController =
                         mService.mAccessibilityController;
-                final int winTransit = visible ? TRANSIT_ENTER : TRANSIT_EXIT;
-                mWinAnimator.applyAnimationLocked(winTransit, visible);
+                final int winTransit = TRANSIT_EXIT;
+                mWinAnimator.applyAnimationLocked(winTransit, false /* isEntrance */);
                 //TODO (multidisplay): Magnification is supported only for the default
                 if (accessibilityController != null && getDisplayId() == DEFAULT_DISPLAY) {
                     accessibilityController.onWindowTransitionLocked(this, winTransit);