Add input methods settings panel

Bug: 3141466
Bug: 3301559
Bug: 3284424

Moved from old master I4d9abeea

Change-Id: I62fa64cc095e1b9ac34f21e7d4d2e0bb8a3e68fc

1 files changed, 2 insertions, 7 deletions

diff --git a/services/java/com/android/server/InputMethodManagerService.java b/services/java/com/android/server/InputMethodManagerService.java
index 5b56082..9c80b51 100644
--- a/services/java/com/android/server/InputMethodManagerService.java
+++ b/services/java/com/android/server/InputMethodManagerService.java
@@ -1800,19 +1800,14 @@ public class InputMethodManagerService extends IInputMethodManager.Stub
                     });
 
             if (showSubtypes) {
-                mDialogBuilder.setPositiveButton(com.android.internal.R.string.more_item_label,
+                mDialogBuilder.setPositiveButton(
+                        com.android.internal.R.string.configure_input_methods,
                         new DialogInterface.OnClickListener() {
                             public void onClick(DialogInterface dialog, int whichButton) {
                                 showConfigureInputMethods();
                             }
                         });
             }
-            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);