diff options
| author | Andrew Lee <anwlee@google.com> | 2014-09-03 23:21:14 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2014-09-03 23:21:14 +0000 |
| commit | b2ce2bb5aee85f0c039c867b1757d87812136917 (patch) | |
| tree | d23e8dcef08c93535288446f315b6ad1563ac84d | |
| parent | 924606efd2aa55b42ba411a9dd8759f8b0294a2c (diff) | |
| parent | 26d1cf08ffdbbb967ac831ae2c273be02dc0f15f (diff) | |
am ee80a52e: Merge "No delay for InCallUi scaleIn." into lmp-dev
* commit 'ee80a52eb471250a41e56e5abdb2e5ea83f831a4':
No delay for InCallUi scaleIn.
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index e5ce42a0e..4bcc975c9 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -839,7 +839,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr if (enabled != mFloatingActionButton.isEnabled()) { if (animate) { if (enabled) { - mFloatingActionButtonController.scaleIn(); + mFloatingActionButtonController.scaleIn(AnimUtils.NO_DELAY); } else { mFloatingActionButtonController.scaleOut(); } @@ -1059,7 +1059,7 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr setViewStatePostAnimation(mCallStateIcon); mPrimaryCallCardContainer.removeOnLayoutChangeListener(layoutChangeListener); - mFloatingActionButtonController.scaleIn(); + mFloatingActionButtonController.scaleIn(AnimUtils.NO_DELAY); } private final class LayoutIgnoringListener implements View.OnLayoutChangeListener { |