Snap for 5476925 from 19c49814739ff214f1a7b3900e02d027a21d6d1b to qt-aml-release

Change-Id: Ib866628c1dce5cf0f6f036dbea337a8547951f92

2 files changed, 9 insertions, 1 deletions

diff --git a/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/ClientCallbackImpl.java b/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/ClientCallbackImpl.java
index 45b4e56f6..0b7e7acd1 100644
--- a/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/ClientCallbackImpl.java
+++ b/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/ClientCallbackImpl.java
@@ -152,8 +152,11 @@ final class ClientCallbackImpl implements MultiClientInputMethodServiceDelegate.
             mDelegate.reportImeWindowTarget(
                     mClientId, targetWindowHandle, window.getWindow().getAttributes().token);
         }
-
         if (inputConnection == null || editorInfo == null) {
+            // deactivate previous client.
+            if (MultiClientInputMethod.sLastClientId != mClientId) {
+                mDelegate.setActive(MultiClientInputMethod.sLastClientId, false /* active */);
+            }
             // Dummy InputConnection case.
             if (window.getClientId() == mClientId) {
                 // Special hack for temporary focus changes (e.g. notification shade).
@@ -163,6 +166,9 @@ final class ClientCallbackImpl implements MultiClientInputMethodServiceDelegate.
                 window.onDummyStartInput(mClientId, targetWindowHandle);
             }
         } else {
+            if (MultiClientInputMethod.sLastClientId != mClientId) {
+                mDelegate.setActive(mClientId, true /* active */);
+            }
             window.onStartInput(mClientId, targetWindowHandle, inputConnection);
         }
 
@@ -184,6 +190,7 @@ final class ClientCallbackImpl implements MultiClientInputMethodServiceDelegate.
                 window.hide();
                 break;
         }
+        MultiClientInputMethod.sLastClientId = mClientId;
     }
 
     @Override
diff --git a/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/MultiClientInputMethod.java b/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/MultiClientInputMethod.java
index 150c21d04..bf468e262 100644
--- a/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/MultiClientInputMethod.java
+++ b/samples/MultiClientInputMethod/src/com/example/android/multiclientinputmethod/MultiClientInputMethod.java
@@ -28,6 +28,7 @@ import android.util.Log;
 public final class MultiClientInputMethod extends Service {
     private static final String TAG = "MultiClientInputMethod";
     private static final boolean DEBUG = false;
+    static int sLastClientId = MultiClientInputMethodServiceDelegate.INVALID_CLIENT_ID;
 
     SoftInputWindowManager mSoftInputWindowManager;
     MultiClientInputMethodServiceDelegate mDelegate;