Merge "IMM#showInputMethodPickerFromSystem for supporting multi-display."

This commit is contained in:
TreeHugger Robot
2018-12-10 18:56:40 +00:00
committed by Android (Google) Code Review

View File

@@ -772,9 +772,10 @@ public class CryptKeeper extends Activity implements TextView.OnEditorActionList
if (imeSwitcher != null && hasMultipleEnabledIMEsOrSubtypes(imm, false)) { if (imeSwitcher != null && hasMultipleEnabledIMEsOrSubtypes(imm, false)) {
imeSwitcher.setVisibility(View.VISIBLE); imeSwitcher.setVisibility(View.VISIBLE);
imeSwitcher.setOnClickListener(new OnClickListener() { imeSwitcher.setOnClickListener(new OnClickListener() {
@Override @Override
public void onClick(View v) { public void onClick(View v) {
imm.showInputMethodPicker(false /* showAuxiliarySubtypes */); imm.showInputMethodPickerFromSystem(false /* showAuxiliarySubtypes */,
v.getDisplay().getDisplayId());
} }
}); });
} }