diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-14 16:42:09 +0000 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2015-07-14 16:42:09 +0000 |
| commit | baec751a7a9555cb92e2d918ef39daeb55a4dba9 (patch) | |
| tree | 50ab77cee5162fa24be02c7dfec75ef1f7395961 | |
| parent | ab025ab6f437a0edbc9d30a08ef98eb1f39948b9 (diff) | |
| parent | 43fa9563e7e26ac9860a11c63890465ed90eede5 (diff) | |
am 0fa39463: am 0dbd837f: am 65f96a6f: am cc0443f3: am 0a624eba: Merge "Disable LayoutTransition.CHANGING" into mnc-dev
* commit '0fa394634e20848faea72c0ee8bd4102641789f5':
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 fa049e79b..7922995e0 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 @@ -1010,9 +1006,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() { @@ -1183,9 +1176,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); } |