From 7ad217bccaeda215752f4b93af248221dcb19015 Mon Sep 17 00:00:00 2001
From: Chris Banes <chrisbanes@google.com>
Date: Wed, 30 Nov 2016 04:03:59 +0000
Subject: [PATCH] Merge "Fix the FAB not returning when animations are
 disabled" into mnc-ub-dev am: 5ecac86

* commit '5ecac8623018236e9f15385cade2c7ea59829f2e':
  Fix the FAB not returning when animations are disabled

Change-Id: I90e399cbb1becfa3577145535ee5b9048d646efb

GitOrigin-RevId=1de702ffd1244435005aab3c4ce132c54f40fefa

PiperOrigin-RevId: 140560742
---
 api/current.txt                                           | 1 +
 .../support/design/widget/FloatingActionButton.java       | 8 ++++++++
 2 files changed, 9 insertions(+)

diff --git a/api/current.txt b/api/current.txt
index 688957eda..1293db15f 100644
--- a/api/current.txt
+++ b/api/current.txt
@@ -262,6 +262,7 @@ package android.support.design.widget {
     ctor public FloatingActionButton.Behavior();
     method public boolean layoutDependsOn(android.support.design.widget.CoordinatorLayout, android.support.design.widget.FloatingActionButton, android.view.View);
     method public boolean onDependentViewChanged(android.support.design.widget.CoordinatorLayout, android.support.design.widget.FloatingActionButton, android.view.View);
+    method public boolean onDependentViewRemoved(android.support.design.widget.CoordinatorLayout, android.support.design.widget.FloatingActionButton, android.view.View);
     method public boolean onLayoutChild(android.support.design.widget.CoordinatorLayout, android.support.design.widget.FloatingActionButton, int);
   }
 
diff --git a/src/android/support/design/widget/FloatingActionButton.java b/src/android/support/design/widget/FloatingActionButton.java
index 74c15da16..97e1bd231 100644
--- a/src/android/support/design/widget/FloatingActionButton.java
+++ b/src/android/support/design/widget/FloatingActionButton.java
@@ -570,6 +570,14 @@ public class FloatingActionButton extends VisibilityAwareImageButton {
             return false;
         }
 
+        @Override
+        public void onDependentViewRemoved(CoordinatorLayout parent, FloatingActionButton child,
+                View dependency) {
+            if (dependency instanceof Snackbar.SnackbarLayout) {
+                updateFabTranslationForSnackbar(parent, child, dependency);
+            }
+        }
+
         private boolean updateFabVisibility(CoordinatorLayout parent,
                 AppBarLayout appBarLayout, FloatingActionButton child) {
             final CoordinatorLayout.LayoutParams lp =