diff options
author | Eric Erfanian <erfanian@google.com> | 2017-05-05 15:23:13 +0000 |
---|---|---|
committer | android-build-merger <android-build-merger@google.com> | 2017-05-05 15:23:13 +0000 |
commit | 300a8683b9c28424fb0f0c571a0abe128c461f69 (patch) | |
tree | 3a325b0effac02fbd228b8ddf2f96589e5df72cd /java/com/android/incallui/answer/impl/AnswerFragment.java | |
parent | d67f1627521b174f12e0c247f154c7c93c5e408e (diff) | |
parent | 10b34a5ebf12e97ecba0caf3c8e30b476b038a96 (diff) |
Update Dialer to V10 RC16
am: 10b34a5ebf
Change-Id: Iea3e96ccdeaf1fa796ceca702cace82ca20f298c
Diffstat (limited to 'java/com/android/incallui/answer/impl/AnswerFragment.java')
-rw-r--r-- | java/com/android/incallui/answer/impl/AnswerFragment.java | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index 7fa559d6e..1f0541c4b 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -543,7 +543,10 @@ public class AnswerFragment extends Fragment // Needs replacement newFragment = MultimediaFragment.newInstance( - multimediaData, false /* isInteractive */, true /* showAvatar */); + multimediaData, + false /* isInteractive */, + !primaryInfo.isSpam /* showAvatar */, + primaryInfo.isSpam); } } else if (shouldShowAvatar()) { // Needs Avatar @@ -658,9 +661,6 @@ public class AnswerFragment extends Fragment affordanceHolderLayout.setAffordanceCallback(affordanceCallback); importanceBadge = view.findViewById(R.id.incall_important_call_badge); - PillDrawable importanceBackground = new PillDrawable(); - importanceBackground.setColor(getContext().getColor(android.R.color.white)); - importanceBadge.setBackground(importanceBackground); importanceBadge .getViewTreeObserver() .addOnGlobalLayoutListener( @@ -771,6 +771,7 @@ public class AnswerFragment extends Fragment public void onPause() { super.onPause(); LogUtil.i("AnswerFragment.onPause", null); + inCallScreenDelegate.onInCallScreenPaused(); } @Override @@ -941,6 +942,9 @@ public class AnswerFragment extends Fragment private void showMessageMenu() { LogUtil.i("AnswerFragment.showMessageMenu", "Show sms menu."); + if (getChildFragmentManager().isDestroyed()) { + return; + } textResponsesFragment = SmsBottomSheetFragment.newInstance(textResponses); textResponsesFragment.show(getChildFragmentManager(), null); @@ -1019,7 +1023,7 @@ public class AnswerFragment extends Fragment return; } - if (!getResources().getBoolean(R.bool.answer_important_call_allowed)) { + if (!getResources().getBoolean(R.bool.answer_important_call_allowed) || primaryInfo.isSpam) { importanceBadge.setVisibility(View.GONE); return; } |