diff options
author | Eric Erfanian <erfanian@google.com> | 2018-04-26 15:34:21 +0000 |
---|---|---|
committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | 2018-04-26 15:34:21 +0000 |
commit | 52a161148b057ebd4b0c86228b82cba305f1102d (patch) | |
tree | 35906c59b5daccce7f7dacd2ca8a01aaa3dcec5c /java/com/android/incallui/rtt/impl | |
parent | 43ed0dc0666e9d2e2837a2019e2765f10f43dff8 (diff) | |
parent | aa9d670a4f076e52418cd5e404435c524713278e (diff) |
Merge changes I6883ce15,Ife5e6bad,If5a40a97,I36916560
* changes:
Persist contacts pinned positions in speed dial.
Fix crash when saving transcript is called multiple times.
Show post char dialog without InCallActivity.
UI tweak to RTT chat input box.
Diffstat (limited to 'java/com/android/incallui/rtt/impl')
-rw-r--r-- | java/com/android/incallui/rtt/impl/RttChatFragment.java | 6 | ||||
-rw-r--r-- | java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml | 6 |
2 files changed, 10 insertions, 2 deletions
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java index 7bfa100ea..47036cd43 100644 --- a/java/com/android/incallui/rtt/impl/RttChatFragment.java +++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java @@ -461,6 +461,12 @@ public class RttChatFragment extends Fragment + SystemClock.elapsedRealtime()); chronometer.start(); isTimerStarted = true; + editText.setVisibility(View.VISIBLE); + submitButton.setVisibility(View.VISIBLE); + editText.setFocusableInTouchMode(true); + if (editText.requestFocus()) { + UiUtil.openKeyboardFrom(getContext(), editText); + } } if (primaryCallState.state() == State.DIALING) { showWaitingForJoinBanner(); 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 ea7ff1095..f995185b1 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 @@ -54,7 +54,8 @@ android:minHeight="53dp" android:textColor="#DD000000" android:textColorHint="#757575" - android:textSize="16sp"/> + android:textSize="16sp" + android:visibility="gone"/> <ImageButton android:id="@+id/rtt_chat_submit_button" android:layout_width="55dp" @@ -65,7 +66,8 @@ android:backgroundTintMode="multiply" android:contentDescription="@string/content_description_rtt_check_button" android:src="@drawable/quantum_ic_done_vd_theme_24" - android:tint="@color/submit_button_color"/> + android:tint="@color/submit_button_color" + android:visibility="gone"/> </LinearLayout> <FrameLayout |