From 97bff240dce13ca87f31e44728250af06e1147e1 Mon Sep 17 00:00:00 2001 From: sanryhuang Date: Fri, 25 May 2018 12:34:31 +0800 Subject: [PATCH] Fix IME displayed behind the notification shade The Back key isn't dispatched to IME. Refine the logic of onKeyPreIme. Test: manual test Test: atest Change-Id: I6cf5402e70e91d74e5843beb390b306146159e4d Fixes:80250543 --- .../systemui/statusbar/policy/RemoteInputView.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java index 4ec9ae883a2bf..b81447816aece 100644 --- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java +++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java @@ -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