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

Commit 5bbfb0d2 authored by Selim Cinek's avatar Selim Cinek Committed by android-build-merger
Browse files

Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am:...

Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am: c0797c85" into pi-dev-plus-aosp
am: 521450a5

Change-Id: Ib8bbcd4c934348e0e688c331b90c2c49d445ba0e
parents d9af1a7a 521450a5
Loading
Loading
Loading
Loading
+5 −3
Original line number Diff line number Diff line
@@ -565,10 +565,12 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene

        @Override
        public boolean onKeyPreIme(int keyCode, KeyEvent event) {
            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK) {
                mRemoteInputView.mRemoteInputQuickSettingsDisabler.setRemoteInputActive(false);
            // When BACK key is pressed, this method would be invoked twice.
            if (event.getKeyCode() == KeyEvent.KEYCODE_BACK &&
                    event.getAction() == KeyEvent.ACTION_UP) {
                defocusIfNeeded(true /* animate */);
            }
            return super.dispatchKeyEvent(event);
            return super.onKeyPreIme(keyCode, event);
        }

        @Override