Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 220fdac3 authored by Yorke Lee's avatar Yorke Lee Committed by Android Git Automerger
Browse files

am 0a624eba: Merge "Disable LayoutTransition.CHANGING" into mnc-dev 

* commit '0a624eba6d80b1970e05332c3e8877e631f63591':
  Disable LayoutTransition.CHANGING
parents 33789619 0cbd1e17

InCallUI/src/com/android/incallui/CallCardFragment.java

+0 −10
Original line number Diff line number Diff line
@@ -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);

    }