diff options
| author | Andrew Lee <anwlee@google.com> | 2014-09-03 18:27:49 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-09-03 18:27:50 +0000 |
| commit | 26d1cf08ffdbbb967ac831ae2c273be02dc0f15f (patch) | |
| tree | 141892da83f0e3d6112b45c2f2317d5e5640ad0f | |
| parent | 2c379955868a67b19bd3bd042284b612f4495ca4 (diff) | |
| parent | 1be75aa275ad50f01353ffbe8bd8d985fa8018e5 (diff) | |
Merge "No delay for InCallUi scaleIn." into lmp-dev
| -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 { |