Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit adb7fefc authored by Adrian Roos's avatar Adrian Roos Committed by android-build-merger
Browse files

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

am: 47d849da

* commit '47d849da':
  DirectReply: Send button was wrongly actionable on empty field

Change-Id: Iddd37c9435c070c1aee9c95fd0fef3b1a5c1f56e
parents 821506a3 47d849da

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

+4 −3
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
        mEditText.setOnEditorActionListener(new TextView.OnEditorActionListener() {

            @Override

            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

                        && (actionId == EditorInfo.IME_ACTION_DONE

                        || actionId == EditorInfo.IME_ACTION_NEXT
@@ -102,7 +100,10 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene 
                        && event.getAction() == KeyEvent.ACTION_DOWN;



                if (isSoftImeEvent || isKeyboardEnterKey) {

                    if (mEditText.length() > 0) {

                        sendRemoteInput();

                    }

                    // Consume action to prevent IME from closing.

                    return true;

                }

                return false;