diff options
Diffstat (limited to 'java/com/android/incallui/answer')
5 files changed, 18 insertions, 0 deletions
diff --git a/java/com/android/incallui/answer/bindings/AnswerBindings.java b/java/com/android/incallui/answer/bindings/AnswerBindings.java index 0b546db63..9f4199b7b 100644 --- a/java/com/android/incallui/answer/bindings/AnswerBindings.java +++ b/java/com/android/incallui/answer/bindings/AnswerBindings.java @@ -24,6 +24,7 @@ public class AnswerBindings { public static AnswerScreen createAnswerScreen( String callId, + boolean isRttCall, boolean isVideoCall, boolean isVideoUpgradeRequest, boolean isSelfManagedCamera, @@ -31,6 +32,7 @@ public class AnswerBindings { boolean hasCallOnHold) { return AnswerFragment.newInstance( callId, + isRttCall, isVideoCall, isVideoUpgradeRequest, isSelfManagedCamera, diff --git a/java/com/android/incallui/answer/impl/AnswerFragment.java b/java/com/android/incallui/answer/impl/AnswerFragment.java index d687b6e01..8626e6d0e 100644 --- a/java/com/android/incallui/answer/impl/AnswerFragment.java +++ b/java/com/android/incallui/answer/impl/AnswerFragment.java @@ -103,6 +103,8 @@ public class AnswerFragment extends Fragment @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) static final String ARG_CALL_ID = "call_id"; + static final String ARG_IS_RTT_CALL = "is_rtt_call"; + @VisibleForTesting(otherwise = VisibleForTesting.PRIVATE) static final String ARG_IS_VIDEO_CALL = "is_video_call"; @@ -344,6 +346,7 @@ public class AnswerFragment extends Fragment public static AnswerFragment newInstance( String callId, + boolean isRttCall, boolean isVideoCall, boolean isVideoUpgradeRequest, boolean isSelfManagedCamera, @@ -351,6 +354,7 @@ public class AnswerFragment extends Fragment boolean hasCallOnHold) { Bundle bundle = new Bundle(); bundle.putString(ARG_CALL_ID, Assert.isNotNull(callId)); + bundle.putBoolean(ARG_IS_RTT_CALL, isRttCall); bundle.putBoolean(ARG_IS_VIDEO_CALL, isVideoCall); bundle.putBoolean(ARG_IS_VIDEO_UPGRADE_REQUEST, isVideoUpgradeRequest); bundle.putBoolean(ARG_IS_SELF_MANAGED_CAMERA, isSelfManagedCamera); @@ -663,6 +667,7 @@ public class AnswerFragment extends Fragment Trace.beginSection("AnswerFragment.onCreateView"); Bundle arguments = getArguments(); Assert.checkState(arguments.containsKey(ARG_CALL_ID)); + Assert.checkState(arguments.containsKey(ARG_IS_RTT_CALL)); Assert.checkState(arguments.containsKey(ARG_IS_VIDEO_CALL)); Assert.checkState(arguments.containsKey(ARG_IS_VIDEO_UPGRADE_REQUEST)); @@ -836,6 +841,11 @@ public class AnswerFragment extends Fragment } @Override + public boolean isRttCall() { + return getArguments().getBoolean(ARG_IS_RTT_CALL); + } + + @Override public boolean isVideoCall() { return getArguments().getBoolean(ARG_IS_VIDEO_CALL); } diff --git a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodHolder.java b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodHolder.java index afa194f2e..0f1455c74 100644 --- a/java/com/android/incallui/answer/impl/answermethod/AnswerMethodHolder.java +++ b/java/com/android/incallui/answer/impl/answermethod/AnswerMethodHolder.java @@ -46,4 +46,6 @@ public interface AnswerMethodHolder { boolean isVideoCall(); boolean isVideoUpgradeRequest(); + + boolean isRttCall(); } diff --git a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java index fe6bbbca5..b5dbc0c20 100644 --- a/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java +++ b/java/com/android/incallui/answer/impl/answermethod/FlingUpDownMethod.java @@ -335,6 +335,8 @@ public class FlingUpDownMethod extends AnswerMethod implements OnProgressChanged } if (getParent().isVideoCall() || getParent().isVideoUpgradeRequest()) { contactPuckIcon.setImageResource(R.drawable.quantum_ic_videocam_white_24); + } else if (getParent().isRttCall()) { + contactPuckIcon.setImageResource(R.drawable.quantum_ic_call_white_24); } else { contactPuckIcon.setImageResource(R.drawable.quantum_ic_call_white_24); } diff --git a/java/com/android/incallui/answer/protocol/AnswerScreen.java b/java/com/android/incallui/answer/protocol/AnswerScreen.java index 5ad500200..f030ce984 100644 --- a/java/com/android/incallui/answer/protocol/AnswerScreen.java +++ b/java/com/android/incallui/answer/protocol/AnswerScreen.java @@ -24,6 +24,8 @@ public interface AnswerScreen { String getCallId(); + boolean isRttCall(); + boolean isVideoCall(); boolean isVideoUpgradeRequest(); |