am b3f6116e: am fd73824d: Merge "Fix: Text is cut in Edit word edit box when adding...

* commit 'b3f6116e2bd8bfa1b23b724526badaa6b1602a12':
  Fix: Text is cut in Edit word edit box when adding word to dictionary

diff --cc src/com/android/settings/UserDictionarySettings.java
index b13126a,49363a9..f712cb6
--- 1/src/com/android/settings/UserDictionarySettings.java
--- 2/src/com/android/settings/UserDictionarySettings.java
+++ b/src/com/android/settings/UserDictionarySettings.java
@@@ -214,10 -221,10 +214,10 @@@ public class UserDictionarySettings ext
                      }})
                  .setNegativeButton(android.R.string.cancel, new DialogInterface.OnClickListener() {
                      public void onClick(DialogInterface dialog, int which) {
 -                        if (mAutoReturn) finish();                        
 +                        if (mAutoReturn) activity.onBackPressed();
                      }})
                  .create();
-         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_RESIZE |
+         dialog.getWindow().setSoftInputMode(WindowManager.LayoutParams.SOFT_INPUT_ADJUST_PAN |
                  WindowManager.LayoutParams.SOFT_INPUT_STATE_VISIBLE);
          return dialog;
      }