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

am: 3207d8f8a1

Change-Id: Ieb70c3d9bed1c63e24e0be0baf9b19a9f7e9e663
This commit is contained in:
Adrian Roos
2016-06-08 20:34:16 +00:00
committed by android-build-merger

View File

@@ -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"