diff options
author | Yorke Lee <yorkelee@google.com> | 2014-11-20 06:46:05 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2014-11-20 06:46:06 +0000 |
commit | 7bf9d3e640da7d3a45e5795a7e5ecbd96edf9743 (patch) | |
tree | 9b735aca9cb3426e1f0597e181687d54a272c89f /src | |
parent | e4f10f30062ad5ce4cf3dc0e090fce4ce67c26f0 (diff) | |
parent | eda9b7b91b75a0da4a4273740bc4090b7fbbfedf (diff) | |
download | packages_apps_InCallUI-7bf9d3e640da7d3a45e5795a7e5ecbd96edf9743.tar.gz packages_apps_InCallUI-7bf9d3e640da7d3a45e5795a7e5ecbd96edf9743.tar.bz2 packages_apps_InCallUI-7bf9d3e640da7d3a45e5795a7e5ecbd96edf9743.zip |
Merge "Disable cross-fade in InCallUI" into lmp-mr1-dev
Diffstat (limited to 'src')
-rw-r--r-- | src/com/android/incallui/CallCardFragment.java | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/src/com/android/incallui/CallCardFragment.java b/src/com/android/incallui/CallCardFragment.java index 875464e9..51c05855 100644 --- a/src/com/android/incallui/CallCardFragment.java +++ b/src/com/android/incallui/CallCardFragment.java @@ -603,7 +603,10 @@ public class CallCardFragment extends BaseFragment<CallCardPresenter, CallCardPr view.setImageDrawable(photo); AnimUtils.fadeIn(mElapsedTime, AnimUtils.DEFAULT_DURATION); } else { - InCallAnimationUtils.startCrossFade(view, current, photo); + // Cross fading is buggy and not noticable due to the multiple calls to this method + // that switch drawables in the middle of the cross-fade animations. Just set the + // photo directly instead. + view.setImageDrawable(photo); view.setVisibility(View.VISIBLE); } } |