From c3e9cb45a06339bf41b3483265d41395b642e587 Mon Sep 17 00:00:00 2001
From: raajkumars <raajkumars@google.com>
Date: Tue, 2 Apr 2019 16:38:34 -0400
Subject: [PATCH] Updated extended floating action button to turn off word
 wrapping only if animating expand/shrink action.

PiperOrigin-RevId: 241594089
---
 .../floatingactionbutton/ExtendedFloatingActionButton.java  | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/lib/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java b/lib/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
index d1cbd570e..12e28e0be 100644
--- a/lib/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
+++ b/lib/java/com/google/android/material/floatingactionbutton/ExtendedFloatingActionButton.java
@@ -176,9 +176,6 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Atta
             context, a, R.styleable.ExtendedFloatingActionButton_shrinkMotionSpec);
 
     a.recycle();
-
-    // Eliminates the word wrapping when the FAB extended state change is animating.
-    setHorizontallyScrolling(true);
   }
 
   @Override
@@ -652,6 +649,8 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Atta
 
             @Override
             public void onAnimationStart(Animator animation) {
+              // Eliminates the word wrapping when the FAB is being extended or shrunk.
+              setHorizontallyScrolling(true);
               currentCollapseExpandAnimator = animation;
               cancelled = false;
             }
@@ -663,6 +662,7 @@ public class ExtendedFloatingActionButton extends MaterialButton implements Atta
 
             @Override
             public void onAnimationEnd(Animator animation) {
+              setHorizontallyScrolling(false);
               currentCollapseExpandAnimator = null;
               if (cancelled || listener == null) {
                 return;