Kaladaran/briar
0
0
Fork 0
mirror of https://code.briarproject.org/briar/briar.git synced 2026-02-17 13:19:52 +01:00
Code Issues Projects Releases Wiki Activity

Merge branch '761-keyboard_doesnt_close_on_userinteraction' into 'master'

Browse Source 
use SHOW_IMPLICIT when showing the softkeyboard, otherwise it won't auto hide

* remove the forced hiding in ThreadListActivity as it should no longer be required

Signed-off-by: goapunk <noobie@goapunks.net>

Closes #761

See merge request !421
This commit is contained in:
akwizgran
2016-11-18 13:14:51 +00:00
parent a01eeafe4e e98f4901f5
commit 5e4116efa0
2 changed files with 2 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
briar-android/src/org/briarproject/android/threaded/ThreadListActivity.java
View File

@@ -179,7 +179,6 @@ public abstract class ThreadListActivity<G extends NamedGroup, A extends ThreadI
public boolean onOptionsItemSelected(MenuItem item) { public boolean onOptionsItemSelected(MenuItem item) {
switch (item.getItemId()) { switch (item.getItemId()) {
case android.R.id.home: case android.R.id.home:
if (textInput.isKeyboardOpen()) textInput.hideSoftKeyboard();
supportFinishAfterTransition(); supportFinishAfterTransition();
return true; return true;
default: default:

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

@@ -27,7 +27,7 @@ import org.thoughtcrime.securesms.components.emoji.EmojiToggle;
import static android.content.Context.INPUT_METHOD_SERVICE; import static android.content.Context.INPUT_METHOD_SERVICE;
import static android.content.Context.LAYOUT_INFLATER_SERVICE; import static android.content.Context.LAYOUT_INFLATER_SERVICE;
import static android.view.KeyEvent.KEYCODE_BACK; import static android.view.KeyEvent.KEYCODE_BACK;
import static android.view.inputmethod.InputMethodManager.SHOW_FORCED; import static android.view.inputmethod.InputMethodManager.SHOW_IMPLICIT;
@UiThread @UiThread
public class TextInputView extends KeyboardAwareLinearLayout public class TextInputView extends KeyboardAwareLinearLayout
@@ -180,7 +180,7 @@ public class TextInputView extends KeyboardAwareLinearLayout
InputMethodManager imm = InputMethodManager imm =
(InputMethodManager) getContext() (InputMethodManager) getContext()
.getSystemService(INPUT_METHOD_SERVICE); .getSystemService(INPUT_METHOD_SERVICE);
imm.showSoftInput(ui.editText, SHOW_FORCED); imm.showSoftInput(ui.editText, SHOW_IMPLICIT);
} }
}); });
} }