DEV/material-components_material-components-android
1
0
Fork 0
mirror of https://github.com/material-components/material-components-android.git synced 2026-02-20 08:39:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge "Fix the FAB not returning when animations are disabled" into mnc-ub-dev

Browse Source 
am: 5ecac86

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

Change-Id: I90e399cbb1becfa3577145535ee5b9048d646efb

GitOrigin-RevId=1de702ffd1244435005aab3c4ce132c54f40fefa

PiperOrigin-RevId: 140560742
This commit is contained in:
Chris Banes 2016-11-30 04:03:59 +00:00 committed by Travis Collins
parent ff6063c1db
commit 7ad217bcca
2 changed files with 9 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
api/current.txt
View File

@ -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);
}

8
src/android/support/design/widget/FloatingActionButton.java
View File

@ -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 =