awesome-bookmarks/arcanechat-android
3
0
Fork 0
mirror of https://github.com/ArcaneChat/android.git synced 2026-07-03 14:05:24 +02:00
Code Issues Packages Projects Releases 3 Wiki Activity

Merge pull request #1016 from deltachat/tweak-keyboard-flags

Browse Source 
allow multi-line-messages when system-emojis are enabled
This commit is contained in:
björn petersen
2019-08-08 13:12:36 +02:00
committed by GitHub
parent ba6d04b6c4 f31f86d616
commit eccbb21ced
1 changed files with 2 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/org/thoughtcrime/securesms/components/ComposeText.java
+2 -5
View File
@@ -100,7 +100,8 @@ public class ComposeText extends EmojiEditText {
}
public void setTransport(TransportOption transport) {
final boolean useSystemEmoji = Prefs.isSystemEmojiPreferred(getContext());
// do not add InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE
// as this removes the ability to compose multi-line messages.
int imeOptions = (getImeOptions() & ~EditorInfo.IME_MASK_ACTION) | EditorInfo.IME_ACTION_SEND;
int inputType = getInputType();
@@ -108,10 +109,6 @@ public class ComposeText extends EmojiEditText {
if (isLandscape()) setImeActionLabel(getContext().getString(R.string.menu_send), EditorInfo.IME_ACTION_SEND);
else setImeActionLabel(null, 0);
if (useSystemEmoji) {
inputType = (inputType & ~InputType.TYPE_MASK_VARIATION) | InputType.TYPE_TEXT_VARIATION_SHORT_MESSAGE;
}
setInputType(inputType);
setImeOptions(imeOptions);
setHint(transport.getComposeHint(),null);