am 737c6f16: Merge "Fix wrong delay values for floatingtoolbar.hide/dismiss" into mnc-dev

* commit '737c6f16a57562303caae38208effe06405ef7fe':
  Fix wrong delay values for floatingtoolbar.hide/dismiss
This commit is contained in:
Abodunrinwa Toki
2015-05-19 16:53:30 +00:00
committed by Android Git Automerger

View File

@@ -357,7 +357,7 @@ public final class FloatingToolbar {
mShowAnimation = createGrowFadeInFromBottom(mContentContainer);
mDismissAnimation = createShrinkFadeOutFromBottomAnimation(
mContentContainer,
0,
150, // startDelay
new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {
@@ -367,7 +367,7 @@ public final class FloatingToolbar {
});
mHideAnimation = createShrinkFadeOutFromBottomAnimation(
mContentContainer,
150,
0, // startDelay
new AnimatorListenerAdapter() {
@Override
public void onAnimationEnd(Animator animation) {