diff options
| author | Eric Erfanian <erfanian@google.com> | 2017-04-06 23:16:42 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2017-04-06 23:16:42 +0000 |
| commit | 28188020060d1ad3304dfa0367486ff5bb35da62 (patch) | |
| tree | 8d08d4f2292aa84dc435d455891e7ab633d95a25 /java/com/android/incallui/answer/impl/AnswerFragment.java | |
| parent | 34e183cfd77f68e0ade42d2080c76f54a319430d (diff) | |
| parent | 01a86435499d66b267765f89b7dd9c83c158ddfe (diff) | |
Update AOSP Dialer source from internal google3 repository at cl/152373142. am: d8046e520a
am: 01a8643549
Change-Id: Ib92542e6b88bc8d8906982280244661ed7dbca8f
Diffstat (limited to 'java/com/android/incallui/answer/impl/AnswerFragment.java')
| -rw-r--r-- | java/com/android/incallui/answer/impl/AnswerFragment.java | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 553856711..9eb29ace0 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -854,6 +854,12 @@ public class AnswerFragment extends Fragment } private void animateEntry(@NonNull View rootView) { + if (!isAdded()) { + LogUtil.i( + "AnswerFragment.animateEntry", + "Not currently added to Activity. Will not start entry animation."); + return; + } contactGridManager.getContainerView().setAlpha(0f); Animator alpha = ObjectAnimator.ofFloat(contactGridManager.getContainerView(), View.ALPHA, 0, 1); @@ -869,7 +875,8 @@ public class AnswerFragment extends Fragment if (isShowingLocationUi()) { builder.with(createTranslation(rootView.findViewById(R.id.incall_location_holder))); } - animatorSet.setDuration(getResources().getInteger(R.integer.answer_animate_entry_millis)); + animatorSet.setDuration( + rootView.getResources().getInteger(R.integer.answer_animate_entry_millis)); animatorSet.addListener( new AnimatorListenerAdapter() { @Override |