summaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
authorwangqi <wangqi@google.com>2018-03-16 16:16:55 -0700
committerCopybara-Service <copybara-piper@google.com>2018-03-16 17:39:10 -0700
commitfce3a793a925791b6ed22d8132db55cd6d7d3f15 (patch)
tree87c8cb9fc1021fdb2f107b92e5a087fc91cac173 /java
parent264f287c9495a8e34ea0e28fee0f74d1fdcb6bc8 (diff)
Use single return to break bubble of RTT chat.
Also change "done" button to "send" in input box and disallow multiple line since return will be interpreted as "send". Bug: 67596257 Test: manual PiperOrigin-RevId: 189409725 Change-Id: I3d3bf3e11cd04d6689125399f4567e88ee3f28f0
Diffstat (limited to 'java')
-rw-r--r--java/com/android/incallui/rtt/impl/RttChatFragment.java2
-rw-r--r--java/com/android/incallui/rtt/impl/res/layout/frag_rtt_chat.xml5
-rw-r--r--java/com/android/incallui/rtt/protocol/Constants.java2
3 files changed, 4 insertions, 5 deletions
diff --git a/java/com/android/incallui/rtt/impl/RttChatFragment.java b/java/com/android/incallui/rtt/impl/RttChatFragment.java
index dd55ccff7..90bf199b2 100644
--- a/java/com/android/incallui/rtt/impl/RttChatFragment.java
+++ b/java/com/android/incallui/rtt/impl/RttChatFragment.java
@@ -206,7 +206,7 @@ public class RttChatFragment extends Fragment
@Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
- if (actionId == EditorInfo.IME_ACTION_DONE) {
+ if (actionId == EditorInfo.IME_ACTION_SEND) {
submitButton.performClick();
return true;
}
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 753117904..34a99544a 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
@@ -48,9 +48,8 @@
android:paddingEnd="16dp"
android:background="@drawable/input_bubble_background"
android:hint="@string/rtt_input_hint"
- android:imeOptions="actionDone"
- android:inputType="textMultiLine|text"
- android:maxLines="4"
+ android:imeOptions="actionSend"
+ android:inputType="text"
android:minHeight="53dp"
android:textColor="#DD000000"
android:textColorHint="#757575"
diff --git a/java/com/android/incallui/rtt/protocol/Constants.java b/java/com/android/incallui/rtt/protocol/Constants.java
index 5806bbada..1c13b07b2 100644
--- a/java/com/android/incallui/rtt/protocol/Constants.java
+++ b/java/com/android/incallui/rtt/protocol/Constants.java
@@ -20,5 +20,5 @@ package com.android.incallui.rtt.protocol;
public interface Constants {
/** String used to break bubble, which means one RTT message is complete. */
- String BUBBLE_BREAKER = "\n\n";
+ String BUBBLE_BREAKER = "\n";
}