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

src/com/android/settings/CryptKeeper.java

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