commit 3207d8f8a19eeded00a26b265778ce1c36a508b1
author Adrian Roos <roosa@google.com> Wed Jun 08 20:24:59 2016 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Wed Jun 08 20:25:01 2016 +0000
tree 91de57c97302232db35a3574c150273fb53770b2
parent b99e19c729c3809743a808acefdae707cedf925b
parent 713fed9226a411d1ba83f925c10bc56fec4f2b70

Merge "Direct Reply: Add back emoji button" into nyc-dev

packages/SystemUI/res/layout/remote_input.xml

diff --git a/packages/SystemUI/res/layout/remote_input.xml b/packages/SystemUI/res/layout/remote_input.xml
index 2db97a6..0c8cc9b 100644
--- a/packages/SystemUI/res/layout/remote_input.xml
+++ b/packages/SystemUI/res/layout/remote_input.xml
@@ -43,7 +43,7 @@
             android:ellipsize="start"
             android:inputType="textShortMessage|textAutoCorrect|textCapSentences"
             android:textIsSelectable="true"
-            android:imeOptions="actionSend|flagNoExtractUi" />
+            android:imeOptions="actionNone|flagNoExtractUi" />
 
     <FrameLayout
             android:layout_width="wrap_content"