diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2018-03-09 03:49:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-03-09 03:49:25 +0000 |
| commit | 261cba95c73cdc16b71b0ec1e7cdc6ff5d11a6ad (patch) | |
| tree | 229cf7328d1d4d4688749fea4cd871ccbe6fc66b /java/com/android/incallui/rtt | |
| parent | 31fec1d4fbe878d9b28685b8b811f1488edff443 (diff) | |
| parent | fd4c9f75aa2eba3e6a896d107f05ff370c2ad2b1 (diff) | |
Merge "Add support of dialpad in RTT call."
Diffstat (limited to 'java/com/android/incallui/rtt')
4 files changed, 17 insertions, 3 deletions
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java index 5094c318e..f9c91e5fb 100644 --- a/java/com/android/incallui/rtt/impl/RttChatFragment.java +++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java @@ -333,11 +333,13 @@ public class RttChatFragment extends Fragment public void updateInCallScreenColors() {} @Override - public void onInCallScreenDialpadVisibilityChange(boolean isShowing) {} + public void onInCallScreenDialpadVisibilityChange(boolean isShowing) { + overflowMenu.setDialpadButtonChecked(isShowing); + } @Override public int getAnswerAndDialpadContainerResourceId() { - return 0; + return R.id.incall_dialpad_container; } @Override diff --git a/java/com/android/incallui/rtt/impl/RttOverflowMenu.java b/java/com/android/incallui/rtt/impl/RttOverflowMenu.java index 2b56364be..cca36318e 100644 --- a/java/com/android/incallui/rtt/impl/RttOverflowMenu.java +++ b/java/com/android/incallui/rtt/impl/RttOverflowMenu.java @@ -87,4 +87,8 @@ public class RttOverflowMenu extends PopupWindow implements OnCheckedChangeListe speakerButton.setOnCheckedChangeListener(null); } } + + void setDialpadButtonChecked(boolean isChecked) { + dialpadButton.setChecked(isChecked); + } } diff --git a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml index d85075106..3194b75bc 100644 --- a/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml +++ b/java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml @@ -67,4 +67,11 @@ android:tint="@color/submit_button_color"/> </LinearLayout> + <FrameLayout + android:id="@+id/incall_dialpad_container" + android:layout_width="match_parent" + android:layout_height="wrap_content" + android:layout_gravity="bottom" + android:clipChildren="false" + android:clipToPadding="false"/> </FrameLayout>
\ No newline at end of file diff --git a/java/com/android/incallui/rtt/protocol/RttCallScreen.java b/java/com/android/incallui/rtt/protocol/RttCallScreen.java index 916dfb84d..531b18df6 100644 --- a/java/com/android/incallui/rtt/protocol/RttCallScreen.java +++ b/java/com/android/incallui/rtt/protocol/RttCallScreen.java @@ -17,9 +17,10 @@ package com.android.incallui.rtt.protocol; import android.support.v4.app.Fragment; +import com.android.incallui.incall.protocol.InCallScreen; /** Interface for call RTT call module. */ -public interface RttCallScreen { +public interface RttCallScreen extends InCallScreen { void onRttScreenStart(); |