Android/frameworks_base
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge "DirectReply: Send button was wrongly actionable on empty field" into nyc-dev

Browse Source
This commit is contained in:
TreeHugger Robot
2016-04-29 21:31:29 +00:00
committed by Android (Google) Code Review
parent 398342f9b6 6db43cb1d8
commit 47d849da9f
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
View File

@@ -91,8 +91,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() { mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {
@Override @Override
public boolean onEditorAction(TextView v, int actionId, KeyEvent event) { public boolean onEditorAction(TextView v, int actionId, KeyEvent event) {
// Check if this was the result of hitting the enter key
final boolean isSoftImeEvent = event == null final boolean isSoftImeEvent = event == null
&& (actionId == EditorInfo.IME_ACTION_DONE && (actionId == EditorInfo.IME_ACTION_DONE
|| actionId == EditorInfo.IME_ACTION_NEXT || actionId == EditorInfo.IME_ACTION_NEXT
@@ -102,7 +100,10 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
&& event.getAction() == KeyEvent.ACTION_DOWN; && event.getAction() == KeyEvent.ACTION_DOWN;
if (isSoftImeEvent || isKeyboardEnterKey) { if (isSoftImeEvent || isKeyboardEnterKey) {
sendRemoteInput(); if (mEditText.length() > 0) {
sendRemoteInput();
}
// Consume action to prevent IME from closing.
return true; return true;
} }
return false; return false;