diff options
| author | Yorke Lee <yorkelee@google.com> | 2015-07-10 21:56:32 +0000 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2015-07-10 21:56:33 +0000 |
| commit | 0cbd1e171e4cc6b0bc69b0714adba867884ef6a6 (patch) | |
| tree | e9e901a65994821d81555849d7975d95a4e91d85 /InCallUI/src/com | |
| parent | 1dd351180a97f2d59a75762b97fff8f8160ed9ae (diff) | |
| parent | 045b6fa6e0472281ec0b2c53df1f9b11dacfec06 (diff) | |
Merge "Disable LayoutTransition.CHANGING" into mnc-dev
Diffstat (limited to 'InCallUI/src/com')
| -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); } |