From 14425b52983fdf80debcd9862e2324acafcbc045 Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 03:56:38 +0000
Subject: [PATCH] Merge "Disable Snackbar animations if necessary" into
 mnc-ub-dev am: 3b591d5

* commit '3b591d566e2242881b149bc43d60dc4cbd374392':
  Disable Snackbar animations if necessary

GitOrigin-RevId=12113fa03c02662190617538e3e11d7aaa705654

PiperOrigin-RevId: 140560260
---
 .../support/design/widget/Snackbar.java       | 58 ++++++++++---------
 1 file changed, 32 insertions(+), 26 deletions(-)

diff --git a/src/android/support/design/widget/Snackbar.java b/src/android/support/design/widget/Snackbar.java
index f20e8376b..657e9ced7 100644
--- a/src/android/support/design/widget/Snackbar.java
+++ b/src/android/support/design/widget/Snackbar.java
@@ -499,15 +499,27 @@ public final class Snackbar {
         });
 
         if (ViewCompat.isLaidOut(mView)) {
-            // If the view is already laid out, animate it now
-            animateViewIn();
+            if (shouldAnimate()) {
+                // If animations are enabled, animate it in
+                animateViewIn();
+            } else {
+                // Else if anims are disabled just call back now
+                onViewShown();
+            }
         } else {
-            // Otherwise, add one of our layout change listeners and animate it in when laid out
+            // Otherwise, add one of our layout change listeners and show it in when laid out
             mView.setOnLayoutChangeListener(new SnackbarLayout.OnLayoutChangeListener() {
                 @Override
                 public void onLayoutChange(View view, int left, int top, int right, int bottom) {
-                    animateViewIn();
                     mView.setOnLayoutChangeListener(null);
+
+                    if (shouldAnimate()) {
+                        // If animations are enabled, animate it in
+                        animateViewIn();
+                    } else {
+                        // Else if anims are disabled just call back now
+                        onViewShown();
+                    }
                 }
             });
         }
@@ -523,15 +535,8 @@ public final class Snackbar {
                     .setListener(new ViewPropertyAnimatorListenerAdapter() {
                         @Override
                         public void onAnimationStart(View view) {
-                            if (!mAccessibilityManager.isEnabled()) {
-                                // Animating the children in causes Talkback to think that they're
-                                // not visible when the TYPE_WINDOW_CONTENT_CHANGED event if fired.
-                                // Fixed by skipping the animation when an accessibility manager
-                                // is enabled
-                                mView.animateChildrenIn(
-                                        ANIMATION_DURATION - ANIMATION_FADE_DURATION,
-                                        ANIMATION_FADE_DURATION);
-                            }
+                            mView.animateChildrenIn(ANIMATION_DURATION - ANIMATION_FADE_DURATION,
+                                    ANIMATION_FADE_DURATION);
                         }
 
                         @Override
@@ -567,17 +572,9 @@ public final class Snackbar {
                     .setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR)
                     .setDuration(ANIMATION_DURATION)
                     .setListener(new ViewPropertyAnimatorListenerAdapter() {
-                        boolean mEndCalled = false;
-
                         @Override
                         public void onAnimationStart(View view) {
-                            if (!mAccessibilityManager.isEnabled()) {
-                                // Animating the children in causes Talkback to think that they're
-                                // not visible when the TYPE_WINDOW_CONTENT_CHANGED event if fired.
-                                // Fixed by skipping the animation when an accessibility manager
-                                // is enabled
-                                mView.animateChildrenOut(0, ANIMATION_FADE_DURATION);
-                            }
+                            mView.animateChildrenOut(0, ANIMATION_FADE_DURATION);
                         }
 
                         @Override
@@ -586,7 +583,8 @@ public final class Snackbar {
                         }
                     }).start();
         } else {
-            Animation anim = AnimationUtils.loadAnimation(mView.getContext(), R.anim.design_snackbar_out);
+            Animation anim = AnimationUtils.loadAnimation(mView.getContext(),
+                    R.anim.design_snackbar_out);
             anim.setInterpolator(FAST_OUT_SLOW_IN_INTERPOLATOR);
             anim.setDuration(ANIMATION_DURATION);
             anim.setAnimationListener(new Animation.AnimationListener() {
@@ -606,10 +604,11 @@ public final class Snackbar {
     }
 
     final void hideView(@Callback.DismissEvent final int event) {
-        if (mView.getVisibility() != View.VISIBLE) {
-            onViewHidden(event);
-        } else {
+        if (shouldAnimate() && mView.getVisibility() == View.VISIBLE) {
             animateViewOut(event);
+        } else {
+            // If anims are disabled or the view isn't visible, just call back now
+            onViewHidden(event);
         }
     }
 
@@ -634,6 +633,13 @@ public final class Snackbar {
         }
     }
 
+    /**
+     * Returns true if we should animate the Snackbar view in/out.
+     */
+    private boolean shouldAnimate() {
+        return !mAccessibilityManager.isEnabled();
+    }
+
     /**
      * @hide
      */