diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-14 16:25:32 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:25:32 +0000 |
| commit | 43fa9563e7e26ac9860a11c63890465ed90eede5 (patch) | |
| tree | 5e147e3e92016317748a7d57668845cc5b899441 | |
| parent | 0729fc545f371cfd4a787034d652ae1bd817aaf2 (diff) | |
| parent | e5aefb59d67cdb36020c520471453299cd229397 (diff) | |
am 0dbd837f: am 65f96a6f: am cc0443f3: am 0a624eba: Merge "Disable LayoutTransition.CHANGING" into mnc-dev
* commit '0dbd837fca57e320d0143500848d1c8221b0d502':
Disable LayoutTransition.CHANGING
| -rw-r--r-- | InCallUI/src/com/android/incallui/CallCardFragment.java | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/InCallUI/src/com/android/incallui/CallCardFragment.java b/InCallUI/src/com/android/incallui/CallCardFragment.java index d58310cfc..4121390fd 100644 --- a/InCallUI/src/com/android/incallui/CallCardFragment.java +++ b/InCallUI/src/com/android/incallui/CallCardFragment.java @@ -19,7 +19,6 @@ package com.android.incallui; import android.animation.Animator; import android.animation.AnimatorListenerAdapter; import android.animation.AnimatorSet; -import android.animation.LayoutTransition; import android.animation.ObjectAnimator; import android.content.Context; import android.graphics.drawable.AnimationDrawable; @@ -282,9 +281,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mPrimaryName.setElegantTextHeight(false); mCallStateLabel.setElegantTextHeight(false); - - final LayoutTransition transition = mPrimaryCallInfo.getLayoutTransition(); - transition.enableTransitionType(LayoutTransition.CHANGING); } @Override @@ -984,9 +980,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr final ViewTreeObserver observer = getView().getViewTreeObserver(); - final LayoutTransition transition = mPrimaryCallInfo.getLayoutTransition(); - transition.disableTransitionType(LayoutTransition.CHANGING); - mIsAnimating = true; observer.addOnGlobalLayoutListener(new OnGlobalLayoutListener() { @@ -1157,9 +1150,6 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr mPrimaryCallCardContainer.removeOnLayoutChangeListener(layoutChangeListener); - final LayoutTransition transition = mPrimaryCallInfo.getLayoutTransition(); - transition.enableTransitionType(LayoutTransition.CHANGING); - mFloatingActionButtonController.scaleIn(AnimUtils.NO_DELAY); } |