DO NOT MERGE: Disable SpellChecker in secondary user's direct reply am: b52efcb9d5 am: 9b1ddfe488
Change-Id: Idcdef9d986a8d0e2f6f0209fd550900a6275796d
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 37b0de4..ad78b3a 100644
--- a/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
+++ b/packages/SystemUI/src/com/android/systemui/statusbar/policy/RemoteInputView.java
@@ -18,6 +18,7 @@
import android.animation.Animator;
import android.animation.AnimatorListenerAdapter;
+import android.app.ActivityManager;
import android.app.Notification;
import android.app.PendingIntent;
import android.app.RemoteInput;
@@ -27,7 +28,9 @@
import android.graphics.Rect;
import android.graphics.drawable.Drawable;
import android.os.Bundle;
+import android.os.UserHandle;
import android.text.Editable;
+import android.text.InputType;
import android.text.TextWatcher;
import android.util.AttributeSet;
import android.util.Log;
@@ -278,12 +281,22 @@
if (mWrapper != null) {
mWrapper.setRemoteInputVisible(true);
}
- mController.addRemoteInput(mEntry, mToken);
+
+ // Disable suggestions on non-owner (secondary) user.
+ // SpellCheckerService of primary user runs on secondary as well which shows
+ // "Add to dictionary" dialog on the primary user. (See b/123232892)
+ // Note: this doesn't affect work-profile users on P or older versions.
+ if (UserHandle.myUserId() != ActivityManager.getCurrentUser()) {
+ mEditText.setInputType(
+ mEditText.getInputType() | InputType.TYPE_TEXT_FLAG_NO_SUGGESTIONS);
+ }
+
mEditText.setInnerFocusable(true);
mEditText.mShowImeOnInputConnection = true;
mEditText.setText(mEntry.remoteInputText);
mEditText.setSelection(mEditText.getText().length());
mEditText.requestFocus();
+ mController.addRemoteInput(mEntry, mToken);
updateSendButton();
}