From 11dbb82bf148bceb793e9db50cbe9724e40506e1 Mon Sep 17 00:00:00 2001 From: Moxie Marlinspike Date: Wed, 26 Oct 2016 17:24:56 -0700 Subject: [PATCH] Close giphy keyboard when search button is pressed Fixes #5807 // FREEBIE --- .../securesms/giph/ui/GiphyActivityToolbar.java | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java index c940937b68..a84d7bdd03 100644 --- a/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java +++ b/src/org/thoughtcrime/securesms/giph/ui/GiphyActivityToolbar.java @@ -9,11 +9,15 @@ import android.text.Editable; import android.text.InputType; import android.text.TextWatcher; import android.util.AttributeSet; +import android.view.KeyEvent; import android.view.TouchDelegate; import android.view.View; +import android.view.inputmethod.EditorInfo; +import android.view.inputmethod.InputMethodManager; import android.widget.EditText; import android.widget.ImageView; import android.widget.LinearLayout; +import android.widget.TextView; import org.thoughtcrime.securesms.R; import org.thoughtcrime.securesms.components.AnimatingToggle; @@ -96,6 +100,18 @@ public class GiphyActivityToolbar extends Toolbar { } }); + this.searchText.setOnEditorActionListener(new TextView.OnEditorActionListener() { + @Override + public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { + if (actionId == EditorInfo.IME_ACTION_SEARCH) { + InputMethodManager inputMethodManager = (InputMethodManager)getContext().getSystemService(Context.INPUT_METHOD_SERVICE); + inputMethodManager.hideSoftInputFromWindow(searchText.getWindowToken(), 0); + } + + return false; + } + }); + expandTapArea(this, action); expandTapArea(toggleContainer, gridToggle); }