diff options
author | Nancy Chen <nancychen@google.com> | 2016-01-15 00:05:14 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2016-01-15 00:05:14 +0000 |
commit | c9287203c9013fd20826aab1b5e5f0e547c05b1b (patch) | |
tree | 5a62888b098e34aa2eef8cae7447bbc435ba74de /src | |
parent | 662aed1de350c38751a962528651535a35a22789 (diff) | |
parent | 9f5ff29ae67fbea5864f69e0fe5755918cdaf1e4 (diff) |
Merge "Implement FloatingActionButton.Behavior method correctly." into ub-contactsdialer-b-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/dialer/FloatingActionButtonBehavior.java | 9 |
1 files changed, 3 insertions, 6 deletions
diff --git a/src/com/android/dialer/FloatingActionButtonBehavior.java b/src/com/android/dialer/FloatingActionButtonBehavior.java index 8a407bd61..679c9a7c1 100644 --- a/src/com/android/dialer/FloatingActionButtonBehavior.java +++ b/src/com/android/dialer/FloatingActionButtonBehavior.java @@ -34,17 +34,14 @@ public class FloatingActionButtonBehavior extends CoordinatorLayout.Behavior<Fra @Override public boolean layoutDependsOn(CoordinatorLayout parent, FrameLayout child, View dependency) { - // This needs to return true to trigger the callback correctly. - return true; + return dependency instanceof SnackbarLayout; } @Override public boolean onDependentViewChanged(CoordinatorLayout parent, FrameLayout child, View dependency) { - if (dependency instanceof SnackbarLayout) { - float translationY = Math.min(0, dependency.getTranslationY() - dependency.getHeight()); - child.setTranslationY(translationY); - } + float translationY = Math.min(0, dependency.getTranslationY() - dependency.getHeight()); + child.setTranslationY(translationY); return true; } } |