From 3d69c8bd3afa723eab291c4e349041ef04ee4459 Mon Sep 17 00:00:00 2001
From: Steve Elliott <steell@google.com>
Date: Thu, 10 Jun 2021 11:36:10 -0400
Subject: [PATCH] Don't dismiss IME when changing active RemoteInput

Fixes: 189468877
Test: manual, atest
Change-Id: Iec8fe2d0dc309d62147061086069e5bf5b87abdf
---
 .../com/android/systemui/statusbar/policy/RemoteInputView.java | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

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 7022fb13d2cd9..b17028b05f787 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -777,7 +777,8 @@ public class RemoteInputView extends LinearLayout implements View.OnClickListene
             mOnVisibilityChangedListener.accept(visibility == VISIBLE);
             // Hide soft-keyboard when the input view became invisible
             // (i.e. The notification shade collapsed by pressing the home key)
-            if (visibility != VISIBLE && !mEditText.isVisibleToUser()) {
+            if (visibility != VISIBLE && !mEditText.isVisibleToUser()
+                    && !mController.isRemoteInputActive()) {
                 mEditText.hideIme();
             }
         }