Add a cancel button to InputMethodPicker and InputMethodSubtypePicker

Change-Id: Ia64b9716c18da5a541c7fc04a507541d2ab952da

1 files changed, 6 insertions, 0 deletions

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index c5d1cfc59600..70bde0168866 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1694,6 +1694,12 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
                             }
                         });
             }
+            mDialogBuilder.setNegativeButton(com.android.internal.R.string.cancel,
+                    new DialogInterface.OnClickListener() {
+                        public void onClick(DialogInterface dialog, int whichButton) {
+                            hideInputMethodMenu();
+                        }
+                    });
             mSwitchingDialog = mDialogBuilder.create();
             mSwitchingDialog.getWindow().setType(
                     WindowManager.LayoutParams.TYPE_INPUT_METHOD_DIALOG);