Merge "Merge "Fix IME displayed behind the notification shade" into pi-dev am:... (521450a5) · Commits · e / os / android_frameworks_base

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

+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