From c876815dca5f701190b36c3b734bb8ae468e1cb3 Mon Sep 17 00:00:00 2001
From: erfanian <erfanian@google.com>
Date: Mon, 14 May 2018 16:00:33 -0700
Subject: Use component for iconography

Test: tap, manual
PiperOrigin-RevId: 196582079
Change-Id: Iffbfa408cbb32e81824cd46a67d51baa270132cf
---
 java/com/android/incallui/answer/impl/AnswerFragment.java | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

(limited to 'java/com/android/incallui/answer/impl/AnswerFragment.java')

diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java
index fb1de05bd..d44a5daa2 100644
--- a/java/com/android/incallui/answer/impl/AnswerFragment.java
+++ b/java/com/android/incallui/answer/impl/AnswerFragment.java
@@ -82,9 +82,11 @@ import com.android.incallui.incalluilock.InCallUiLock;
 import com.android.incallui.maps.MapsComponent;
 import com.android.incallui.sessiondata.AvatarPresenter;
 import com.android.incallui.sessiondata.MultimediaFragment;
+import com.android.incallui.speakeasy.SpeakEasyComponent;
 import com.android.incallui.util.AccessibilityUtil;
 import com.android.incallui.video.protocol.VideoCallScreen;
 import com.android.incallui.videotech.utils.VideoUtils;
+import com.google.common.base.Optional;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Objects;
@@ -206,7 +208,7 @@ public class AnswerFragment extends Fragment
       }
     };
 
-    @DrawableRes public final int icon;
+    @DrawableRes public int icon;
     @StringRes public final int contentDescription;
     @StringRes public final int accessibilityLabel;
     @StringRes public final int hintText;
@@ -456,6 +458,11 @@ public class AnswerFragment extends Fragment
       answerAndReleaseButton.setVisibility(View.VISIBLE);
       answerScreenDelegate.onAnswerAndReleaseButtonEnabled();
     } else if (allowSpeakEasy()) {
+      Optional<Integer> alternativeIcon = SpeakEasyComponent.get(getContext()).speakEasyIcon();
+      if (alternativeIcon.isPresent()) {
+        // TODO(erfanian): Replace enum hack when we have a dedicated button.
+        SecondaryBehavior.SPEAKEASY.icon = alternativeIcon.get();
+      }
       answerAndReleaseBehavior = SecondaryBehavior.SPEAKEASY;
       answerAndReleaseBehavior.applyToView(answerAndReleaseButton);
       answerAndReleaseButton.setVisibility(View.VISIBLE);
-- 
cgit v1.2.3