Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-16 04:39:54 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '1405-emoji-keyboard' into 'master'

Browse Source 
Always show keyboard when clicking text input field

Closes #1405

See merge request briar/briar!1181
This commit is contained in:
akwizgran
2019-10-28 12:16:15 +00:00
parent 01df141c08 529eaceec7
commit 663e5c4b46
1 changed files with 3 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
briar-android/src/main/java/org/briarproject/briar/android/view/EmojiTextInputView.java
View File

@@ -85,7 +85,6 @@ public class EmojiTextInputView extends LinearLayout implements
editText = findViewById(R.id.input_text); editText = findViewById(R.id.input_text);
editText.setPadding(0, 0, paddingEnd, paddingBottom); editText.setPadding(0, 0, paddingEnd, paddingBottom);
if (maxLines > 0) editText.setMaxLines(maxLines); if (maxLines > 0) editText.setMaxLines(maxLines);
editText.setOnClickListener(v -> showSoftKeyboard());
editText.addTextChangedListener(this); editText.addTextChangedListener(this);
editText.setOnEditorActionListener((v, actionId, event) -> { editText.setOnEditorActionListener((v, actionId, event) -> {
if (actionId == IME_ACTION_SEND) { if (actionId == IME_ACTION_SEND) {
@@ -130,6 +129,9 @@ public class EmojiTextInputView extends LinearLayout implements
R.attr.colorControlNormal)) R.attr.colorControlNormal))
.build(editText); .build(editText);
emojiToggle.setOnClickListener(v -> emojiPopup.toggle()); emojiToggle.setOnClickListener(v -> emojiPopup.toggle());
editText.setOnClickListener(v -> {
if (emojiPopup.isShowing()) emojiPopup.dismiss();
});
} }
@Override @Override